up 6.9

Update tun_singbox
Improved enhanced tun mode
2023-02-06 19:28:43 +08:00 · 2023-02-06 19:19:36 +08:00 · 2023-02-06 15:29:10 +08:00 · 2023-02-05 20:17:07 +08:00 · 2023-02-05 20:17:03 +08:00 · 2023-02-05 19:57:08 +08:00
36 changed files with 2206 additions and 379 deletions
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -17,6 +17,9 @@
                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
            </ResourceDictionary.MergedDictionaries>
            <system:Double x:Key="MenuItemHeight">26</system:Double>
+            <system:Double x:Key="StdFontSize">12</system:Double>
+            <system:Double x:Key="StdFontSize1">14</system:Double>
+            <system:Double x:Key="StdFontSize2">16</system:Double>
            <Thickness
                x:Key="ServerItemMargin"
                Bottom="4"
@@ -33,19 +36,19 @@
                x:Key="ModuleTitle"
                BasedOn="{StaticResource MaterialDesignTextBlock}"
                TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="16" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
            </Style>
            <Style
                x:Key="ToolbarTextBlock"
                BasedOn="{StaticResource MaterialDesignTextBlock}"
                TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
            </Style>
            <Style
                x:Key="StatusbarItem"
                BasedOn="{StaticResource MaterialDesignTextBlock}"
                TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                <Setter Property="Padding" Value="0" />
            </Style>
            <Style TargetType="{x:Type TextElement}">
@@ -58,7 +61,7 @@
            </Style>
            <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
                <Setter Property="Height" Value="20" />
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                <Style.Triggers>
                    <Trigger Property="IsSelected" Value="true">
                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
@@ -76,22 +79,19 @@
                x:Key="ListItemCheckBox"
                BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"
                TargetType="{x:Type CheckBox}">
-                <Setter Property="FontSize" Value="12" />
-            </Style>
-            <Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
-                <Setter Property="FontSize" Value="11" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
            </Style>
            <Style
                x:Key="DefButton"
                BasedOn="{StaticResource MaterialDesignRaisedButton}"
                TargetType="{x:Type ButtonBase}">
-                <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
            </Style>
            <Style
                x:Key="DefContextMenu"
                BasedOn="{StaticResource MaterialDesignContextMenu}"
                TargetType="{x:Type ContextMenu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
            </Style>

@@ -99,7 +99,7 @@
                x:Key="ToolbarMenu"
                BasedOn="{StaticResource MaterialDesignMenu}"
                TargetType="{x:Type Menu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
            </Style>

@@ -107,15 +107,35 @@
                x:Key="DefComboBox"
                BasedOn="{StaticResource MaterialDesignComboBox}"
                TargetType="{x:Type ComboBox}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                <Setter Property="HorizontalAlignment" Value="Left" />
            </Style>
            <Style
                x:Key="DefDataGrid"
                BasedOn="{StaticResource MaterialDesignDataGrid}"
                TargetType="{x:Type DataGrid}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
            </Style>
+            <Style
+                x:Key="DefTextBox"
+                BasedOn="{StaticResource MaterialDesignTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyOutlinedTextBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyGroupBox"
+                BasedOn="{StaticResource MaterialDesignGroupBox}"
+                TargetType="{x:Type GroupBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+
+
        </ResourceDictionary>

    </Application.Resources>
--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@@ -1,5 +1,5 @@
-using System.IO;
-using System.Windows.Media;
+using System.Windows.Media;
+using v2rayN.Handler;

 namespace v2rayN.Converters
 {
@@ -9,8 +9,22 @@ namespace v2rayN.Converters

        static MaterialDesignFonts()
        {
-            var fontPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Resources\Fonts\");
-            MyFont = new FontFamily(new Uri($"file:///{fontPath}"), "./#Source Han Sans CN");
+            try
+            {
+                var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
+                if (!string.IsNullOrEmpty(fontFamily))
+                {
+                    var fontPath = Utils.GetFontsPath();
+                    MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
+                }
+            }
+            catch
+            {
+            }
+            if (MyFont is null)
+            {
+                MyFont = new FontFamily("Microsoft YaHei");
+            }
        }
    }
 }
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -77,6 +77,7 @@
        public const string CommandClearMsg = "CommandClearMsg";
        public const string DelayUnit = "";
        public const string SpeedUnit = "";
+        public const int MinFontSize = 10;

        public static readonly List<string> IEProxyProtocols = new List<string> {
                        "{ip}:{http_port}",
@@ -95,16 +96,26 @@
        public static readonly List<string> coreTypes = new List<string> { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
        public static readonly List<string> domainStrategys = new List<string> { "AsIs", "IPIfNonMatch", "IPOnDemand" };
        public static readonly List<string> domainMatchers = new List<string> { "linear", "mph", "" };
-        public static readonly List<string> fingerprints = new List<string> { "chrome", "firefox", "safari", "randomized", "" };
+        public static readonly List<string> fingerprints = new List<string> { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
+        public static readonly List<string> userAgent = new List<string> { "chrome", "firefox", "safari", "edge", "none" };
+        public static readonly Dictionary<string, string> userAgentTxt = new Dictionary<string, string>
+        {
+            {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
+            {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
+            {"safari","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.1 Safari/605.1.15" },
+            {"edge","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.70" },
+            {"none",""}
+        };
        public static readonly List<string> allowInsecures = new List<string> { "true", "false", "" };
        public static readonly List<string> domainStrategy4Freedoms = new List<string> { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
-        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en", "fa-Ir" };
+        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en", "fa-Ir", "ru" };
        public static readonly List<string> alpns = new List<string> { "h2", "http/1.1", "h2,http/1.1", "" };
        public static readonly List<string> LogLevel = new List<string> { "debug", "info", "warning", "error", "none" };
        public static readonly List<string> InboundTags = new List<string> { "socks", "http", "socks2", "http2" };
        public static readonly List<string> Protocols = new List<string> { "http", "tls", "bittorrent" };
        public static readonly List<string> TunMtus = new List<string> { "9000", "1500" };
        public static readonly List<string> TunStacks = new List<string> { "gvisor", "system" };
+        public static readonly List<string> PresetMsgFilters = new List<string> { "^(?!.*proxy).*$", "^(?!.*direct).*$", "" };

        #endregion

--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -88,9 +88,10 @@ namespace v2rayN.Handler
                {
                    if (config.logEnabled)
                    {
+                        var dtNow = DateTime.Now;
                        v2rayConfig.log.loglevel = config.loglevel;
-                        v2rayConfig.log.access = Utils.GetLogPath(v2rayConfig.log.access);
-                        v2rayConfig.log.error = Utils.GetLogPath(v2rayConfig.log.error);
+                        v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow.ToString("yyyy-MM-dd")}.txt");
+                        v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow.ToString("yyyy-MM-dd")}.txt");
                    }
                    else
                    {
@@ -546,6 +547,18 @@ namespace v2rayN.Handler
                streamSettings.network = node.GetNetwork();
                string host = node.requestHost.TrimEx();
                string sni = node.sni;
+                string useragent = "";
+                if (!config.defUserAgent.IsNullOrEmpty())
+                {
+                    try
+                    {
+                        useragent = Global.userAgentTxt[config.defUserAgent];
+                    }
+                    catch (KeyNotFoundException)
+                    {
+                        useragent = config.defUserAgent;
+                    }
+                }

                //if tls
                if (node.streamSecurity == Global.StreamSecurity)
@@ -556,7 +569,7 @@ namespace v2rayN.Handler
                    {
                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                        alpn = node.GetAlpn(),
-                        fingerprint = node.fingerprint
+                        fingerprint = node.fingerprint.IsNullOrEmpty() ? config.defFingerprint : node.fingerprint
                    };
                    if (!string.IsNullOrWhiteSpace(sni))
                    {
@@ -578,7 +591,7 @@ namespace v2rayN.Handler
                    {
                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                        alpn = node.GetAlpn(),
-                        fingerprint = node.fingerprint
+                        fingerprint = node.fingerprint.IsNullOrEmpty() ? config.defFingerprint : node.fingerprint
                    };
                    if (!string.IsNullOrWhiteSpace(sni))
                    {
@@ -634,19 +647,22 @@ namespace v2rayN.Handler
                        WsSettings wsSettings = new WsSettings
                        {
                        };
-
+                        wsSettings.headers = new Headers
+                        {
+                        };
                        string path = node.path;
                        if (!string.IsNullOrWhiteSpace(host))
                        {
-                            wsSettings.headers = new Headers
-                            {
-                                Host = host
-                            };
+                            wsSettings.headers.Host = host;
                        }
                        if (!string.IsNullOrWhiteSpace(path))
                        {
                            wsSettings.path = path;
                        }
+                        if (!string.IsNullOrWhiteSpace(useragent))
+                        {
+                            wsSettings.headers.UserAgent = useragent;
+                        }
                        streamSettings.wsSettings = wsSettings;

                        //TlsSettings tlsSettings = new TlsSettings();
@@ -730,7 +746,7 @@ namespace v2rayN.Handler
                                string host2 = string.Join("\",\"", arrHost);
                                request = request.Replace("$requestHost$", $"\"{host2}\"");
                                //request = request.Replace("$requestHost$", string.Format("\"{0}\"", config.requestHost()));
-
+                                request = request.Replace("$requestUserAgent$", $"\"{useragent}\"");
                                //Path
                                string pathHttp = @"/";
                                if (!Utils.IsNullOrEmpty(node.path))
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -71,7 +71,8 @@ namespace v2rayN.Handler
                path = item.path,
                tls = item.streamSecurity,
                sni = item.sni,
-                alpn = item.alpn
+                alpn = item.alpn,
+                fp = item.fingerprint
            };

            url = Utils.ToJson(vmessQRCode);
@@ -202,6 +203,10 @@ namespace v2rayN.Handler
            {
                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
            }
+            if (!Utils.IsNullOrEmpty(item.fingerprint))
+            {
+                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+            }

            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");

@@ -408,6 +413,7 @@ namespace v2rayN.Handler
            profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
            profileItem.sni = Utils.ToString(vmessQRCode.sni);
            profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
+            profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);

            return profileItem;
        }
@@ -759,6 +765,7 @@ namespace v2rayN.Handler
            item.streamSecurity = query["security"] ?? "";
            item.sni = query["sni"] ?? "";
            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
+            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
            item.network = query["type"] ?? "tcp";
            switch (item.network)
            {
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -248,6 +248,7 @@ namespace v2rayN.Handler
            {
                _coreHandler.CoreStopPid(pid);
            }
+            UpdateFunc("", ResUI.SpeedtestingCompleted);
        }
        private async Task RunMixedtestAsync()
        {
--- a/v2rayN/v2rayN/Handler/TunHandler.cs
+++ b/v2rayN/v2rayN/Handler/TunHandler.cs
@@ -100,6 +100,17 @@ namespace v2rayN.Base
            configStr = configStr.Replace("$strict_route$", $"{_config.tunModeItem.strictRoute.ToString().ToLower()}");
            configStr = configStr.Replace("$stack$", $"{_config.tunModeItem.stack}");

+            //logs
+            if (_config.tunModeItem.showWindow)
+            {
+                configStr = configStr.Replace("$log_output$", $"");
+            }
+            else
+            {
+                var dtNow = DateTime.Now;
+                var log_output = $"\"output\": \"{Utils.GetLogPath($"singbox_{dtNow.ToString("yyyy-MM-dd")}.txt")}\", ";
+                configStr = configStr.Replace("$log_output$", $"{log_output.Replace(@"\", @"\\")}");
+            }

            //port
            configStr = configStr.Replace("$socksPort$", $"{_socksPort}");
@@ -118,13 +129,13 @@ namespace v2rayN.Base
                {
                    if (!lstDnsExe.Contains(it2) && it.coreType != ECoreType.sing_box)
                    {
-                        lstDnsExe.Add(it2);
+                        //lstDnsExe.Add(it2);
                        lstDnsExe.Add($"{it2}.exe");
                    }

                    if (!lstDirectExe.Contains(it2))
                    {
-                        lstDirectExe.Add(it2);
+                        //lstDirectExe.Add(it2);
                        lstDirectExe.Add($"{it2}.exe");
                    }
                }
@@ -135,32 +146,50 @@ namespace v2rayN.Base
            string strDirect = string.Join("\",\"", lstDirectExe.ToArray());
            configStr = configStr.Replace("$directProcessName$", $"\"{strDirect}\"");

+            if (_config.tunModeItem.bypassMode)
+            {
+                //direct ips
+                if (_config.tunModeItem.directIP != null && _config.tunModeItem.directIP.Count > 0)
+                {
+                    var ips = new { outbound = "direct", ip_cidr = _config.tunModeItem.directIP };
+                    configStr = configStr.Replace("$ruleDirectIPs$", "," + Utils.ToJson(ips));
+                }
+                //direct process
+                if (_config.tunModeItem.directProcess != null && _config.tunModeItem.directProcess.Count > 0)
+                {
+                    var process = new { outbound = "direct", process_name = _config.tunModeItem.directProcess };
+                    configStr = configStr.Replace("$ruleDirectProcess$", "," + Utils.ToJson(process));
+                }
+            }
+            else
+            {
+                //proxy ips
+                if (_config.tunModeItem.proxyIP != null && _config.tunModeItem.proxyIP.Count > 0)
+                {
+                    var ips = new { outbound = "proxy", ip_cidr = _config.tunModeItem.proxyIP };
+                    configStr = configStr.Replace("$ruleProxyIPs$", "," + Utils.ToJson(ips));
+                }
+                //proxy process
+                if (_config.tunModeItem.proxyProcess != null && _config.tunModeItem.proxyProcess.Count > 0)
+                {
+                    var process = new { outbound = "proxy", process_name = _config.tunModeItem.proxyProcess };
+                    configStr = configStr.Replace("$ruleProxyProcess$", "," + Utils.ToJson(process));
+                }

-            //ips
-            if (_config.tunModeItem.directIP != null && _config.tunModeItem.directIP.Count > 0)
-            {
-                var ips = new { outbound = "direct", ip_cidr = _config.tunModeItem.directIP };
-                configStr = configStr.Replace("$ruleDirectIPs$", "," + Utils.ToJson(ips));
-            }
-            else
-            {
-                configStr = configStr.Replace("$ruleDirectIPs$", "");
-            }
-            //process
-            if (_config.tunModeItem.directProcess != null && _config.tunModeItem.directProcess.Count > 0)
-            {
-                var process = new { outbound = "direct", process_name = _config.tunModeItem.directProcess };
-                configStr = configStr.Replace("$ruleDirectProcess$", "," + Utils.ToJson(process));
-            }
-            else
-            {
-                configStr = configStr.Replace("$ruleDirectProcess$", "");
+                var final = new { outbound = "direct", inbound = "tun-in" };
+                configStr = configStr.Replace("$ruleFinally$", "," + Utils.ToJson(final));
            }
+            configStr = configStr.Replace("$ruleDirectIPs$", "");
+            configStr = configStr.Replace("$ruleDirectProcess$", "");
+            configStr = configStr.Replace("$ruleProxyIPs$", "");
+            configStr = configStr.Replace("$ruleProxyProcess$", "");
+            configStr = configStr.Replace("$ruleFinally$", "");
+             

            File.WriteAllText(Utils.GetConfigPath(_tunConfigName), configStr);

            return true;
-        }
+        }        

        private void CoreStop()
        {
@@ -172,6 +201,7 @@ namespace v2rayN.Base
                    KillProcess(_process);
                    _process.Dispose();
                    _process = null;
+                    _needRestart = true;
                }
            }
            catch (Exception ex)
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -90,10 +90,14 @@
        /// <summary>
        /// 是否允许不安全连接
        /// </summary>
-        public bool defAllowInsecure
-        {
-            get; set;
-        }
+        public bool defAllowInsecure { get; set; }
+
+        public string defFingerprint { get; set; }
+
+        /// <summary>
+        /// 默认用户代理
+        /// </summary>
+        public string defUserAgent { get; set; }

        /// <summary>
        /// 域名解析策略
@@ -139,8 +143,6 @@

        public int trayMenuServersLimit { get; set; } = 20;

-        public bool autoHideStartup { get; set; }
-
        #endregion

        #region other entities
--- a/v2rayN/v2rayN/Mode/ConfigItems.cs
+++ b/v2rayN/v2rayN/Mode/ConfigItems.cs
@@ -62,8 +62,11 @@ namespace v2rayN.Mode
        public bool colorModeDark { get; set; }
        public string? colorPrimaryName { get; set; }
        public string currentLanguage { get; set; }
+        public string currentFontFamily { get; set; }
+        public int currentFontSize { get; set; }
        public bool enableDragDropSort { get; set; }
        public bool doubleClick2Activate { get; set; }
+        public bool autoHideStartup { get; set; } = true;
        public Dictionary<string, int> mainLvColWidth { get; set; }
    }

@@ -107,8 +110,11 @@ namespace v2rayN.Mode
        public string stack { get; set; }
        public int mtu { get; set; }
        public string customTemplate { get; set; }
+        public bool bypassMode { get; set; } = true;
        public List<string> directIP { get; set; }
        public List<string> directProcess { get; set; }
+        public List<string> proxyIP { get; set; }
+        public List<string> proxyProcess { get; set; }

    }
 }
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -1,4 +1,6 @@
-namespace v2rayN.Mode
+using Newtonsoft.Json;
+
+namespace v2rayN.Mode
 {
    /// <summary>
    /// v2ray配置文件实体类
@@ -505,6 +507,12 @@
        /// 
        /// </summary>
        public string Host { get; set; }
+
+        /// <summary>
+        /// 用户代理
+        /// </summary>
+        [JsonProperty("User-Agent")]
+        public string UserAgent { get; set; }
    }

    public class HttpSettings
--- a/v2rayN/v2rayN/Mode/VmessQRCode.cs
+++ b/v2rayN/v2rayN/Mode/VmessQRCode.cs
@@ -63,5 +63,10 @@
        /// TLS alpn
        /// </summary>
        public string alpn { get; set; } = string.Empty;
+        /// <summary>
+        /// TLS fingerprint
+        /// </summary>
+        public string fp { get; set; } = string.Empty;
+
    }
 }
--- a/v2rayN/v2rayN/Resources/Fonts/SourceHanSansCN-Regular.ttf
+++ b/v2rayN/v2rayN/Resources/Fonts/SourceHanSansCN-Regular.ttf
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -1761,6 +1761,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Test completed 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingCompleted {
+            get {
+                return ResourceManager.GetString("SpeedtestingCompleted", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Skip test 的本地化字符串。
        /// </summary>
@@ -2383,6 +2392,24 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 FontFamily(Require restart) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsCurrentFontFamily {
+            get {
+                return ResourceManager.GetString("TbSettingsCurrentFontFamily", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Copy the font TTF file to the directory guiFonts, restart the settings 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsCurrentFontFamilyTip {
+            get {
+                return ResourceManager.GetString("TbSettingsCurrentFontFamilyTip", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 AllowInsecure 的本地化字符串。
        /// </summary>
@@ -2392,6 +2419,33 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Default TLS fingerprint 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDefFingerprint {
+            get {
+                return ResourceManager.GetString("TbSettingsDefFingerprint", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 User-Agent 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDefUserAgent {
+            get {
+                return ResourceManager.GetString("TbSettingsDefUserAgent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 This parameter is valid only for tcp/http and ws 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDefUserAgentTips {
+            get {
+                return ResourceManager.GetString("TbSettingsDefUserAgentTips", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Outbound Freedom domainStrategy 的本地化字符串。
        /// </summary>
@@ -2455,6 +2509,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 FontSize 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsFontSize {
+            get {
+                return ResourceManager.GetString("TbSettingsFontSize", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Http Port 的本地化字符串。
        /// </summary>
@@ -2492,7 +2555,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Language 的本地化字符串。
+        ///   查找类似 Language(Restart) 的本地化字符串。
        /// </summary>
        public static string TbSettingsLanguage {
            get {
@@ -2617,6 +2680,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 http port=socks port+1 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsSocksPortTip {
+            get {
+                return ResourceManager.GetString("TbSettingsSocksPortTip", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Start on boot 的本地化字符串。
        /// </summary>
@@ -2626,6 +2698,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Set this with admin privileges, get admin privileges after startup 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsStartBootTip {
+            get {
+                return ResourceManager.GetString("TbSettingsStartBootTip", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Enable Statistics (Require restart) 的本地化字符串。
        /// </summary>
@@ -2689,6 +2770,24 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Bypass Mode 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeBypassMode {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeBypassMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Enable: If no route matches, the final proxy 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeBypassModeTip {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeBypassModeTip", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Custom Template 的本地化字符串。
        /// </summary>
@@ -2716,6 +2815,24 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Proxy IP CIDR, separated by commas (,) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeProxyIP {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeProxyIP", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Proxy Process name, separated by commas (,) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeProxyProcess {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeProxyProcess", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Show console 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
@@ -130,7 +130,7 @@
    <value>فرمت پیکربندی نادرست است</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. If you want to use the system proxy, please modify the listening port manually.</value>
+    <value>توجه داشته باشید که پیکربندی سفارشی کاملاً به پیکربندی خود شما بستگی دارد و با همه تنظیمات کار نمی کند. اگر می خواهید از پروکسی سیستم استفاده کنید، لطفاً پورت درحال شنود را به صورت دستی تغییر دهید.</value>
  </data>
  <data name="Downloading" xml:space="preserve">
    <value>درحال دانلود...</value>
@@ -187,10 +187,10 @@
    <value>پیکربندی اولیه</value>
  </data>
  <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} در حال حاضر به روز است.</value>
  </data>
  <data name="IsLatestN" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} در حال حاضر به روز است.</value>
  </data>
  <data name="LvAddress" xml:space="preserve">
    <value>آدرس</value>
@@ -262,28 +262,28 @@
    <value>شروع به دریافت اشتراک شد</value>
  </data>
  <data name="MsgStartUpdating" xml:space="preserve">
-    <value>Start updating {0}...</value>
+    <value>شروع بروزرسانی {0}...</value>
  </data>
  <data name="MsgStartUpdatingPAC" xml:space="preserve">
-    <value>Start updating PAC...</value>
+    <value>شروع بروزرسانی PAC...</value>
  </data>
  <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
    <value>محتوای اشتراک نامعتبر است</value>
  </data>
  <data name="MsgUnpacking" xml:space="preserve">
-    <value>is unpacking...</value>
+    <value>در حال باز کردن بسته می باشد ...</value>
  </data>
  <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
-    <value>Update subscription end</value>
+    <value>بروزرسانی اشتراک به پایان رسید</value>
  </data>
  <data name="MsgUpdateSubscriptionStart" xml:space="preserve">
-    <value>Update subscription starts</value>
+    <value>بروزرسانی اشتراک شروع شد</value>
  </data>
  <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Update Core successfully</value>
+    <value>هسته با موفقیت بروزرسانی شد</value>
  </data>
  <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
-    <value>Update Core successfully! Restarting service...</value>
+    <value>هسته با موفقیت بروزرسانی شد! راه اندازی مجدد سرویس...</value>
  </data>
  <data name="NeedHttpGlobalProxy" xml:space="preserve">
    <value> This feature relies on the Http global proxy, please set it correctly first.</value>
@@ -301,7 +301,7 @@
    <value>Scan completed, no valid QR code found</value>
  </data>
  <data name="OperationFailed" xml:space="preserve">
-    <value> operation failed, please check and retry</value>
+    <value> عملیات انجام نشد، لطفا بررسی کنید و دوباره امتحان کنید</value>
  </data>
  <data name="PleaseFillRemarks" xml:space="preserve">
    <value>Please Fill Remarks</value>
@@ -343,20 +343,20 @@
    <value>Start service ({0})...</value>
  </data>
  <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Configuration successful
+    <value>پیکربندی با موفقیت انجام شد
 {0}</value>
  </data>
  <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
    <value>سرور پیکربندی سفارشی با موفقیت وارد شد.</value>
  </data>
  <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} servers have been imported from clipboard.</value>
+    <value>{0} سرورها از کلیپ بورد وارد شده اند.</value>
  </data>
  <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>Scan import URL successfully</value>
+    <value>اسکن URL وارد کردن با موفقیت</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>The ping of current service: {0} ms</value>
+    <value>پینگ سرویس فعلی: {0} ms</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>موفقیت عملیات</value>
@@ -368,7 +368,7 @@
    <value>آیا مطمئن هستید که قوانین را حذف می کنید؟</value>
  </data>
  <data name="RoutingRuleDetailRequiredTips" xml:space="preserve">
-    <value>{0},One of the required.</value>
+    <value>{0},یکی از مورد نیاز.</value>
  </data>
  <data name="LvRemarks" xml:space="preserve">
    <value>Remarks</value>
@@ -386,7 +386,7 @@
    <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
  </data>
  <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
-    <value>Download GeoFile: {0} successfully</value>
+    <value>دانلود GeoFile: {0} با موفقیت</value>
  </data>
  <data name="MsgInformationTitle" xml:space="preserve">
    <value>اطلاعات</value>
@@ -536,7 +536,7 @@
    <value>پروکسی سیستم تغییر نکند</value>
  </data>
  <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>حالت Pac</value>
  </data>
  <data name="menuSystemProxySet" xml:space="preserve">
    <value>تنظیم پراکسی سیستم</value>
@@ -791,10 +791,10 @@
    <value>Outbound Freedom domainStrategy</value>
  </data>
  <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>Automatically adjust column width after updating subscription</value>
+    <value>پس از به‌روزرسانی اشتراک، عرض ستون را به صورت خودکار تنظیم شود</value>
  </data>
  <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>به روز رسانی های پیش از انتشار را بررسی کنید</value>
+    <value>به روز رسانی های پیش از انتشار را بررسی شود</value>
  </data>
  <data name="TbSettingsException" xml:space="preserve">
    <value>استثنا</value>
@@ -827,13 +827,13 @@
    <value>تنظیمات v2rayN</value>
  </data>
  <data name="TbSettingsPacListenPort" xml:space="preserve">
-    <value>Pac listen port</value>
+    <value>Pac پورت درحال شنود</value>
  </data>
  <data name="TbSettingsPass" xml:space="preserve">
    <value>Auth pass</value>
  </data>
  <data name="TbSettingsRemoteDNS" xml:space="preserve">
-    <value>Custom DNS (multiple, separated by commas (,))</value>
+    <value>سفارشی DNS (multiple, separated by commas (,))</value>
  </data>
  <data name="TbSettingsSaveTip" xml:space="preserve">
    <value>After modifying the following parameters, click Save to take effect</value>
@@ -845,16 +845,16 @@
    <value>Turn on Sniffing</value>
  </data>
  <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>ساکس Port</value>
  </data>
  <data name="TbSettingsStartBoot" xml:space="preserve">
-    <value>Start on boot</value>
+    <value>درهنگام راه ائدازی شروع شود</value>
  </data>
  <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>Enable Statistics (Require restart)</value>
+    <value>فعال کردن آمار (نیاز به راه اندازی مجدد)</value>
  </data>
  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Statistics freshrate (second)</value>
+    <value>نرخ تازه سازی آمار (ثانیه)</value>
  </data>
  <data name="TbSettingsSubConvert" xml:space="preserve">
    <value>Subscription conversion Url</value>
@@ -884,7 +884,7 @@
    <value>تنظیم کلید میانبر جهانی</value>
  </data>
  <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>مستقیماً با فشار دادن صفحه کلید تنظیم کنید، بعد از راه اندازی مجدد اعمال شود</value>
  </data>
  <data name="TbNotChangeSystemProxy" xml:space="preserve">
    <value>پروکسی سیستم را تغییر ندهید</value>
@@ -929,7 +929,7 @@
    <value>{0} Website</value>
  </data>
  <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>Advanced Function</value>
+    <value>عملکرد پیشرفته</value>
  </data>
  <data name="menuRoutingAdvancedAdd" xml:space="preserve">
    <value>اضافه کردن</value>
@@ -1001,7 +1001,7 @@
    <value>تنظیم جزئیات قانون مسیریابی</value>
  </data>
  <data name="TbAutoSort" xml:space="preserve">
-    <value>Domain and ip are auto sorted when saving</value>
+    <value>دامنه و آی پی در هنگام ذخیره به طور خودکار مرتب می شوند</value>
  </data>
  <data name="TbRuleobjectDoc" xml:space="preserve">
    <value>Ruleobject Doc</value>
@@ -1060,4 +1060,10 @@
  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
    <value>نمایش کنسول</value>
  </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>User-Agent</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>This parameter is valid only for tcp/http and ws</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -548,7 +548,7 @@
    <value>Dark Mode</value>
  </data>
  <data name="TbSettingsLanguage" xml:space="preserve">
-    <value>Language</value>
+    <value>Language(Restart)</value>
  </data>
  <data name="menuAddServerViaClipboard" xml:space="preserve">
    <value>Import bulk URL from clipboard (Ctrl+V)</value>
@@ -1081,4 +1081,43 @@
  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
    <value>Double-click server make active</value>
  </data>
+  <data name="SpeedtestingCompleted" xml:space="preserve">
+    <value>Test completed</value>
+  </data>
+  <data name="TbSettingsDefFingerprint" xml:space="preserve">
+    <value>Default TLS fingerprint</value>
+  </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>User-Agent</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>This parameter is valid only for tcp/http and ws</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
+    <value>FontFamily(Require restart)</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
+    <value>Copy the font TTF file to the directory guiFonts, restart the settings</value>
+  </data>
+  <data name="TbSettingsSocksPortTip" xml:space="preserve">
+    <value>http port=socks port+1</value>
+  </data>
+  <data name="TbSettingsStartBootTip" xml:space="preserve">
+    <value>Set this with admin privileges, get admin privileges after startup</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>FontSize</value>
+  </data>
+  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
+    <value>Proxy IP CIDR, separated by commas (,)</value>
+  </data>
+  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
+    <value>Proxy Process name, separated by commas (,)</value>
+  </data>
+  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
+    <value>Bypass Mode</value>
+  </data>
+  <data name="TbSettingsTunModeBypassModeTip" xml:space="preserve">
+    <value>Enable: If no route matches, the final proxy</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.ru.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -548,7 +548,7 @@
    <value>暗黑模式</value>
  </data>
  <data name="TbSettingsLanguage" xml:space="preserve">
-    <value>语言</value>
+    <value>语言(重启)</value>
  </data>
  <data name="menuAddServerViaClipboard" xml:space="preserve">
    <value>从剪贴板导入批量URL (Ctrl+V)</value>
@@ -1081,4 +1081,43 @@
  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
    <value>主界面双击设为活动服务器</value>
  </data>
+  <data name="SpeedtestingCompleted" xml:space="preserve">
+    <value>测试完成</value>
+  </data>
+  <data name="TbSettingsDefFingerprint" xml:space="preserve">
+    <value>默认TLS指纹(fingerprint)</value>
+  </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>用户代理(User-Agent)</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>仅对tcp/http、ws协议生效</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
+    <value>当前字体(需重启)</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
+    <value>拷贝字体TTF文件到目录guiFonts，重启设置</value>
+  </data>
+  <data name="TbSettingsSocksPortTip" xml:space="preserve">
+    <value>http端口=socks端口+1</value>
+  </data>
+  <data name="TbSettingsStartBootTip" xml:space="preserve">
+    <value>以管理员权限设置此项，在启动后获得管理员权限</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>字体大小</value>
+  </data>
+  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
+    <value>代理的IP CIDR，用逗号(,)分隔</value>
+  </data>
+  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
+    <value>代理的进程名，用逗号(,)分隔</value>
+  </data>
+  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
+    <value>绕行模式</value>
+  </data>
+  <data name="TbSettingsTunModeBypassModeTip" xml:space="preserve">
+    <value>启用：路由无匹配则最终代理</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Sample/SampleHttprequest
+++ b/v2rayN/v2rayN/Sample/SampleHttprequest
@@ -1 +1 @@
-{"version":"1.1","method":"GET","path":[$requestPath$],"headers":{"Host":[$requestHost$],"User-Agent":["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.75 Safari/537.36","Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}
+{"version":"1.1","method":"GET","path":[$requestPath$],"headers":{"Host":[$requestHost$],"User-Agent":[$requestUserAgent$],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}
--- a/v2rayN/v2rayN/Sample/tun_singbox
+++ b/v2rayN/v2rayN/Sample/tun_singbox
@@ -1,10 +1,12 @@
 {
+  "log": {
+    "disabled": false,
+    "level": "debug",
+    $log_output$
+    "timestamp": true
+  },
  "dns": {
-    "servers": [      
-      {
-        "tag": "google",
-        "address": "tls://8.8.8.8"
-      },
+    "servers": [    
      {
        "tag": "local",
        "address": "223.5.5.5",
@@ -27,6 +29,7 @@
  "inbounds": [
    {
      "type": "tun",
+      "tag": "tun-in",
      "interface_name": "singbox_tun",
      "inet4_address": "172.19.0.1/30",

@@ -106,6 +109,9 @@
      }
      $ruleDirectIPs$
      $ruleDirectProcess$
+      $ruleProxyIPs$
+      $ruleProxyProcess$
+      $ruleFinally$
    ]
  }
 }
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -1135,6 +1135,22 @@ namespace v2rayN
                return Path.Combine(_tempPath, filename);
            }
        }
+        public static string GetFontsPath(string filename = "")
+        {
+            string _tempPath = Path.Combine(StartupPath(), "guiFonts");
+            if (!Directory.Exists(_tempPath))
+            {
+                Directory.CreateDirectory(_tempPath);
+            }
+            if (string.IsNullOrEmpty(filename))
+            {
+                return _tempPath;
+            }
+            else
+            {
+                return Path.Combine(_tempPath, filename);
+            }
+        }

        #endregion

--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -189,6 +189,8 @@ namespace v2rayN.ViewModels
        public IObservableCollection<Swatch> Swatches => _swatches;
        [Reactive]
        public Swatch SelectedSwatch { get; set; }
+        [Reactive]
+        public int CurrentFontSize { get; set; }

        [Reactive]
        public string CurrentLanguage { get; set; }
@@ -212,6 +214,10 @@ namespace v2rayN.ViewModels
            SelectedMoveToGroup = new();
            SelectedRouting = new();
            SelectedServer = new();
+            if (_config.tunModeItem.enableTun && Utils.IsAdministrator())
+            {
+                EnableTun = true;
+            }

            //RefreshServers();
            InitSubscriptionView();
@@ -531,7 +537,12 @@ namespace v2rayN.ViewModels
            _noticeHandler?.SendMessage(msg);
            if (success)
            {
+                RefreshServers();
                Reload();
+                if (_config.uiItem.enableAutoAdjustMainLvColWidth)
+                {
+                    _updateView("AdjustMainLvColWidth");
+                }
            }
        }
        private void UpdateStatisticsHandler(ServerSpeedItem update)
@@ -591,7 +602,8 @@ namespace v2rayN.ViewModels
        {
            if (Utils.IsNullOrEmpty(indexId))
            {
-                _noticeHandler?.SendMessage(delay);
+                _noticeHandler?.SendMessage(delay, true);
+                _noticeHandler?.Enqueue(delay);
                return;
            }
            var item = _profileItems.Where(it => it.indexId == indexId).FirstOrDefault();
@@ -904,12 +916,16 @@ namespace v2rayN.ViewModels
            {
                return;
            }
+            var exists = lstSelecteds.Exists(t => t.indexId == _config.indexId);

            ConfigHandler.RemoveServer(_config, lstSelecteds);
            _noticeHandler?.Enqueue(ResUI.OperationSuccess);

            RefreshServers();
-            Reload();
+            if (exists)
+            {
+                Reload();
+            }
        }

        private void RemoveDuplicateServer()
@@ -1034,7 +1050,7 @@ namespace v2rayN.ViewModels
            }
            (new UpdateHandle()).RunAvailabilityCheck((bool success, string msg) =>
            {
-                _noticeHandler?.SendMessage(msg);
+                _noticeHandler?.SendMessage(msg, true);
                Application.Current.Dispatcher.Invoke((Action)(() =>
                {
                    if (!Global.ShowInTaskbar)
@@ -1209,21 +1225,8 @@ namespace v2rayN.ViewModels
        }

        private void UpdateSubscriptionProcess(string subId, bool blProxy)
-        {
-            void _updateUI(bool success, string msg)
-            {
-                _noticeHandler?.SendMessage(msg);
-                if (success)
-                {
-                    RefreshServers();
-                    if (_config.uiItem.enableAutoAdjustMainLvColWidth)
-                    {
-                        _updateView("AdjustMainLvColWidth");
-                    }
-                }
-            };
-
-            (new UpdateHandle()).UpdateSubscriptionProcess(_config, subId, blProxy, _updateUI);
+        {         
+            (new UpdateHandle()).UpdateSubscriptionProcess(_config, subId, blProxy, UpdateTaskHandler);
        }

        #endregion
@@ -1567,6 +1570,7 @@ namespace v2rayN.ViewModels
            {
                SelectedSwatch = _swatches.FirstOrDefault(t => t.Name == _config.uiItem.colorPrimaryName);
            }
+            CurrentFontSize = _config.uiItem.currentFontSize;
            CurrentLanguage = _config.uiItem.currentLanguage;

            this.WhenAnyValue(
@@ -1602,6 +1606,23 @@ namespace v2rayN.ViewModels
                     }
                 });

+            this.WhenAnyValue(
+               x => x.CurrentFontSize,
+               y => y > 0)
+                  .Subscribe(c =>
+                  {
+                      if (CurrentFontSize >= Global.MinFontSize)
+                      {
+                          _config.uiItem.currentFontSize = CurrentFontSize;
+                          double size = (long)CurrentFontSize;
+                          Application.Current.Resources["StdFontSize"] = size;
+                          Application.Current.Resources["StdFontSize1"] = size + 2;
+                          Application.Current.Resources["StdFontSize2"] = size + 4;
+
+                          ConfigHandler.SaveConfig(ref _config);
+                      }
+                  });
+
            this.WhenAnyValue(
             x => x.CurrentLanguage,
             y => y != null && !y.IsNullOrEmpty())
@@ -1674,7 +1695,7 @@ namespace v2rayN.ViewModels

        private void AutoHideStartup()
        {
-            if (_config.autoHideStartup)
+            if (_config.uiItem.autoHideStartup)
            {
                Observable.Range(1, 1)
                 .Delay(TimeSpan.FromSeconds(1))
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -28,6 +28,8 @@ namespace v2rayN.ViewModels
        [Reactive] public bool logEnabled { get; set; }
        [Reactive] public string loglevel { get; set; }
        [Reactive] public bool defAllowInsecure { get; set; }
+        [Reactive] public string defFingerprint { get; set; }
+        [Reactive] public string defUserAgent { get; set; }
        #endregion

        #region Core DNS
@@ -60,6 +62,8 @@ namespace v2rayN.ViewModels
        [Reactive] public int autoUpdateInterval { get; set; }
        [Reactive] public int autoUpdateSubInterval { get; set; }
        [Reactive] public int trayMenuServersLimit { get; set; }
+        [Reactive] public string currentFontFamily { get; set; }
+
        #endregion

        #region System proxy
@@ -73,8 +77,12 @@ namespace v2rayN.ViewModels
        [Reactive] public string TunStack { get; set; }
        [Reactive] public int TunMtu { get; set; }
        [Reactive] public string TunCustomTemplate { get; set; }
+        [Reactive] public bool TunBypassMode { get; set; }
+        [Reactive] public bool TunBypassMode2 { get; set; }
        [Reactive] public string TunDirectIP { get; set; }
        [Reactive] public string TunDirectProcess { get; set; }
+        [Reactive] public string TunProxyIP { get; set; }
+        [Reactive] public string TunProxyProcess { get; set; }
        #endregion

        #region CoreType
@@ -110,6 +118,8 @@ namespace v2rayN.ViewModels
            logEnabled = _config.logEnabled;
            loglevel = _config.loglevel;
            defAllowInsecure = _config.defAllowInsecure;
+            defFingerprint = _config.defFingerprint;
+            defUserAgent = _config.defUserAgent;
            #endregion

            #region Core DNS
@@ -135,13 +145,15 @@ namespace v2rayN.ViewModels
            IgnoreGeoUpdateCore = _config.ignoreGeoUpdateCore;
            EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
            EnableSecurityProtocolTls13 = _config.enableSecurityProtocolTls13;
-            AutoHideStartup = _config.autoHideStartup;
+            AutoHideStartup = _config.uiItem.autoHideStartup;
            EnableCheckPreReleaseUpdate = _config.checkPreReleaseUpdate;
            EnableDragDropSort = _config.uiItem.enableDragDropSort;
            DoubleClick2Activate = _config.uiItem.doubleClick2Activate;
            autoUpdateInterval = _config.autoUpdateInterval;
            autoUpdateSubInterval = _config.autoUpdateSubInterval;
            trayMenuServersLimit = _config.trayMenuServersLimit;
+            currentFontFamily = _config.uiItem.currentFontFamily;
+
            #endregion

            #region System proxy
@@ -156,8 +168,14 @@ namespace v2rayN.ViewModels
            TunStack = _config.tunModeItem.stack;
            TunMtu = _config.tunModeItem.mtu;
            TunCustomTemplate = _config.tunModeItem.customTemplate;
+            TunBypassMode = _config.tunModeItem.bypassMode;
            TunDirectIP = Utils.List2String(_config.tunModeItem.directIP, true);
            TunDirectProcess = Utils.List2String(_config.tunModeItem.directProcess, true);
+            TunProxyIP = Utils.List2String(_config.tunModeItem.proxyIP, true);
+            TunProxyProcess = Utils.List2String(_config.tunModeItem.proxyProcess, true);
+            this.WhenAnyValue(
+              x => x.TunBypassMode)
+              .Subscribe(c => TunBypassMode2 = !TunBypassMode);

            #endregion

@@ -269,6 +287,8 @@ namespace v2rayN.ViewModels
            _config.loglevel = loglevel;
            _config.muxEnabled = muxEnabled;
            _config.defAllowInsecure = defAllowInsecure;
+            _config.defFingerprint = defFingerprint;
+            _config.defUserAgent = defUserAgent;


            //DNS
@@ -299,13 +319,14 @@ namespace v2rayN.ViewModels
            _config.ignoreGeoUpdateCore = IgnoreGeoUpdateCore;
            _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
            _config.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
-            _config.autoHideStartup = AutoHideStartup;
+            _config.uiItem.autoHideStartup = AutoHideStartup;
            _config.autoUpdateInterval = autoUpdateInterval;
            _config.autoUpdateSubInterval = autoUpdateSubInterval;
            _config.checkPreReleaseUpdate = EnableCheckPreReleaseUpdate;
            _config.uiItem.enableDragDropSort = EnableDragDropSort;
            _config.uiItem.doubleClick2Activate = DoubleClick2Activate;
            _config.trayMenuServersLimit = trayMenuServersLimit;
+            _config.uiItem.currentFontFamily = currentFontFamily;

            //systemProxy
            _config.systemProxyExceptions = systemProxyExceptions;
@@ -317,8 +338,11 @@ namespace v2rayN.ViewModels
            _config.tunModeItem.stack = TunStack;
            _config.tunModeItem.mtu = TunMtu;
            _config.tunModeItem.customTemplate = TunCustomTemplate;
+            _config.tunModeItem.bypassMode = TunBypassMode;
            _config.tunModeItem.directIP = Utils.String2List(TunDirectIP);
            _config.tunModeItem.directProcess = Utils.String2List(TunDirectProcess);
+            _config.tunModeItem.proxyIP = Utils.String2List(TunProxyIP);
+            _config.tunModeItem.proxyProcess = Utils.String2List(TunProxyProcess);

            //coreType 
            SaveCoreType();
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -73,7 +73,7 @@
                    Margin="4"
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -91,7 +91,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                <StackPanel
                    Grid.Row="2"
                    Grid.Column="2"
@@ -125,6 +125,7 @@
                    Width="200"
                    Margin="4"
                    HorizontalAlignment="Left"
+                    FontSize="{DynamicResource StdFontSize}"
                    MaxDropDownHeight="1000"
                    Style="{StaticResource MaterialDesignOutlinedComboBox}" />

@@ -157,7 +158,7 @@
                    Margin="4"
                    HorizontalAlignment="Left"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                <StackPanel
                    Grid.Row="6"
                    Grid.Column="1"
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -83,7 +83,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -97,7 +98,8 @@
                    Grid.Row="2"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="3"
@@ -112,7 +114,8 @@
                    Grid.Column="1"
                    Width="100"
                    Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
            </Grid>

            <Separator
@@ -148,7 +151,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                <Button
                    x:Name="btnGUID"
                    Grid.Row="1"
@@ -171,7 +175,8 @@
                    Grid.Column="1"
                    Width="100"
                    Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="3"
@@ -216,7 +221,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -261,7 +267,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -275,7 +282,8 @@
                    Grid.Row="2"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

            </Grid>
            <Grid
@@ -306,7 +314,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                <Button
                    x:Name="btnGUID5"
                    Grid.Row="1"
@@ -344,7 +353,8 @@
                    Grid.Column="1"
                    Width="200"
                    Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
            </Grid>
            <Grid
                x:Name="gridTrojan"
@@ -373,7 +383,8 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -478,7 +489,8 @@
                    Grid.Row="3"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                <TextBlock
                    x:Name="tipRequestHost"
                    Grid.Row="3"
@@ -500,7 +512,8 @@
                    Grid.Row="4"
                    Grid.Column="1"
                    Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                <TextBlock
                    x:Name="tipPath"
                    Grid.Row="4"
@@ -572,7 +585,8 @@
                    Grid.Column="1"
                    Width="400"
                    Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -602,6 +616,7 @@
                    Grid.Column="1"
                    Width="200"
                    Margin="{StaticResource ServerItemMargin}"
+                    IsEditable="True"
                    Style="{StaticResource DefComboBox}" />

                <TextBlock
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -71,7 +71,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />

                <TextBlock
                    Grid.Row="2"
@@ -88,7 +88,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />

                <TextBlock
                    Grid.Row="3"
@@ -105,7 +105,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                <TextBlock
                    Grid.Row="4"
                    Grid.Column="0"
@@ -121,7 +121,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                <TextBlock
                    Grid.Row="5"
                    Grid.Column="0"
@@ -137,7 +137,7 @@
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
            </Grid>

            <TextBlock
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -261,37 +261,74 @@
                            HorizontalAlignment="Right"
                            Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                            <StackPanel Margin="8">
-                                <StackPanel Orientation="Horizontal">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
                                        VerticalAlignment="Center"
                                        Style="{StaticResource ToolbarTextBlock}"
                                        Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
-                                    <ToggleButton x:Name="togDarkMode" Margin="8" />
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal">
+                                    <ToggleButton
+                                        x:Name="togDarkMode"
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="8" />
+
                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
                                        VerticalAlignment="Center"
                                        Style="{StaticResource ToolbarTextBlock}"
                                        Text="{x:Static resx:ResUI.TbSettingsColor}" />
                                    <ComboBox
                                        x:Name="cmbSwatches"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
                                        Width="100"
                                        Margin="8"
                                        DisplayMemberPath="Name"
                                        Style="{StaticResource DefComboBox}" />
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal">
+
                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
+                                    <ComboBox
+                                        x:Name="cmbCurrentFontSize"
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Width="100"
+                                        Margin="8"
+                                        Style="{StaticResource DefComboBox}" />
+
+                                    <TextBlock
+                                        Grid.Row="3"
+                                        Grid.Column="0"
                                        VerticalAlignment="Center"
                                        Style="{StaticResource ToolbarTextBlock}"
                                        Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                                    <ComboBox
                                        x:Name="cmbCurrentLanguage"
+                                        Grid.Row="3"
+                                        Grid.Column="1"
                                        Width="100"
                                        Margin="8"
                                        materialDesign:HintAssist.Hint="Language"
                                        Style="{StaticResource DefComboBox}" />
-                                </StackPanel>
+
+                                </Grid>
                            </StackPanel>
                        </materialDesign:PopupBox>
                    </ToolBar>
@@ -323,7 +360,8 @@
                            Width="200"
                            Margin="8,0"
                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
-                            materialDesign:TextFieldAssist.HasClearButton="True" />
+                            materialDesign:TextFieldAssist.HasClearButton="True"
+                            Style="{StaticResource DefTextBox}" />
                    </ToolBar>
                </ToolBarTray>

@@ -374,6 +412,7 @@
                                Width="120"
                                Margin="8,0"
                                materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
+                                FontSize="{DynamicResource StdFontSize}"
                                Style="{StaticResource MaterialDesignFloatingHintComboBox}">
                                <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
                                <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
@@ -387,6 +426,7 @@
                                Margin="8,0"
                                materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                                DisplayMemberPath="remarks"
+                                FontSize="{DynamicResource StdFontSize}"
                                Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                        </StackPanel>

@@ -495,6 +535,7 @@
                                                    Width="200"
                                                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
                                                    DisplayMemberPath="remarks"
+                                                    FontSize="{DynamicResource StdFontSize}"
                                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
                                            </DockPanel>
                                        </MenuItem.Header>
@@ -703,6 +744,7 @@
                                        MaxWidth="300"
                                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                                        DisplayMemberPath="remarks"
+                                        FontSize="{DynamicResource StdFontSize}"
                                        Style="{StaticResource MaterialDesignFilledComboBox}" />
                                </DockPanel>
                            </MenuItem.Header>
@@ -715,6 +757,7 @@
                                        MaxWidth="300"
                                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
                                        DisplayMemberPath="Text"
+                                        FontSize="{DynamicResource StdFontSize}"
                                        Style="{StaticResource MaterialDesignFilledComboBox}" />
                                </DockPanel>
                            </MenuItem.Header>
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -45,6 +45,11 @@ namespace v2rayN.Views
            ViewModel = new MainWindowViewModel(MainSnackbar.MessageQueue!, UpdateViewHandler);
            Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));

+            for (int i = Global.MinFontSize; i <= Global.MinFontSize + 8; i++)
+            {
+                cmbCurrentFontSize.Items.Add(i.ToString());
+            }
+
            Global.Languages.ForEach(it =>
            {
                cmbCurrentLanguage.Items.Add(it);
@@ -173,6 +178,7 @@ namespace v2rayN.Views
                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
                this.OneWayBind(ViewModel, vm => vm.Swatches, v => v.cmbSwatches.ItemsSource).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.SelectedSwatch, v => v.cmbSwatches.SelectedItem).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.Text).DisposeWith(disposables);
            });

@@ -254,11 +260,19 @@ namespace v2rayN.Views
        private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
        {
            var colHeader = sender as DataGridColumnHeader;
-            if (colHeader == null || colHeader.TabIndex < 0)
+            if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
            {
                return;
            }
-            if (colHeader.TabIndex == 0)
+
+            //find index
+            var index = lstProfiles.Columns.IndexOf(colHeader.Column);
+            if (index < 0)
+            {
+                index = colHeader.TabIndex;
+            }
+
+            if (index == 0)
            {
                foreach (var it in lstProfiles.Columns)
                {
@@ -268,7 +282,7 @@ namespace v2rayN.Views
                return;
            }

-            ViewModel?.SortServer(colHeader.TabIndex);
+            ViewModel?.SortServer(index);
        }

        private void menuSelectAll_Click(object sender, RoutedEventArgs e)
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -20,16 +20,20 @@
                Margin="8,0"
                VerticalAlignment="Center"
                Foreground="{DynamicResource PrimaryHueLightBrush}"
+                Style="{StaticResource ToolbarTextBlock}"
                Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-            <TextBox
-                x:Name="txtMsgFilter"
+            <ComboBox
+                x:Name="cmbMsgFilter"
                Width="200"
                Margin="8,0"
                materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
-                materialDesign:TextFieldAssist.HasClearButton="True" />
+                materialDesign:TextFieldAssist.HasClearButton="True"
+                IsEditable="True"
+                Style="{StaticResource DefComboBox}" />
            <TextBlock
                Margin="8,0"
                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
                Text="{x:Static resx:ResUI.TbAutoRefresh}" />
            <ToggleButton
                x:Name="togAutoRefresh"
@@ -40,7 +44,7 @@
        <TextBox
            Name="txtMsg"
            BorderThickness="0"
-            FontSize="11"
+            FontSize="{DynamicResource StdFontSize}"
            HorizontalScrollBarVisibility="Auto"
            IsReadOnly="True"
            TextWrapping="Wrap"
--- a/v2rayN/v2rayN/Views/MsgView.xaml.cs
+++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs
@@ -12,6 +12,10 @@ namespace v2rayN.Views
        {
            InitializeComponent();
            MessageBus.Current.Listen<string>("MsgView").Subscribe(x => DelegateAppendText(x));
+            Global.PresetMsgFilters.ForEach(it =>
+            {
+                cmbMsgFilter.Items.Add(it);
+            });
        }

        void DelegateAppendText(string msg)
@@ -30,7 +34,7 @@ namespace v2rayN.Views
            {
                return;
            }
-            var MsgFilter = txtMsgFilter.Text.TrimEx();
+            var MsgFilter = cmbMsgFilter.Text.TrimEx();
            if (!Utils.IsNullOrEmpty(MsgFilter))
            {
                if (!Regex.IsMatch(msg, MsgFilter))
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -48,194 +48,250 @@

        <TabControl>
            <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
-                <Grid Margin="{StaticResource SettingItemMargin}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <Grid Margin="{StaticResource SettingItemMargin}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>

-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsSocksPort}" />
-                    <TextBox
-                        x:Name="txtlocalPort"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsSocksPort}" />
+                        <TextBox
+                            x:Name="txtlocalPort"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            Margin="{StaticResource ServerItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsSocksPortTip}" />

-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
-                    <ToggleButton
-                        x:Name="togudpEnabled"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
+                        <ToggleButton
+                            x:Name="togudpEnabled"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
-                    <ToggleButton
-                        x:Name="togsniffingEnabled"
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
+                        <ToggleButton
+                            x:Name="togsniffingEnabled"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
-                    <ToggleButton
-                        x:Name="togrouteOnly"
-                        Grid.Row="3"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
+                        <ToggleButton
+                            x:Name="togrouteOnly"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
-                    <ToggleButton
-                        x:Name="togAllowLANConn"
-                        Grid.Row="4"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
+                        <ToggleButton
+                            x:Name="togAllowLANConn"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="5"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
-                    <ToggleButton
-                        x:Name="togNewPort4LAN"
-                        Grid.Row="5"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
+                        <ToggleButton
+                            x:Name="togNewPort4LAN"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="6"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsUser}" />
-                    <TextBox
-                        x:Name="txtuser"
-                        Grid.Row="6"
-                        Grid.Column="1"
-                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsUser}" />
+                        <TextBox
+                            x:Name="txtuser"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />

-                    <TextBlock
-                        Grid.Row="7"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsPass}" />
-                    <TextBox
-                        x:Name="txtpass"
-                        Grid.Row="7"
-                        Grid.Column="1"
-                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsPass}" />
+                        <TextBox
+                            x:Name="txtpass"
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />

-                    <TextBlock
-                        Grid.Row="8"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
-                    <ToggleButton
-                        x:Name="togmuxEnabled"
-                        Grid.Row="8"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
+                        <ToggleButton
+                            x:Name="togmuxEnabled"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="9"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsLogEnabled}" />
-                    <ToggleButton
-                        x:Name="toglogEnabled"
-                        Grid.Row="9"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="9"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsLogEnabled}" />
+                        <ToggleButton
+                            x:Name="toglogEnabled"
+                            Grid.Row="9"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />

-                    <TextBlock
-                        Grid.Row="10"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
-                    <ComboBox
-                        x:Name="cmbloglevel"
-                        Grid.Row="10"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        materialDesign:HintAssist.Hint="Level" />
+                        <TextBlock
+                            Grid.Row="10"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
+                        <ComboBox
+                            x:Name="cmbloglevel"
+                            Grid.Row="10"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            materialDesign:HintAssist.Hint="Level"
+                            Style="{StaticResource DefComboBox}" />

-                    <TextBlock
-                        Grid.Row="11"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
-                    <ToggleButton
-                        x:Name="togdefAllowInsecure"
-                        Grid.Row="11"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
-                        HorizontalAlignment="Left" />
-                </Grid>
+                        <TextBlock
+                            Grid.Row="11"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
+                        <ToggleButton
+                            x:Name="togdefAllowInsecure"
+                            Grid.Row="11"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="12"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
+                        <ComboBox
+                            x:Name="cmbdefFingerprint"
+                            Grid.Row="12"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="13"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
+                        <ComboBox
+                            x:Name="cmbdefUserAgent"
+                            Grid.Row="13"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
+                        <TextBlock
+                            Grid.Row="13"
+                            Grid.Column="3"
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
+                    </Grid>
+                </ScrollViewer>
            </TabItem>

            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
@@ -249,7 +305,8 @@
                        <ComboBox
                            x:Name="cmbdomainStrategy4Freedom"
                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefComboBox}" />
                    </StackPanel>

                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@@ -273,6 +330,7 @@
                        VerticalAlignment="Stretch"
                        AcceptsReturn="True"
                        BorderThickness="1"
+                        Style="{StaticResource DefTextBox}"
                        TextWrapping="Wrap"
                        VerticalScrollBarVisibility="Auto" />
                </DockPanel>
@@ -306,7 +364,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="mtu" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcpmtu"
                        Grid.Row="1"
                        Grid.Column="1"
@@ -320,7 +378,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="tti" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcptti"
                        Grid.Row="2"
                        Grid.Column="1"
@@ -334,7 +392,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="uplinkCapacity" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcpuplinkCapacity"
                        Grid.Row="3"
                        Grid.Column="1"
@@ -348,7 +406,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="downlinkCapacity" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcpdownlinkCapacity"
                        Grid.Row="4"
                        Grid.Column="1"
@@ -362,7 +420,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="readBufferSize" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcpreadBufferSize"
                        Grid.Row="5"
                        Grid.Column="1"
@@ -376,7 +434,7 @@
                        VerticalAlignment="Center"
                        Style="{StaticResource ToolbarTextBlock}"
                        Text="writeBufferSize" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                        x:Name="txtKcpwriteBufferSize"
                        Grid.Row="6"
                        Grid.Column="1"
@@ -424,6 +482,7 @@
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="Auto" />
                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
                        </Grid.ColumnDefinitions>

                        <TextBlock
@@ -439,6 +498,13 @@
                            Grid.Column="1"
                            Margin="{StaticResource SettingItemMargin}"
                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Margin="{StaticResource ServerItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsStartBootTip}" />

                        <TextBlock
                            Grid.Row="2"
@@ -466,7 +532,8 @@
                            Grid.Row="3"
                            Grid.Column="1"
                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefComboBox}" />

                        <TextBlock
                            Grid.Row="4"
@@ -592,7 +659,8 @@
                            Grid.Row="12"
                            Grid.Column="1"
                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />

                        <TextBlock
                            Grid.Row="13"
@@ -606,7 +674,8 @@
                            Grid.Row="13"
                            Grid.Column="1"
                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />

                        <TextBlock
                            Grid.Row="14"
@@ -620,7 +689,31 @@
                            Grid.Row="14"
                            Grid.Column="1"
                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
+
+                        <TextBlock
+                            Grid.Row="15"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
+                        <ComboBox
+                            x:Name="cmbcurrentFontFamily"
+                            Grid.Row="15"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            MaxDropDownHeight="1000"
+                            Style="{StaticResource DefComboBox}" />
+                        <TextBlock
+                            Grid.Row="15"
+                            Grid.Column="2"
+                            Margin="{StaticResource ServerItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}" />
                    </Grid>
                </ScrollViewer>
            </TabItem>
@@ -637,8 +730,10 @@
                        <ComboBox
                            x:Name="cmbsystemProxyAdvancedProtocol"
                            Grid.Row="4"
+                            MinWidth="200"
                            Margin="{StaticResource SettingItemMargin}"
-                            materialDesign:HintAssist.Hint="Protocol" />
+                            materialDesign:HintAssist.Hint="Protocol"
+                            Style="{StaticResource DefComboBox}" />

                    </StackPanel>

@@ -655,6 +750,7 @@
                        VerticalAlignment="Stretch"
                        AcceptsReturn="True"
                        BorderThickness="1"
+                        Style="{StaticResource DefTextBox}"
                        TextWrapping="Wrap"
                        VerticalScrollBarVisibility="Auto" />
                </DockPanel>
@@ -675,6 +771,7 @@
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                        </Grid.RowDefinitions>
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="Auto" />
@@ -723,7 +820,8 @@
                            Grid.Column="1"
                            Width="200"
                            Margin="{StaticResource SettingItemMargin}"
-                            HorizontalAlignment="Left" />
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource DefComboBox}" />

                        <TextBlock
                            Grid.Row="4"
@@ -738,7 +836,8 @@
                            Grid.Column="1"
                            Width="200"
                            Margin="{StaticResource SettingItemMargin}"
-                            HorizontalAlignment="Left" />
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource DefComboBox}" />

                        <TextBlock
                            Grid.Row="5"
@@ -751,10 +850,11 @@
                            x:Name="txtCustomTemplate"
                            Grid.Row="5"
                            Grid.Column="1"
-                            Width="600"
+                            Width="400"
                            Margin="{StaticResource SettingItemMargin}"
                            VerticalAlignment="Top"
                            AcceptsReturn="True"
+                            Style="{StaticResource DefTextBox}"
                            TextWrapping="Wrap" />
                        <Button
                            x:Name="btnBrowse"
@@ -765,9 +865,35 @@
                            Click="btnBrowse_Click"
                            Content="{x:Static resx:ResUI.TbBrowse}"
                            Style="{StaticResource DefButton}" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsTunModeBypassMode}" />
+                        <ToggleButton
+                            x:Name="togBypassMode"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="2"
+                            Margin="{StaticResource ServerItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsTunModeBypassModeTip}" />
                    </Grid>

-                    <Grid Margin="{StaticResource SettingItemMargin}">
+
+                    <Grid
+                        x:Name="gridTunModeDirect"
+                        Width="600"
+                        Margin="{StaticResource SettingItemMargin}"
+                        HorizontalAlignment="Left">
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="1*" />
                            <ColumnDefinition Width="10" />
@@ -776,10 +902,11 @@
                        <GroupBox
                            Grid.Column="0"
                            Header="{x:Static resx:ResUI.TbSettingsTunModeDirectIP}"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtDirectIP"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -787,14 +914,51 @@
                        <GroupBox
                            Grid.Column="2"
                            Header="{x:Static resx:ResUI.TbSettingsTunModeDirectProcess}"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtDirectProcess"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
                    </Grid>
+
+                    <Grid
+                        x:Name="gridTunModeProxy"
+                        Width="600"
+                        Margin="{StaticResource SettingItemMargin}"
+                        HorizontalAlignment="Left">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+                        <GroupBox
+                            Grid.Column="0"
+                            Header="{x:Static resx:ResUI.TbSettingsTunModeProxyIP}"
+                            Style="{StaticResource MyGroupBox}">
+                            <TextBox
+                                Name="txtProxyIP"
+                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
+                                TextWrapping="Wrap"
+                                VerticalScrollBarVisibility="Auto" />
+                        </GroupBox>
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+                        <GroupBox
+                            Grid.Column="2"
+                            Header="{x:Static resx:ResUI.TbSettingsTunModeProxyProcess}"
+                            Style="{StaticResource MyGroupBox}">
+                            <TextBox
+                                Name="txtProxyProcess"
+                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
+                                TextWrapping="Wrap"
+                                VerticalScrollBarVisibility="Auto" />
+                        </GroupBox>
+                    </Grid>
+
                </DockPanel>
            </TabItem>

@@ -825,7 +989,8 @@
                        Grid.Row="1"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />

                    <TextBlock
                        Grid.Row="2"
@@ -839,7 +1004,8 @@
                        Grid.Row="2"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />

                    <TextBlock
                        Grid.Row="3"
@@ -853,7 +1019,8 @@
                        Grid.Row="3"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />

                    <TextBlock
                        Grid.Row="4"
@@ -867,7 +1034,8 @@
                        Grid.Row="4"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />

                    <TextBlock
                        Grid.Row="5"
@@ -881,7 +1049,8 @@
                        Grid.Row="5"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />

                    <TextBlock
                        Grid.Row="6"
@@ -895,7 +1064,8 @@
                        Grid.Row="6"
                        Grid.Column="1"
                        Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
                </Grid>
            </TabItem>
        </TabControl>
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -1,15 +1,23 @@
 using ReactiveUI;
+using System.Globalization;
+using System.IO;
 using System.Reactive.Disposables;
 using System.Windows;
+using System.Windows.Media;
+using v2rayN.Handler;
+using v2rayN.Mode;
 using v2rayN.ViewModels;

 namespace v2rayN.Views
 {
    public partial class OptionSettingWindow
    {
+        private static Config _config;
+
        public OptionSettingWindow()
        {
            InitializeComponent();
+            _config = LazyConfig.Instance.GetConfig();

            ViewModel = new OptionSettingViewModel(this);

@@ -21,6 +29,14 @@ namespace v2rayN.Views
            {
                cmbloglevel.Items.Add(it);
            });
+            Global.fingerprints.ForEach(it =>
+            {
+                cmbdefFingerprint.Items.Add(it);
+            });
+            Global.userAgent.ForEach(it =>
+            {
+                cmbdefUserAgent.Items.Add(it);
+            });
            Global.domainStrategy4Freedoms.ForEach(it =>
            {
                cmbdomainStrategy4Freedom.Items.Add(it);
@@ -47,6 +63,48 @@ namespace v2rayN.Views
                cmbCoreType6.Items.Add(it);
            });

+            //fill fonts
+            try
+            {
+                var dir = new DirectoryInfo(Utils.GetFontsPath());
+                var files = dir.GetFiles("*.ttf");
+                var culture = _config.uiItem.currentLanguage.Equals(Global.Languages[0]) ? "zh-cn" : "en-us"; 
+                var culture2 = "en-us";
+                foreach (var it in files)
+                {
+                    var families = Fonts.GetFontFamilies(Utils.GetFontsPath(it.Name));
+                    foreach (FontFamily family in families)
+                    {
+                        var typefaces = family.GetTypefaces();
+                        foreach (Typeface typeface in typefaces)
+                        {
+                            typeface.TryGetGlyphTypeface(out GlyphTypeface glyph);
+                            var fontFace = glyph.Win32FaceNames[new CultureInfo("en-us")];
+                            if (!fontFace.Equals("Regular") && !fontFace.Equals("Normal"))
+                            {
+                                continue;
+                            }
+                            var fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture)];
+                            if (Utils.IsNullOrEmpty(fontFamily))
+                            {
+                                fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture2)];
+                                if (Utils.IsNullOrEmpty(fontFamily))
+                                {
+                                    continue;
+                                }
+                            }
+                            cmbcurrentFontFamily.Items.Add(fontFamily);
+                            break;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("fill fonts error", ex);
+            }
+            cmbcurrentFontFamily.Items.Add(string.Empty);
+
            this.WhenActivated(disposables =>
            {
                this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
@@ -63,6 +121,8 @@ namespace v2rayN.Views
                this.Bind(ViewModel, vm => vm.logEnabled, v => v.toglogEnabled.IsChecked).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.loglevel, v => v.cmbloglevel.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.defAllowInsecure, v => v.togdefAllowInsecure.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.defFingerprint, v => v.cmbdefFingerprint.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.defUserAgent, v => v.cmbdefUserAgent.Text).DisposeWith(disposables);


                this.Bind(ViewModel, vm => vm.domainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.Text).DisposeWith(disposables);
@@ -92,6 +152,7 @@ namespace v2rayN.Views
                this.Bind(ViewModel, vm => vm.autoUpdateInterval, v => v.txtautoUpdateInterval.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.autoUpdateSubInterval, v => v.txtautoUpdateSubInterval.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.trayMenuServersLimit, v => v.txttrayMenuServersLimit.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.currentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);


                this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
@@ -103,8 +164,13 @@ namespace v2rayN.Views
                this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.TunCustomTemplate, v => v.txtCustomTemplate.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunBypassMode, v => v.togBypassMode.IsChecked).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.TunBypassMode, v => v.gridTunModeDirect.Visibility, vmToViewConverterOverride: new BooleanToVisibilityTypeConverter()).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.TunBypassMode2, v => v.gridTunModeProxy.Visibility, vmToViewConverterOverride: new BooleanToVisibilityTypeConverter()).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.TunDirectIP, v => v.txtDirectIP.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.TunDirectProcess, v => v.txtDirectProcess.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunProxyIP, v => v.txtProxyIP.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunProxyProcess, v => v.txtProxyProcess.Text).DisposeWith(disposables);


                this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -65,7 +65,8 @@
                Grid.Column="1"
                Width="200"
                Margin="4"
-                HorizontalAlignment="Left" />
+                HorizontalAlignment="Left"
+                Style="{StaticResource DefTextBox}" />

            <TextBlock
                Grid.Row="2"
@@ -80,6 +81,7 @@
                Grid.Column="1"
                Margin="4"
                HorizontalAlignment="Left"
+                FontSize="{DynamicResource StdFontSize}"
                Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />

            <TextBlock
@@ -94,6 +96,7 @@
                Grid.Row="3"
                Grid.Column="1"
                Margin="4"
+                FontSize="{DynamicResource StdFontSize}"
                Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />

            <TextBlock
@@ -143,7 +146,7 @@
                HorizontalAlignment="Left"
                VerticalAlignment="Center">
                <CheckBox x:Name="chkAutoSort">
-                    <TextBlock Text="{x:Static resx:ResUI.TbAutoSort}" />
+                    <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbAutoSort}" />
                </CheckBox>
            </StackPanel>
            <Button
@@ -172,10 +175,11 @@
            <GroupBox
                Grid.Column="0"
                Header="Domain"
-                Style="{StaticResource MaterialDesignGroupBox}">
+                Style="{StaticResource MyGroupBox}">
                <TextBox
                    Name="txtDomain"
                    AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}"
                    TextWrapping="Wrap"
                    VerticalScrollBarVisibility="Auto" />
            </GroupBox>
@@ -183,10 +187,11 @@
            <GroupBox
                Grid.Column="2"
                Header="IP"
-                Style="{StaticResource MaterialDesignGroupBox}">
+                Style="{StaticResource MyGroupBox}">
                <TextBox
                    Name="txtIP"
                    AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}"
                    TextWrapping="Wrap"
                    VerticalScrollBarVisibility="Auto" />
            </GroupBox>
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -114,6 +114,7 @@
                HorizontalAlignment="Left"
                VerticalAlignment="Top"
                AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                TextWrapping="Wrap" />

            <TextBlock
@@ -146,6 +147,7 @@
                Margin="4"
                VerticalAlignment="Top"
                AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                TextWrapping="Wrap" />

            <TextBlock
@@ -163,6 +165,7 @@
                Margin="4"
                VerticalAlignment="Top"
                AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                TextWrapping="Wrap" />
            <Button
                x:Name="btnBrowse"
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -224,10 +224,11 @@
                        <GroupBox
                            Grid.Column="0"
                            Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtProxyDomain"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -235,10 +236,11 @@
                        <GroupBox
                            Grid.Column="2"
                            Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtProxyIP"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -255,10 +257,11 @@
                        <GroupBox
                            Grid.Column="0"
                            Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtDirectDomain"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -266,10 +269,11 @@
                        <GroupBox
                            Grid.Column="2"
                            Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtDirectIP"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -286,10 +290,11 @@
                        <GroupBox
                            Grid.Column="0"
                            Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtBlockDomain"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
@@ -297,10 +302,11 @@
                        <GroupBox
                            Grid.Column="2"
                            Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                            <TextBox
                                Name="txtBlockIP"
                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                TextWrapping="Wrap"
                                VerticalScrollBarVisibility="Auto" />
                        </GroupBox>
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -69,7 +69,7 @@
                    Margin="4"
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                    TextWrapping="Wrap" />

                <TextBlock
@@ -88,7 +88,7 @@
                    VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                    TextWrapping="Wrap" />

                <TextBlock
@@ -120,7 +120,7 @@
                    VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                    TextWrapping="Wrap" />

                <TextBlock
@@ -139,7 +139,7 @@
                    VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />

                <TextBlock
                    Grid.Row="6"
@@ -156,7 +156,7 @@
                    Margin="4"
                    VerticalAlignment="Top"
                    AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />

            </Grid>
            <Grid
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -9,11 +9,11 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.7</FileVersion>
+		<FileVersion>6.9</FileVersion>
 	</PropertyGroup>

 	<ItemGroup>		
-		<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
+		<PackageReference Include="MaterialDesignThemes" Version="4.7.1" />
 		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />		 
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 		<PackageReference Include="NHotkey" Version="2.1.0" />
@@ -99,12 +99,9 @@
 	  <EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
 	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <None Update="Resources\Fonts\SourceHanSansCN-Regular.ttf">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
+	  <EmbeddedResource Update="Resx\ResUI.ru.resx">
+	    <Generator>PublicResXFileCodeGenerator</Generator>
+	  </EmbeddedResource>
 	</ItemGroup>

 </Project>
Author	SHA1	Message	Date
2dust	9dfd89c90d	up 6.9	2023-02-06 19:28:43 +08:00
2dust	f6972125cd	Update tun_singbox	2023-02-06 19:19:36 +08:00
2dust	6e366bf55a	Improved enhanced tun mode	2023-02-06 15:29:10 +08:00
2dust	5e2e45c673	Merge branch 'master' of https://github.com/2dust/v2rayN	2023-02-05 20:17:07 +08:00
2dust	f879235564	fix get Win32FamilyNames	2023-02-05 20:17:03 +08:00
2dust	b00aee2ae7	Merge pull request #3187 from saphirique/patch-1 Add russian language	2023-02-05 19:57:08 +08:00
saphirique	28c2159ec3	add russian language	2023-02-05 17:55:24 +08:00
2dust	33dcef2285	Optimize Update Subscription	2023-02-04 18:52:17 +08:00
2dust	b9acd0ec28	Font size custom	2023-02-04 15:43:49 +08:00
2dust	7989d5180b	adjust style	2023-02-04 14:25:21 +08:00
2dust	238086942e	change fonts folder	2023-02-04 12:50:38 +08:00
2dust	a704a30242	up 6.8	2023-02-03 20:03:21 +08:00
2dust	26dd0d0ea5	add more PresetFingerprints	2023-02-03 09:45:21 +08:00
2dust	e31a4bcaa9	share link to add fingerprint	2023-02-03 09:39:39 +08:00
2dust	1722dc570b	Modified the tun mode configuration template	2023-02-03 08:59:28 +08:00
2dust	3575e69b43	Tun mode can be auto turned on at startup	2023-02-02 16:27:35 +08:00
2dust	373d89874c	Add custom font settings	2023-02-02 13:51:58 +08:00
2dust	976087ce97	Merge pull request #3165 from DanielBlackBeard/master add more Farsi Translation	2023-02-02 10:51:21 +08:00
2dust	69a45788ee	Merge pull request #3154 from mojpangr26/dev 增加自定义UA	2023-02-02 10:51:03 +08:00
mojpangr26	92e4de12fb	修改可编辑cmb 增加提示	2023-02-02 09:41:23 +08:00
Persian Prince	ea7fdb9b3d	add more Farsi Translation	2023-02-01 21:40:26 +03:30
mojpangr26	fe1c043b8e	自定义UA	2023-02-01 17:07:36 +08:00
2dust	146f597a0b	Fix the problem after clicking to sort and drag	2023-02-01 15:23:17 +08:00
2dust	d2bef312ce	Add default fingerprint settings	2023-02-01 11:24:45 +08:00
2dust	61f297215d	Optimize remove server	2023-02-01 11:08:05 +08:00
2dust	639a9fd540	Add test completion prompt	2023-02-01 10:06:19 +08:00
2dust	3d0428c518	add info filter the preset value	2023-02-01 09:53:37 +08:00