CloneServerStatItem 时检查indexId和toIndexId是否相同 (#6478)

* Update ResUI.fa-Ir.resx

e0ae101ff4

* Update ResUI.fa-Ir.resx

README.md

@@ -22,7 +22,7 @@ Fedora 30+
 ### macOS
 - `chmod +x v2rayN` Run `./v2rayN` under user permissions
 ```
-macOS 10.14+
+macOS 11+
 ```
 
 ## Requirements  

package-osx.sh

@@ -7,22 +7,10 @@ Version="$3"
 PackagePath="v2rayN-Package-${Arch}"
 mkdir -p "$PackagePath/v2rayN.app/Contents/Resources"
 cp -rf "$OutputPath" "$PackagePath/v2rayN.app/Contents/MacOS"
+cp -f "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.icns" "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns"
 echo "When this file exists, app will not store configs under this folder" > "$PackagePath/v2rayN.app/Contents/MacOS/NotStoreConfigHere.txt"
 chmod +x "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN"
 
-mkdir -p "$PackagePath/icons.iconset"
-sips -z 16 16 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16.png"
-sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16@2x.png"
-sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32.png"
-sips -z 64 64 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32@2x.png"
-sips -z 128 128 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128.png"
-sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128@2x.png"
-sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256.png"
-sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256@2x.png"
-sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512.png"
-sips -z 1024 1024 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512@2x.png"
-iconutil -c icns "$PackagePath/icons.iconset" -o "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns"
-
 cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

v2rayN/AmazTool/AmazTool.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
+	<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
 	<FileVersion>1.3.1</FileVersion>
   </PropertyGroup>
  

v2rayN/AmazTool/UpgradeApp.cs

@@ -10,7 +10,7 @@ namespace AmazTool
         {
             Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
 
-            Waiting(3);
+            Waiting(5);
 
             if (!File.Exists(fileName))
             {

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -97,6 +97,30 @@ namespace ServiceLib.Common
             return result;
         }
 
+        /// <summary>
+        /// Serialize Object to Json string
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static string Serialize(object? obj, JsonSerializerOptions options)
+        {
+            var result = string.Empty;
+            try
+            {
+                if (obj == null)
+                {
+                    return result;
+                }
+                result = JsonSerializer.Serialize(obj, options);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+            }
+            return result;
+        }
+
         /// <summary>
         /// SerializeToNode
         /// </summary>

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -81,9 +81,7 @@ public static class ProcUtils
             return;
         }
 
-        var procId = review ? proc?.Id : null;
+        GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
-        var fileName = review ? proc?.MainModule?.FileName : null;
-        var processName = review ? proc?.ProcessName : null;
 
         try { proc?.Kill(true); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
         try { proc?.Kill(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
@@ -91,6 +89,29 @@ public static class ProcUtils
         try { proc?.Dispose(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
 
         await Task.Delay(300);
+        await ProcessKillByKeyInfo(review, procId, fileName, processName);
+    }
+
+    private static void GetProcessKeyInfo(Process? proc, bool review, out int? procId, out string? fileName, out string? processName)
+    {
+        procId = null;
+        fileName = null;
+        processName = null;
+        if (!review) return;
+        try
+        {
+            procId = proc?.Id;
+            fileName = proc?.MainModule?.FileName;
+            processName = proc?.ProcessName;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task ProcessKillByKeyInfo(bool review, int? procId, string? fileName, string? processName)
+    {
         if (review && procId != null && fileName != null)
         {
             try

v2rayN/ServiceLib/Common/Utils.cs

@@ -558,7 +558,7 @@ namespace ServiceLib.Common
 
         public static string GetRuntimeInfo()
         {
-            return $"{Utils.GetVersion()} | {Utils.StartupPath()} | {Utils.GetExePath()} | {Environment.OSVersion} | {(Environment.Is64BitOperatingSystem ? 64 : 32)}";
+            return $"{Utils.GetVersion()} | {Utils.StartupPath()} | {Utils.GetExePath()} | {Environment.OSVersion}";
         }
 
         /// <summary>

v2rayN/ServiceLib/Enums/ETheme.cs

@@ -0,0 +1,13 @@
+namespace ServiceLib.Enums
+{
+    public enum ETheme
+    {
+        FollowSystem,
+        Dark,
+        Light,
+        Aquatic,
+        Desert,
+        Dusk,
+        NightSky
+    }
+}

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -106,8 +106,14 @@
             if (Utils.IsWindows())
             {
                 _processJob ??= new();
+                try
+                {
                     _processJob?.AddProcess(processHandle);
                 }
+                catch
+                {
+                }
+            }
         }
 
         #endregion Config

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -156,6 +156,12 @@ namespace ServiceLib.Handler
             config.SystemProxyItem ??= new();
             config.WebDavItem ??= new();
             config.CheckUpdateItem ??= new();
+            config.Fragment4RayItem ??= new()
+            {
+                Packets = "tlshello",
+                Length = "100-200",
+                Interval = "10-20"
+            };
 
             if (Utils.IsNotEmpty(config.ConstItem.DefIEProxyExceptions))
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -258,6 +258,7 @@ namespace ServiceLib.Handler
                     proc.BeginErrorReadLine();
                 }
 
+                AppHandler.Instance.AddProcess(proc.Handle);
                 if (proc.WaitForExit(1000))
                 {
                     proc.CancelErrorRead();

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -72,6 +72,11 @@
                 return;
             }
 
+            if(indexId == toIndexId)
+            {
+                return;
+            }
+
             var stat = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
             if (stat == null)
             {

v2rayN/ServiceLib/Models/Config.cs

@@ -47,6 +47,7 @@
         public SystemProxyItem SystemProxyItem { get; set; }
         public WebDavItem WebDavItem { get; set; }
         public CheckUpdateItem CheckUpdateItem { get; set; }
+        public Fragment4RayItem? Fragment4RayItem { get; set; }
         public List<InItem> Inbound { get; set; }
         public List<KeyEventItem> GlobalHotkeys { get; set; }
         public List<CoreTypeItem> CoreTypeItem { get; set; }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -102,9 +102,8 @@
         public double MainGirdHeight1 { get; set; }
         public double MainGirdHeight2 { get; set; }
         public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
-        public bool ColorModeDark { get; set; }
-        public bool FollowSystemTheme { get; set; }
         public string? ColorPrimaryName { get; set; }
+        public string? CurrentTheme { get; set; }
         public string CurrentLanguage { get; set; }
         public string CurrentFontFamily { get; set; }
         public int CurrentFontSize { get; set; }
@@ -246,4 +245,12 @@
         public bool CheckPreReleaseUpdate { get; set; }
         public List<string>? SelectedCoreTypes { get; set; }
     }
+
+    [Serializable]
+    public class Fragment4RayItem
+    {
+        public string? Packets { get; set; }
+        public string? Length { get; set; }
+        public string? Interval { get; set; }
+    }
 }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -942,15 +942,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Import old config (guiNConfig) 的本地化字符串。
-        /// </summary>
-        public static string menuImportOldGuiConfig {
-            get {
-                return ResourceManager.GetString("menuImportOldGuiConfig", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Import Rules From Clipboard 的本地化字符串。
         /// </summary>
@@ -1348,7 +1339,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Import Advanced Rules 的本地化字符串。
+        ///   查找类似 Import Rules 的本地化字符串。
         /// </summary>
         public static string menuRoutingAdvancedImportRules {
             get {
@@ -1536,15 +1527,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Save Interface Layout 的本地化字符串。
-        /// </summary>
-        public static string menuStorageUI {
-            get {
-                return ResourceManager.GetString("menuStorageUI", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
@@ -2356,15 +2338,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Enable advanced function 的本地化字符串。
-        /// </summary>
-        public static string TbenableRoutingAdvanced {
-            get {
-                return ResourceManager.GetString("TbenableRoutingAdvanced", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Enable Tun 的本地化字符串。
         /// </summary>
@@ -2815,15 +2788,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Dark Mode 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsColorMode {
-            get {
-                return ResourceManager.GetString("TbSettingsColorMode", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Core: basic settings 的本地化字符串。
         /// </summary>
@@ -3094,15 +3058,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Follow System Theme 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsFollowSystemTheme {
-            get {
-                return ResourceManager.GetString("TbSettingsFollowSystemTheme", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Font Size 的本地化字符串。
         /// </summary>
@@ -3463,6 +3418,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Theme 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTheme {
+            get {
+                return ResourceManager.GetString("TbSettingsTheme", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable Security Protocol TLS v1.3 (subscription/update) 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -481,9 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>رنگ</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>حالت تاریک</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>زبان</value>
   </data>
@@ -839,7 +836,7 @@
     <value>اضافه کردن</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>وارد کردن قوانین پیشرفته</value>
+    <value>وارد کردن مجموعه قوانین</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
     <value>حذف انتخاب شده</value>
@@ -853,9 +850,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>استراتژی دامنه</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>فعال کردن عملکرد پیشرفته</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3. مسدود کردن دامنه یا آیپی</value>
   </data>
@@ -940,9 +934,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>نمایش گزارش</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>پیکربندی قدیمی guiNConfig را وارد شود</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>فعال سازی Tun</value>
   </data>
@@ -1105,9 +1096,6 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>فعال سازی</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>ذخیره طرح رابط</value>
-  </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
     <value>منبع فایل های جغرافیایی (اختیاری)</value>
   </data>
@@ -1273,9 +1261,6 @@
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>حداکتر پهنای باند هیستریا (آپلود/دانلود)</value>
   </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>دنبال کردن تم سیستم</value>
-  </data>
   <data name="menuAddTuicServer" xml:space="preserve">
     <value>افزودن سرور [TUIC]</value>
   </data>
@@ -1402,4 +1387,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks:پورت محلی، socks2: پورت دوم محلی، socks3: پورت LAN</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>تم</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -481,12 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>Szín</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>Sötét mód</value>
-  </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>Kövesse a rendszer témáját</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>Nyelv (Újraindítás)</value>
   </data>
@@ -856,9 +850,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Domain stratégia</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>Fejlett funkció engedélyezése</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3. Domain vagy IP blokkolása</value>
   </data>
@@ -943,9 +934,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>Napló megjelenítése</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Régi konfiguráció importálása (guiNConfig)</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Tun engedélyezése</value>
   </data>
@@ -1318,9 +1306,6 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>Aktív</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>Szoftverfelület elmentése</value>
-  </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
     <value>Geo fájlok forrása (opcionális)</value>
   </data>
@@ -1402,4 +1387,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -481,12 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>Color</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>Dark Mode</value>
-  </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>Follow System Theme</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>Language (Restart)</value>
   </data>
@@ -842,7 +836,7 @@
     <value>Add</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>Import Advanced Rules</value>
+    <value>Import Rules</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
     <value>Remove selected (Delete)</value>
@@ -856,9 +850,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Domain strategy</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>Enable advanced function</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3.Block Domain or IP</value>
   </data>
@@ -943,9 +934,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>Display Log</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config (guiNConfig)</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Enable Tun</value>
   </data>
@@ -1318,9 +1306,6 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>Active</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>Save Interface Layout</value>
-  </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
     <value>Geo files source (optional)</value>
   </data>
@@ -1402,4 +1387,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -481,12 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>Цвет</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>Тёмный режим</value>
-  </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>Следить за системной темой</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>Язык (требуется перезапуск)</value>
   </data>
@@ -862,9 +856,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Доменная стратегия</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>Включить расширенные функции</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3.Заблокировать домен или IP</value>
   </data>
@@ -949,9 +940,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>Показать логи</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Импортировать старый конфиг guiNConfig</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Режим VPN</value>
   </data>
@@ -1270,9 +1258,6 @@
   <data name="LvConvertTarget" xml:space="preserve">
     <value>Convert target type</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>Save Interface Layout</value>
-  </data>
   <data name="SpeedDisplayText" xml:space="preserve">
     <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
@@ -1402,4 +1387,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -481,12 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>颜色</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>暗黑模式</value>
-  </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>跟随系统主题</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>语言(需重启)</value>
   </data>
@@ -842,7 +836,7 @@
     <value>添加规则集</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>一键导入高级规则</value>
+    <value>一键导入规则集</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
     <value>移除所选规则 (Delete)</value>
@@ -856,9 +850,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>启用高级功能</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3.阻止的Domain或IP</value>
   </data>
@@ -943,9 +934,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>显示日志</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>导入旧的配置文件guiNConfig</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>启用Tun</value>
   </data>
@@ -1315,9 +1303,6 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>活动</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>保存界面布局</value>
-  </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
     <value>Geo文件来源(可选)</value>
   </data>
@@ -1399,4 +1384,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二个本地端口，socks3：局域网端口</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>主题</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -481,12 +481,6 @@
   <data name="TbSettingsColor" xml:space="preserve">
     <value>顏色</value>
   </data>
-  <data name="TbSettingsColorMode" xml:space="preserve">
-    <value>暗黑模式</value>
-  </data>
-  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
-    <value>跟隨系統主題</value>
-  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>語言(需重啟)</value>
   </data>
@@ -843,7 +837,7 @@
     <value>新增規則集</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>一鍵匯入進階規則</value>
+    <value>一鍵匯入規則集</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
     <value>移除所選規則 (Delete)</value>
@@ -857,9 +851,6 @@
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>
-  <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>啟動進階功能</value>
-  </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3.阻止的Domain或IP</value>
   </data>
@@ -944,9 +935,6 @@
   <data name="TbDisplayLog" xml:space="preserve">
     <value>顯示日誌</value>
   </data>
-  <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>匯入舊的設定檔guiNConfig</value>
-  </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>啟用Tun</value>
   </data>
@@ -1196,9 +1184,6 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>活動</value>
   </data>
-  <data name="menuStorageUI" xml:space="preserve">
-    <value>儲存介面佈局</value>
-  </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
     <value>Geo檔案來源(可選)</value>
   </data>
@@ -1400,4 +1385,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二個本地端口，socks3：區域網路端口</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>主題</value>
+  </data>
 </root>

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.5.5</Version>
+	<Version>7.6.0</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -1259,7 +1259,8 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.experimental ??= new Experimental4Sbox();
                 singboxConfig.experimental.cache_file = new CacheFile4Sbox()
                 {
-                    enabled = true
+                    enabled = true,
+                    path = Utils.GetConfigPath("cache.db")
                 };
             }
 

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -567,6 +567,7 @@ namespace ServiceLib.Services.CoreConfig
         {
             try
             {
+                var muxEnabled = _config.CoreBasicItem.MuxEnabled;
                 switch (node.ConfigType)
                 {
                     case EConfigType.VMess:
@@ -607,7 +608,7 @@ namespace ServiceLib.Services.CoreConfig
                                 usersItem.security = Global.DefaultSecurity;
                             }
 
-                            await GenOutboundMux(node, outbound, _config.CoreBasicItem.MuxEnabled);
+                            await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
 
                             outbound.settings.servers = null;
                             break;
@@ -632,7 +633,7 @@ namespace ServiceLib.Services.CoreConfig
                             serversItem.ota = false;
                             serversItem.level = 1;
 
-                            await GenOutboundMux(node, outbound, false);
+                            await GenOutboundMux(node, outbound);
 
                             outbound.settings.vnext = null;
                             break;
@@ -668,7 +669,7 @@ namespace ServiceLib.Services.CoreConfig
                                 serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
                             }
 
-                            await GenOutboundMux(node, outbound, false);
+                            await GenOutboundMux(node, outbound);
 
                             outbound.settings.vnext = null;
                             break;
@@ -702,22 +703,15 @@ namespace ServiceLib.Services.CoreConfig
                             usersItem.email = Global.UserEMail;
                             usersItem.encryption = node.Security;
 
-                            await GenOutboundMux(node, outbound, _config.CoreBasicItem.MuxEnabled);
+                            if (node.Flow.IsNullOrEmpty())
-
-                            if (node.StreamSecurity == Global.StreamSecurityReality || node.StreamSecurity == Global.StreamSecurity)
                             {
-                                if (Utils.IsNotEmpty(node.Flow))
+                                await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
+                            }
+                            else
                             {
                                 usersItem.flow = node.Flow;
-
+                                await GenOutboundMux(node, outbound, false, muxEnabled);
-                                    await GenOutboundMux(node, outbound, false);
                             }
-                            }
-                            if (node.StreamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.Flow))
-                            {
-                                await GenOutboundMux(node, outbound, _config.CoreBasicItem.MuxEnabled);
-                            }
-
                             outbound.settings.servers = null;
                             break;
                         }
@@ -740,7 +734,7 @@ namespace ServiceLib.Services.CoreConfig
                             serversItem.ota = false;
                             serversItem.level = 1;
 
-                            await GenOutboundMux(node, outbound, false);
+                            await GenOutboundMux(node, outbound);
 
                             outbound.settings.vnext = null;
                             break;
@@ -757,22 +751,24 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        private async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
+        private async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabledTCP = false, bool enabledUDP = false)
         {
             try
             {
-                if (enabled)
+                outbound.mux.enabled = false;
+                outbound.mux.concurrency = -1;
+
+                if (enabledTCP)
                 {
                     outbound.mux.enabled = true;
                     outbound.mux.concurrency = _config.Mux4RayItem.Concurrency;
+                }
+                else if (enabledUDP)
+                {
+                    outbound.mux.enabled = true;
                     outbound.mux.xudpConcurrency = _config.Mux4RayItem.XudpConcurrency;
                     outbound.mux.xudpProxyUDP443 = _config.Mux4RayItem.XudpProxyUDP443;
                 }
-                else
-                {
-                    outbound.mux.enabled = false;
-                    outbound.mux.concurrency = -1;
-                }
             }
             catch (Exception ex)
             {
@@ -928,7 +924,7 @@ namespace ServiceLib.Services.CoreConfig
                         }
 
                         streamSettings.xhttpSettings = xhttpSettings;
-                        await GenOutboundMux(node, outbound, false);
+                        await GenOutboundMux(node, outbound);
 
                         break;
                     //h2
@@ -1038,10 +1034,14 @@ namespace ServiceLib.Services.CoreConfig
                 //Outbound Freedom domainStrategy
                 if (Utils.IsNotEmpty(domainStrategy4Freedom))
                 {
-                    var outbound = v2rayConfig.outbounds[1];
+                    var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                    if (outbound != null)
+                    {
+                        outbound.settings = new();
                         outbound.settings.domainStrategy = domainStrategy4Freedom;
                         outbound.settings.userLevel = 0;
                     }
+                }
 
                 var obj = JsonUtils.ParseJson(normalDNS);
                 if (obj is null)
@@ -1167,9 +1167,9 @@ namespace ServiceLib.Services.CoreConfig
                     {
                         fragment = new()
                         {
-                            packets = "tlshello",
+                            packets = _config.Fragment4RayItem?.Packets,
-                            length = "100-200",
+                            length = _config.Fragment4RayItem?.Length,
-                            interval = "10-20"
+                            interval = _config.Fragment4RayItem?.Interval
                         }
                     }
                 };

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -59,14 +59,14 @@ namespace ServiceLib.ViewModels
             {
                 return;
             }
-
-            _blLockShow = true;
             if (!_config.UiItem.ShowInTaskbar)
             {
-                await Task.Delay(1000);
+                return;
             }
 
-            await Task.Delay(100);
+            _blLockShow = true;
+
+            await Task.Delay(500);
             var txt = string.Join("", _queueMsg.ToArray());
             await _updateView?.Invoke(EViewAction.DispatcherShowMsg, txt);
 

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -2,6 +2,8 @@
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System.Reactive;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace ServiceLib.ViewModels
 {
@@ -189,7 +191,13 @@ namespace ServiceLib.ViewModels
             }
             if (lst.Count > 0)
             {
-                await _updateView?.Invoke(EViewAction.SetClipboardData, JsonUtils.Serialize(lst));
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = true,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                };
+                await _updateView?.Invoke(EViewAction.SetClipboardData, JsonUtils.Serialize(lst, options));
             }
         }
 

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -48,18 +48,6 @@ namespace ServiceLib.ViewModels
         [Reactive]
         public bool BlSystemProxyPac { get; set; }
 
-        [Reactive]
-        public bool BlNotSystemProxyClear { get; set; }
-
-        [Reactive]
-        public bool BlNotSystemProxySet { get; set; }
-
-        [Reactive]
-        public bool BlNotSystemProxyNothing { get; set; }
-
-        [Reactive]
-        public bool BlNotSystemProxyPac { get; set; }
-
         public ReactiveCommand<Unit, Unit> SystemProxyClearCmd { get; }
         public ReactiveCommand<Unit, Unit> SystemProxySetCmd { get; }
         public ReactiveCommand<Unit, Unit> SystemProxyNothingCmd { get; }
@@ -333,11 +321,6 @@ namespace ServiceLib.ViewModels
             BlSystemProxyNothing = (type == ESysProxyType.Unchanged);
             BlSystemProxyPac = (type == ESysProxyType.Pac);
 
-            BlNotSystemProxyClear = !BlSystemProxyClear;
-            BlNotSystemProxySet = !BlSystemProxySet;
-            BlNotSystemProxyNothing = !BlSystemProxyNothing;
-            BlNotSystemProxyPac = !BlSystemProxyPac;
-
             if (blChange)
             {
                 _updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);

v2rayN/v2rayN.Desktop/App.axaml

@@ -32,32 +32,18 @@
                         <NativeMenuItem
                             Command="{Binding SystemProxyClearCmd}"
                             Header="{x:Static resx:ResUI.menuSystemProxyClear}"
-                            IsVisible="{Binding BlNotSystemProxyClear}" />
+                            IsChecked="{Binding BlSystemProxyClear}"
-                        <NativeMenuItem
+                            ToggleType="Radio" />
-                            Command="{Binding SystemProxyClearCmd}"
-                            Header="{x:Static resx:ResUI.menuSystemProxyClear}"
-                            Icon="/Assets/NotifyIcon1.ico"
-                            IsVisible="{Binding BlSystemProxyClear}" />
-
                         <NativeMenuItem
                             Command="{Binding SystemProxySetCmd}"
                             Header="{x:Static resx:ResUI.menuSystemProxySet}"
-                            IsVisible="{Binding BlNotSystemProxySet}" />
+                            IsChecked="{Binding BlSystemProxySet}"
-                        <NativeMenuItem
+                            ToggleType="Radio" />
-                            Command="{Binding SystemProxySetCmd}"
-                            Header="{x:Static resx:ResUI.menuSystemProxySet}"
-                            Icon="/Assets/NotifyIcon2.ico"
-                            IsVisible="{Binding BlSystemProxySet}" />
-
                         <NativeMenuItem
                             Command="{Binding SystemProxyNothingCmd}"
                             Header="{x:Static resx:ResUI.menuSystemProxyNothing}"
-                            IsVisible="{Binding BlNotSystemProxyNothing}" />
+                            IsChecked="{Binding BlSystemProxyNothing}"
-                        <NativeMenuItem
+                            ToggleType="Radio" />
-                            Command="{Binding SystemProxyNothingCmd}"
-                            Header="{x:Static resx:ResUI.menuSystemProxyNothing}"
-                            Icon="/Assets/NotifyIcon3.ico"
-                            IsVisible="{Binding BlSystemProxyNothing}" />
                         <NativeMenuItemSeparator />
                         <NativeMenuItem Click="MenuAddServerViaClipboardClick" Header="{x:Static resx:ResUI.menuAddServerViaClipboard}" />
                         <NativeMenuItem Header="{x:Static resx:ResUI.menuAddServerViaScan}" IsVisible="False" />

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -40,6 +40,12 @@ namespace v2rayN.Desktop.Common
         public static WindowIcon GetAppIcon(ESysProxyType sysProxyType)
         {
             var index = (int)sysProxyType + 1;
+            var fileName = Utils.GetPath($"NotifyIcon{index}.ico");
+            if (File.Exists(fileName))
+            {
+                return new(fileName);
+            }
+
             var uri = new Uri(Path.Combine(Global.AvaAssets, $"NotifyIcon{index}.ico"));
             using var bitmap = new Bitmap(AssetLoader.Open(uri));
             return new(bitmap);

v2rayN/v2rayN.Desktop/Common/UI.cs

@@ -17,13 +17,11 @@ namespace v2rayN.Desktop.Common
 
         public static async Task<string?> OpenFileDialog(Window owner, FilePickerFileType? filter)
         {
-            var topLevel = TopLevel.GetTopLevel(owner);
+            var sp = GetStorageProvider(owner);
-            if (topLevel == null)
+            if (sp is null) return null;
-            {
+          
-                return null;
-            }
             // Start async operation to open the dialog.
-            var files = await topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            var files = await sp.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 AllowMultiple = false,
                 FileTypeFilter = filter is null ? [FilePickerFileTypes.All, FilePickerFileTypes.ImagePng] : [filter]
@@ -34,17 +32,21 @@ namespace v2rayN.Desktop.Common
 
         public static async Task<string?> SaveFileDialog(Window owner, string filter)
         {
-            var topLevel = TopLevel.GetTopLevel(owner);
+            var sp = GetStorageProvider(owner);
-            if (topLevel == null)
+            if (sp is null) return null;
-            {
+
-                return null;
-            }
             // Start async operation to open the dialog.
-            var files = await topLevel.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+            var files = await sp.SaveFilePickerAsync(new FilePickerSaveOptions
             {
             });
 
             return files?.TryGetLocalPath();
         }
+
+        private static IStorageProvider? GetStorageProvider(Window owner)
+        {
+            var topLevel = TopLevel.GetTopLevel(owner);
+            return topLevel?.StorageProvider;
+        }
     }
 }

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -6,14 +6,14 @@ using Avalonia.Media;
 using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Semi.Avalonia;
 using System.Reactive.Linq;
 
 namespace v2rayN.Desktop.ViewModels
 {
     public class ThemeSettingViewModel : MyReactiveObject
     {
-        [Reactive] public bool ColorModeDark { get; set; }
+        [Reactive] public string CurrentTheme { get; set; }
-        [Reactive] public bool FollowSystemTheme { get; set; }
 
         [Reactive] public int CurrentFontSize { get; set; }
 
@@ -36,28 +36,16 @@ namespace v2rayN.Desktop.ViewModels
 
         private void BindingUI()
         {
-            ColorModeDark = _config.UiItem.ColorModeDark;
+            CurrentTheme = _config.UiItem.CurrentTheme;
-            FollowSystemTheme = _config.UiItem.FollowSystemTheme;
             CurrentFontSize = _config.UiItem.CurrentFontSize;
             CurrentLanguage = _config.UiItem.CurrentLanguage;
 
-            this.WhenAnyValue(x => x.ColorModeDark)
+            this.WhenAnyValue(x => x.CurrentTheme)
                 .Subscribe(c =>
                 {
-                    if (_config.UiItem.ColorModeDark != ColorModeDark)
+                    if (_config.UiItem.CurrentTheme != CurrentTheme)
                     {
-                        _config.UiItem.ColorModeDark = ColorModeDark;
+                        _config.UiItem.CurrentTheme = CurrentTheme;
-                        ModifyTheme();
-                        ConfigHandler.SaveConfig(_config);
-                    }
-                });
-            this.WhenAnyValue(x => x.FollowSystemTheme,
-                    y => y == true)
-                .Subscribe(c =>
-                {
-                    if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
-                    {
-                        _config.UiItem.FollowSystemTheme = FollowSystemTheme;
                         ModifyTheme();
                         ConfigHandler.SaveConfig(_config);
                     }
@@ -96,7 +84,16 @@ namespace v2rayN.Desktop.ViewModels
             var app = Application.Current;
             if (app is not null)
             {
-                app.RequestedThemeVariant = FollowSystemTheme ? ThemeVariant.Default : (ColorModeDark ? ThemeVariant.Dark : ThemeVariant.Light);
+                app.RequestedThemeVariant = CurrentTheme switch
+                {
+                    nameof(ETheme.Dark) => ThemeVariant.Dark,
+                    nameof(ETheme.Light) => ThemeVariant.Light,
+                    nameof(ETheme.Aquatic) => SemiTheme.Aquatic,
+                    nameof(ETheme.Desert) => SemiTheme.Desert,
+                    nameof(ETheme.Dusk) => SemiTheme.Dusk,
+                    nameof(ETheme.NightSky) => SemiTheme.NightSky,
+                    _ => ThemeVariant.Default,
+                };
             }
         }
 

v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml

@@ -5,25 +5,28 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:DataType="vms:BackupAndRestoreViewModel"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="MinWidth" Value="180" />
+        </Style>
+    </UserControl.Styles>
 
     <DockPanel Classes="Margin8">
-        <DockPanel Classes="Margin8" DockPanel.Dock="Bottom">
+        <StackPanel Classes="Margin8" DockPanel.Dock="Bottom">
             <TextBlock
                 Name="txtMsg"
                 HorizontalAlignment="Left"
                 Classes="Margin8" />
-        </DockPanel>
+        </StackPanel>
 
         <StackPanel>
             <Border
                 Margin="4"
                 VerticalAlignment="Center"
-                Theme="{StaticResource CardBorder}">
+                Theme="{DynamicResource CardBorder}">
 
                 <Grid
                     Classes="Margin8"
@@ -49,7 +52,10 @@
                         Classes="Margin8"
                         Content="{x:Static resx:ResUI.menuLocalBackup}" />
 
-                    <Separator Grid.Row="2" Grid.ColumnSpan="2" />
+                    <Separator
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2" />
 
                     <TextBlock
                         Grid.Row="3"
@@ -69,21 +75,21 @@
             <Border
                 Margin="4"
                 VerticalAlignment="Center"
-                Theme="{StaticResource CardBorder}">
+                Theme="{DynamicResource CardBorder}">
                 <Grid
                     Classes="Margin8"
                     ColumnDefinitions="300,200"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto">
-                    <StackPanel Orientation="Horizontal">
+                    <StackPanel
-                        <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                            Classes="Margin8"
+                        Orientation="Horizontal">
-                            Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
+                        <TextBlock Classes="Margin8" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
                         <Button
                             Width="30"
                             Height="30"
+                            MinWidth="30"
                             Margin="10,0"
                             Theme="{DynamicResource BorderlessButton}">
                             <Button.Content>
@@ -184,7 +190,10 @@
                         Classes="Margin8"
                         Content="{x:Static resx:ResUI.menuRemoteBackup}" />
 
-                    <Separator Grid.Row="2" Grid.ColumnSpan="3" />
+                    <Separator
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"

v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs

@@ -9,7 +9,12 @@ namespace v2rayN.Desktop.Views
 {
     public partial class BackupAndRestoreView : ReactiveUserControl<BackupAndRestoreViewModel>
     {
-        private Window _window;
+        private Window? _window;
+
+        public BackupAndRestoreView()
+        {
+            InitializeComponent();
+        }
 
         public BackupAndRestoreView(Window window)
         {

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml

@@ -35,11 +35,16 @@
                 Content="{x:Static resx:ResUI.menuCheckUpdate}" />
         </StackPanel>
 
-        <StackPanel>
+        <Border
+            Margin="4"
+            VerticalAlignment="Center"
+            Theme="{DynamicResource CardBorder}">
+
             <ListBox
                 x:Name="lstCheckUpdates"
                 BorderThickness="1"
-                ItemsSource="{Binding CheckUpdateModels}">
+                ItemsSource="{Binding CheckUpdateModels}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
@@ -47,12 +52,7 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Border
+                        <Panel Width="500" VerticalAlignment="Center">
-                            Width="500"
-                            Height="80"
-                            Margin="-8"
-                            VerticalAlignment="Center"
-                            Theme="{StaticResource CardBorder}">
                             <Grid ColumnDefinitions="1*,1*,3*" RowDefinitions="Auto">
                                 <ToggleSwitch
                                     x:Name="togAutoRefresh"
@@ -73,11 +73,10 @@
                                     Text="{Binding Remarks}"
                                     TextWrapping="WrapWithOverflow" />
                             </Grid>
-                        </Border>
+                        </Panel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
-        </StackPanel>
+        </Border>
     </DockPanel>
-
 </UserControl>

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@@ -28,7 +28,7 @@
                 Text="{x:Static resx:ResUI.menuRulemode}" />
             <ComboBox
                 x:Name="cmbRulemode"
-                Width="80"
+                Width="100"
                 Margin="8,0">
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
@@ -41,7 +41,7 @@
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
-                Width="60"
+                Width="100"
                 Margin="8,0">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
@@ -95,7 +95,8 @@
             <ListBox
                 x:Name="lstProxyGroups"
                 DockPanel.Dock="Left"
-                ItemsSource="{Binding ProxyGroups}">
+                ItemsSource="{Binding ProxyGroups}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
@@ -105,10 +106,9 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="-6"
+                            Margin="-8,-4"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
-                            <DockPanel>
                             <Grid Classes="Margin8" RowDefinitions="1*,8,1*">
                                 <DockPanel Grid.Row="0">
                                     <TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
@@ -116,13 +116,15 @@
                                 </DockPanel>
                                 <TextBlock Grid.Row="2" Text="{Binding Now}" />
                             </Grid>
-                            </DockPanel>
                         </Border>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
 
-            <ListBox x:Name="lstProxyDetails" ItemsSource="{Binding ProxyDetails}">
+            <ListBox
+                x:Name="lstProxyDetails"
+                ItemsSource="{Binding ProxyDetails}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ContextMenu>
                     <ContextMenu>
                         <MenuItem x:Name="menuProxiesDelaytestPart" Header="{x:Static resx:ResUI.menuProxiesDelaytestPart}" />
@@ -138,7 +140,7 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="-6"
+                            Margin="-12,-4"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -150,71 +150,20 @@
                         x:Name="tabMain1"
                         Grid.Row="2"
                         TabStripPlacement="Left">
-                        <TabItem x:Name="tabMsgView1">
+                        <TabItem x:Name="tabMsgView1" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
-                            <TabItem.Header>
+                        <TabItem x:Name="tabClashProxies1" Header="{x:Static resx:ResUI.TbProxies}" />
-                                <StackPanel>
+                        <TabItem x:Name="tabClashConnections1" Header="{x:Static resx:ResUI.TbConnections}" />
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashProxies1">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashConnections1">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
                     </TabControl>
                 </Grid>
                 <Grid x:Name="gridMain2" IsVisible="False">
                     <TabControl x:Name="tabMain2" TabStripPlacement="Left">
-                        <TabItem x:Name="tabProfiles2">
+                        <TabItem x:Name="tabProfiles2" Header="{x:Static resx:ResUI.menuServers}" />
-                            <TabItem.Header>
+                        <TabItem x:Name="tabMsgView2" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
-                                <StackPanel>
+                        <TabItem x:Name="tabClashProxies2" Header="{x:Static resx:ResUI.TbProxies}" />
-
+                        <TabItem x:Name="tabClashConnections2" Header="{x:Static resx:ResUI.TbConnections}" />
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.menuServers}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabMsgView2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashProxies2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashConnections2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
                     </TabControl>
                 </Grid>
-
             </Grid>
-
         </DockPanel>
     </dialogHost:DialogHost>
 </Window>

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -65,7 +65,7 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True"
-                Theme="{StaticResource SimpleToggleSwitch}" />
+                Theme="{DynamicResource SimpleToggleSwitch}" />
             <TextBlock
                 Margin="8,0"
                 VerticalAlignment="Center"
@@ -75,7 +75,7 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True"
-                Theme="{StaticResource SimpleToggleSwitch}" />
+                Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
         <TextBox
             Name="txtMsg"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -114,8 +114,8 @@
                             Grid.ColumnSpan="2"
                             HorizontalAlignment="Left"
                             Classes="Margin8"
-                            SelectionMode="Multiple"
+                            SelectionMode="Multiple,Toggle"
-                            Theme="{DynamicResource PureCardRadioGroupListBox}" />
+                            Theme="{DynamicResource CardCheckGroupListBox}" />
 
                         <TextBlock
                             Grid.Row="6"
@@ -714,7 +714,6 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
-                <DockPanel Classes="Margin8">
                 <Grid
                     Classes="Margin8"
                     ColumnDefinitions="Auto,Auto,Auto"
@@ -809,7 +808,6 @@
                         Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
                         TextWrapping="Wrap" />
                 </Grid>
-                </DockPanel>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -165,7 +165,7 @@
                                         Classes="Solid Red"
                                         Content="{x:Static resx:ResUI.TipActiveServer}"
                                         IsVisible="{Binding IsActive}"
-                                        Theme="{StaticResource TagLabel}" />
+                                        Theme="{DynamicResource TagLabel}" />
                                     <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -15,7 +15,12 @@ namespace v2rayN.Desktop.Views
     public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     {
         private static Config _config;
-        private Window _window;
+        private Window? _window;
+
+        public ProfilesView()
+        {
+            InitializeComponent();
+        }
 
         public ProfilesView(Window window)
         {

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -4,12 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     d:DesignHeight="480"
     d:DesignWidth="400"
     mc:Ignorable="d">
     <Grid Margin="30" RowDefinitions="Auto,Auto">
-
         <Image
             Name="imgQrcode"
             Width="300"
@@ -24,6 +22,5 @@
             IsReadOnly="True"
             MaxLines="1" />
 
-
     </Grid>
 </UserControl>

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -5,6 +5,11 @@ namespace v2rayN.Desktop.Views
 {
     public partial class QrcodeView : UserControl
     {
+        public QrcodeView()
+        {
+            InitializeComponent();
+        }
+
         public QrcodeView(string? url)
         {
             InitializeComponent();

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -94,8 +94,8 @@
                 Grid.Column="1"
                 HorizontalAlignment="Left"
                 Classes="Margin8"
-                SelectionMode="Multiple"
+                SelectionMode="Multiple,Toggle"
-                Theme="{DynamicResource PureCardRadioGroupListBox}" />
+                Theme="{DynamicResource CardCheckGroupListBox}" />
 
             <TextBlock
                 Grid.Row="4"
@@ -108,8 +108,8 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Classes="Margin8"
-                SelectionMode="Multiple"
+                SelectionMode="Multiple,Toggle"
-                Theme="{DynamicResource PureCardRadioGroupListBox}" />
+                Theme="{DynamicResource CardCheckGroupListBox}" />
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="2"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -18,40 +18,29 @@
         <StackPanel
             Classes="Margin8"
             DockPanel.Dock="Top"
-            Orientation="Horizontal">
+            Orientation="Horizontal"
+            Spacing="4">
             <Menu>
                 <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                 <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
             </Menu>
 
-            <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">
+            <TextBlock VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
                 </HyperlinkButton>
             </TextBlock>
-            <ComboBox
+            <ComboBox x:Name="cmbdomainStrategy" Width="110" />
-                x:Name="cmbdomainStrategy"
-                Width="110"
-                Margin="8,0,0,0" />
             <Separator />
-            <TextBlock
+            <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-                Margin="8,0,0,0"
+            <ComboBox x:Name="cmbdomainMatcher" Width="60" />
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Width="60"
-                Margin="8,0,0,0" />
             <Separator />
-            <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">
+            <TextBlock VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 </HyperlinkButton>
             </TextBlock>
-            <ComboBox
+            <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
-                x:Name="cmbdomainStrategy4Singbox"
-                Width="100"
-                Margin="8,0,0,0" />
         </StackPanel>
 
         <StackPanel

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml

@@ -45,7 +45,7 @@
                         x:Name="togEnableTun"
                         HorizontalAlignment="Center"
                         Classes="Margin8"
-                        Theme="{StaticResource SimpleToggleSwitch}" />
+                        Theme="{DynamicResource SimpleToggleSwitch}" />
                 </StackPanel>
 
                 <StackPanel

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml

@@ -10,6 +10,15 @@
     d:DesignWidth="800"
     x:DataType="vms:ThemeSettingViewModel"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="Width" Value="100" />
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Width" Value="130" />
+        </Style>
+    </UserControl.Styles>
+
     <Button
         Width="30"
         Height="30"
@@ -24,43 +33,35 @@
         </Button.Content>
         <Button.Flyout>
             <Flyout>
-                <StackPanel>
+                <StackPanel Margin="0,12">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
+                            Text="{x:Static resx:ResUI.TbSettingsTheme}" />
-                        <ToggleSwitch x:Name="togDarkMode" Classes="Margin8" />
+                        <ComboBox
+                            x:Name="cmbCurrentTheme"
+                            HorizontalAlignment="Center"
+                            Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
-                            VerticalAlignment="Center"
-                            Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
-                        <ToggleSwitch x:Name="togFollowSystemTheme" Classes="Margin8" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                         <ComboBox
                             x:Name="cmbCurrentFontSize"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                         <ComboBox
                             x:Name="cmbCurrentLanguage"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                 </StackPanel>

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs

@@ -16,6 +16,11 @@ namespace v2rayN.Desktop.Views
             InitializeComponent();
             ViewModel = new ThemeSettingViewModel();
 
+            foreach (ETheme it in Enum.GetValues(typeof(ETheme)))
+            {
+                cmbCurrentTheme.Items.Add(it.ToString());
+            }
+
             for (int i = Global.MinFontSize; i <= Global.MinFontSize + 10; i++)
             {
                 cmbCurrentFontSize.Items.Add(i);
@@ -28,8 +33,7 @@ namespace v2rayN.Desktop.Views
 
             this.WhenActivated(disposables =>
             {
-                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentTheme, v => v.cmbCurrentTheme.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.togFollowSystemTheme.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.SelectedValue).DisposeWith(disposables);
             });

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-	    <Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
+	    <Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <AssemblyName>v2rayN</AssemblyName>
     </PropertyGroup>
@@ -48,7 +48,7 @@
       <None Update="v2rayN.png">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
-      <None Update="v2rayN2.png">
+      <None Update="v2rayN.icns">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
     </ItemGroup> 

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -64,14 +64,6 @@ namespace v2rayN
                 BitmapSizeOptions.FromEmptyOptions());
         }
 
-        public static bool IsDarkTheme()
-        {
-            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
-            var obj = key?.GetValue("AppsUseLightTheme");
-            int.TryParse(obj?.ToString(), out var value);
-            return value == 0;
-        }
-
         public static void RemoveTunDevice()
         {
             try
@@ -103,7 +95,19 @@ namespace v2rayN
             }
         }
 
-        public static void SetDarkBorder(Window window, bool dark)
+        public static void SetDarkBorder(Window window, string? theme)
+        {
+            var isDark = theme switch
+            {
+                nameof(ETheme.Dark) => true,
+                nameof(ETheme.Light) => false,
+                _ => IsDarkTheme(),
+            };
+
+            SetDarkBorder(window, isDark);
+        }
+
+        private static void SetDarkBorder(Window window, bool dark)
         {
             // Make sure the handle is created before the window is shown
             IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
@@ -113,6 +117,14 @@ namespace v2rayN
             DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref attribute, attributeSize);
         }
 
+        private static bool IsDarkTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            var obj = key?.GetValue("AppsUseLightTheme");
+            int.TryParse(obj?.ToString(), out var value);
+            return value == 0;
+        }
+
         #region Windows API
 
         [Flags]

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -16,23 +16,17 @@ namespace v2rayN.ViewModels
     {
         private readonly PaletteHelper _paletteHelper = new();
 
-        [Reactive]
-        public bool ColorModeDark { get; set; }
-
         private IObservableCollection<Swatch> _swatches = new ObservableCollectionExtended<Swatch>();
         public IObservableCollection<Swatch> Swatches => _swatches;
 
         [Reactive]
         public Swatch SelectedSwatch { get; set; }
 
-        [Reactive]
+        [Reactive] public string CurrentTheme { get; set; }
-        public int CurrentFontSize { get; set; }
 
-        [Reactive]
+        [Reactive] public int CurrentFontSize { get; set; }
-        public bool FollowSystemTheme { get; set; }
 
-        [Reactive]
+        [Reactive] public string CurrentLanguage { get; set; }
-        public string CurrentLanguage { get; set; }
 
         public ThemeSettingViewModel()
         {
@@ -62,36 +56,23 @@ namespace v2rayN.ViewModels
 
         private void BindingUI()
         {
-            ColorModeDark = _config.UiItem.ColorModeDark;
-            FollowSystemTheme = _config.UiItem.FollowSystemTheme;
             _swatches.AddRange(new SwatchesProvider().Swatches);
             if (!_config.UiItem.ColorPrimaryName.IsNullOrEmpty())
             {
                 SelectedSwatch = _swatches.FirstOrDefault(t => t.Name == _config.UiItem.ColorPrimaryName);
             }
+            CurrentTheme = _config.UiItem.CurrentTheme;
             CurrentFontSize = _config.UiItem.CurrentFontSize;
             CurrentLanguage = _config.UiItem.CurrentLanguage;
 
             this.WhenAnyValue(
-                  x => x.ColorModeDark,
+                    x => x.CurrentTheme,
-                  y => y == true)
+                    y => y != null && !y.IsNullOrEmpty())
                 .Subscribe(c =>
                  {
-                          if (_config.UiItem.ColorModeDark != ColorModeDark)
+                     if (_config.UiItem.CurrentTheme != CurrentTheme)
                      {
-                              _config.UiItem.ColorModeDark = ColorModeDark;
+                         _config.UiItem.CurrentTheme = CurrentTheme;
-                              ModifyTheme();
-                              ConfigHandler.SaveConfig(_config);
-                          }
-                      });
-
-            this.WhenAnyValue(x => x.FollowSystemTheme,
-                y => y == true)
-                    .Subscribe(c =>
-                    {
-                        if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
-                        {
-                            _config.UiItem.FollowSystemTheme = FollowSystemTheme;
                          ModifyTheme();
                          ConfigHandler.SaveConfig(_config);
                      }
@@ -147,12 +128,18 @@ namespace v2rayN.ViewModels
 
         public void ModifyTheme()
         {
-            var theme = _paletteHelper.GetTheme();
+            var baseTheme = CurrentTheme switch
+            {
+                nameof(ETheme.Dark) => BaseTheme.Dark,
+                nameof(ETheme.Light) => BaseTheme.Light,
+                _ => BaseTheme.Inherit,
+            };
 
-            var isDarkTheme = FollowSystemTheme ? WindowsUtils.IsDarkTheme() : ColorModeDark;
+            var theme = _paletteHelper.GetTheme();
-            theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
+            theme.SetBaseTheme(baseTheme);
             _paletteHelper.SetTheme(theme);
-            WindowsUtils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
+
+            WindowsUtils.SetDarkBorder(Application.Current.MainWindow, CurrentTheme);
         }
 
         private void ModifyFontSize()
@@ -182,7 +169,7 @@ namespace v2rayN.ViewModels
             var hwndSource = HwndSource.FromHwnd(helper.EnsureHandle());
             hwndSource.AddHook((IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
             {
-                if (config.UiItem.FollowSystemTheme)
+                if (config.UiItem.CurrentTheme == nameof(ETheme.FollowSystem))
                 {
                     const int WM_SETTINGCHANGE = 0x001A;
                     if (msg == WM_SETTINGCHANGE)

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -34,7 +34,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.btnEdit).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SaveServerCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -210,7 +210,7 @@ namespace v2rayN.Views
             });
 
             this.Title = $"{profileItem.ConfigType}";
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/CheckUpdateView.xaml

@@ -64,7 +64,6 @@
                     <DataTemplate>
                         <Border
                             Width="500"
-                            Height="50"
                             Margin="{StaticResource Margin8}"
                             Padding="0"
                             VerticalAlignment="Center">

v2rayN/v2rayN/Views/ClashProxiesView.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"
@@ -34,7 +34,7 @@
                 Text="{x:Static resx:ResUI.menuRulemode}" />
             <ComboBox
                 x:Name="cmbRulemode"
-                Width="80"
+                Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
@@ -49,7 +49,7 @@
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
-                Width="60"
+                Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -50,7 +50,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -30,7 +30,7 @@ namespace v2rayN.Views
 
             HotkeyHandler.Instance.IsPause = true;
             this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
-            WindowsUtils.SetDarkBorder(this, _config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : _config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, _config.UiItem.CurrentTheme);
             InitData();
         }
 

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -997,7 +997,6 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
-                <DockPanel Margin="{StaticResource Margin8}">
                 <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -1088,7 +1087,6 @@
                         Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
                 </Grid>
-                </DockPanel>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -177,7 +177,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -58,7 +58,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -60,7 +60,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -52,7 +52,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -38,7 +38,7 @@ namespace v2rayN.Views
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -31,7 +31,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SubEditCmd, v => v.menuSubEdit).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SubShareCmd, v => v.menuSubShare).DisposeWith(disposables);
             });
-            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? WindowsUtils.IsDarkTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
+            WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN/Views/ThemeSettingView.xaml

@@ -25,29 +25,20 @@
                 <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"
-                Grid.Row="0"
-                Grid.Column="1"
-                Margin="{StaticResource Margin8}" />
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
+                Text="{x:Static resx:ResUI.TbSettingsTheme}" />
-            <ToggleButton
+            <ComboBox
-                x:Name="togFollowSystemTheme"
+                x:Name="cmbCurrentTheme"
                 Grid.Row="1"
                 Grid.Column="1"
-                Margin="{StaticResource Margin8}" />
+                Width="120"
+                Margin="{StaticResource Margin8}"
+                Style="{StaticResource DefComboBox}" />
 
             <TextBlock
                 Grid.Row="2"
@@ -59,7 +50,7 @@
                 x:Name="cmbSwatches"
                 Grid.Row="2"
                 Grid.Column="1"
-                Width="100"
+                Width="120"
                 Margin="{StaticResource Margin8}"
                 DisplayMemberPath="Name"
                 Style="{StaticResource DefComboBox}" />
@@ -74,7 +65,7 @@
                 x:Name="cmbCurrentFontSize"
                 Grid.Row="3"
                 Grid.Column="1"
-                Width="100"
+                Width="120"
                 Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
 
@@ -88,7 +79,7 @@
                 x:Name="cmbCurrentLanguage"
                 Grid.Row="4"
                 Grid.Column="1"
-                Width="100"
+                Width="120"
                 Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
         </Grid>

v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs

@@ -13,6 +13,11 @@ namespace v2rayN.Views
         {
             InitializeComponent();
             ViewModel = new ThemeSettingViewModel();
+            foreach (ETheme it in Enum.GetValues(typeof(ETheme)))
+            {
+                if ((int)it > 2) continue;
+                cmbCurrentTheme.Items.Add(it.ToString());
+            }
 
             for (int i = Global.MinFontSize; i <= Global.MinFontSize + 10; i++)
             {
@@ -26,8 +31,7 @@ namespace v2rayN.Views
 
             this.WhenActivated(disposables =>
             {
-                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentTheme, v => v.cmbCurrentTheme.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.togFollowSystemTheme.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);

v2rayN/v2rayN/v2rayN.csproj

@@ -9,12 +9,12 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>
-		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
+		<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="MaterialDesignThemes" Version="5.2.0" />
+		<PackageReference Include="MaterialDesignThemes" Version="5.2.1" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> 
 		<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />