Update On Sun May 12 20:29:14 CEST 2024

2025-09-26 20:21:35 +08:00 · 2024-05-12 20:29:15 +02:00
parent d902f4e54b
commit bea46d294a
2547 changed files with 56527 additions and 91299 deletions
--- a/.github/update.log
+++ b/.github/update.log
@@ -644,3 +644,4 @@ Update On Thu May  9 16:22:44 CEST 2024
 Update On Thu May  9 20:28:46 CEST 2024
 Update On Fri May 10 20:29:17 CEST 2024
 Update On Sat May 11 20:27:59 CEST 2024
+Update On Sun May 12 20:29:03 CEST 2024
--- a/bbdown/BBDown.Core/APP/Response/dmviewreply.proto
+++ b/bbdown/BBDown.Core/APP/Response/dmviewreply.proto
@@ -26,7 +26,7 @@ message VideoMask {
 message VideoSubtitle {
    optional string lan = 1;
    optional string lanDoc = 2;
-    optional SubtitleItem subtitles = 3;
+    repeated SubtitleItem subtitles = 3;

 }

--- a/bbdown/BBDown.Core/AppHelper.cs
+++ b/bbdown/BBDown.Core/AppHelper.cs
@@ -3,9 +3,9 @@ using Google.Protobuf;
 using System.Buffers.Binary;
 using System.IO.Compression;
 using System.Linq;
-using System.Net.Http.Headers;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using static BBDown.Core.Util.HTTPUtil;
 using static BBDown.Core.Logger;

 namespace BBDown.Core
@@ -322,7 +322,7 @@ namespace BBDown.Core
        /// </summary>
        /// <param name="data"></param>
        /// <returns>字节流</returns>
-        private static byte[] ReadMessage(byte[] data)
+        public static byte[] ReadMessage(byte[] data)
        {
            byte first;
            int size;
@@ -348,7 +348,7 @@ namespace BBDown.Core
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
-        private static byte[] PackMessage(byte[] input)
+        public static byte[] PackMessage(byte[] input)
        {
            using var stream = new MemoryStream();
            using (var writer = new BinaryWriter(stream))
@@ -393,31 +393,6 @@ namespace BBDown.Core
            }
            return output.ToArray();
        }
-
-        public static async Task<byte[]> GetPostResponseAsync(string Url, byte[] postData, Dictionary<string, string> headers)
-        {
-            LogDebug("Post to: {0}, data: {1}", Url, Convert.ToBase64String(postData));
-
-            ByteArrayContent content = new(postData);
-            content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/grpc");
-
-            HttpRequestMessage request = new()
-            {
-                RequestUri = new Uri(Url),
-                Method = HttpMethod.Post,
-                Content = content,
-                //Version = HttpVersion.Version20
-            };
-
-            if (headers != null)
-                foreach (KeyValuePair<string, string> header in headers)
-                    request.Headers.TryAddWithoutValidation(header.Key, header.Value);
-
-            HttpResponseMessage response = await Util.HTTPUtil.AppHttpClient.SendAsync(request);
-            byte[] bytes = await response.Content.ReadAsByteArrayAsync();
-
-            return bytes;
-        }
    }


--- a/bbdown/BBDown.Core/Util/HTTPUtil.cs
+++ b/bbdown/BBDown.Core/Util/HTTPUtil.cs
@@ -70,18 +70,36 @@ namespace BBDown.Core.Util
            return location;
        }

-        public static async Task<string> GetPostResponseAsync(string Url, byte[] postData)
+        public static async Task<byte[]> GetPostResponseAsync(string Url, byte[] postData, Dictionary<string, string> headers = null)
        {
            LogDebug("Post to: {0}, data: {1}", Url, Convert.ToBase64String(postData));
-            using HttpRequestMessage request = new(HttpMethod.Post, Url);
-            request.Headers.TryAddWithoutValidation("Content-Type", "application/grpc");
-            request.Headers.TryAddWithoutValidation("Content-Length", postData.Length.ToString());
-            request.Headers.TryAddWithoutValidation("User-Agent", "Dalvik/2.1.0 (Linux; U; Android 6.0.1; oneplus a5010 Build/V417IR) 6.10.0 os/android model/oneplus a5010 mobi_app/android build/6100500 channel/bili innerVer/6100500 osVer/6.0.1 network/2");
-            request.Headers.TryAddWithoutValidation("Cookie", Config.COOKIE);
-            request.Content = new ByteArrayContent(postData);
-            var webResponse = await AppHttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-            string htmlCode = await webResponse.Content.ReadAsStringAsync();
-            return htmlCode;
+
+            ByteArrayContent content = new(postData);
+            content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/grpc");
+
+            HttpRequestMessage request = new()
+            {
+                RequestUri = new Uri(Url),
+                Method = HttpMethod.Post,
+                Content = content,
+                //Version = HttpVersion.Version20
+            };
+
+            if (headers != null)
+            {
+                foreach (KeyValuePair<string, string> header in headers)
+                    request.Headers.TryAddWithoutValidation(header.Key, header.Value);
+            }
+            else
+            {
+                request.Headers.TryAddWithoutValidation("User-Agent", "Dalvik/2.1.0 (Linux; U; Android 6.0.1; oneplus a5010 Build/V417IR) 6.10.0 os/android model/oneplus a5010 mobi_app/android build/6100500 channel/bili innerVer/6100500 osVer/6.0.1 network/2");
+                request.Headers.TryAddWithoutValidation("grpc-encoding", "gzip");
+            }
+
+            HttpResponseMessage response = await AppHttpClient.SendAsync(request);
+            byte[] bytes = await response.Content.ReadAsByteArrayAsync();
+
+            return bytes;
        }
    }
 }
--- a/bbdown/BBDown.Core/Util/SubUtil.cs
+++ b/bbdown/BBDown.Core/Util/SubUtil.cs
@@ -1,4 +1,6 @@
-using System.Text;
+using BBDown.Core.Protobuf;
+using Google.Protobuf;
+using System.Text;
 using static BBDown.Core.Entity.Entity;
 using static BBDown.Core.Util.HTTPUtil;
 using System.Text.RegularExpressions;
@@ -356,6 +358,18 @@ namespace BBDown.Core.Util
            }
        }

+        private static byte[] GetPayload(long aid, long cid)
+        {
+            var obj = new DmViewReq
+            {
+                Pid = aid,
+                Oid = cid,
+                Type = 1,
+                Spmid = "main.ugc-video-detail.0.0",
+            };
+            return AppHelper.PackMessage(obj.ToByteArray());
+        }
+
        private static async Task<List<Subtitle>?> GetSubtitlesFromApi3Async(string aid, string cid, string epId, int index)
        {
            try
@@ -363,41 +377,20 @@ namespace BBDown.Core.Util
                List<Subtitle> subtitles = new();
                //grpc调用接口 protobuf
                string api = "https://app.biliapi.net/bilibili.community.service.dm.v1.DM/DmView";
-                int _aid = Convert.ToInt32(aid);
-                int _cid = Convert.ToInt32(cid);
-                int _type = 1;
-                byte[] data = new byte[18];
-                data[0] = 0x0; data[1] = 0x0; data[2] = 0x0; data[3] = 0x0; data[4] = 0xD; //先固定死了
-                int i = 5;
-                data[i++] = Convert.ToByte((1 << 3) | 0); // index=1
-                while ((_aid & -128) != 0)
-                {
-                    data[i++] = Convert.ToByte((_aid & 127) | 128);
-                    _aid >>= 7;
-                }
-                data[i++] = Convert.ToByte(_aid);
-                data[i++] = Convert.ToByte((2 << 3) | 0); // index=2
-                while ((_cid & -128) != 0)
-                {
-                    data[i++] = Convert.ToByte((_cid & 127) | 128);
-                    _cid >>= 7;
-                }
-                data[i++] = Convert.ToByte(_cid);
-                data[i++] = Convert.ToByte((3 << 3) | 0); // index=3
-                data[i++] = Convert.ToByte(_type);
-                string t = await GetPostResponseAsync(api, data);
-                Regex reg = CnJsonRegex();
-                foreach (Match m in reg.Matches(t).Cast<Match>())
-                {
-                    Subtitle subtitle = new()
-                    {
-                        url = m.Groups[2].Value,
-                        lan = m.Groups[1].Value,
-                        path = $"{aid}/{aid}.{cid}.{m.Groups[1].Value}.srt"
-                    };
-                    subtitles.Add(subtitle);
-                }

+                var data = GetPayload(Convert.ToInt64(aid), Convert.ToInt64(cid));
+
+                var t = AppHelper.ReadMessage(await GetPostResponseAsync(api, data));
+                var resp = new MessageParser<DmViewReply>(() => new DmViewReply()).ParseFrom(t);
+
+                if (resp.Subtitle != null && resp.Subtitle.Subtitles != null)
+                {
+                    subtitles.AddRange(resp.Subtitle.Subtitles.Select(item => new Subtitle() {
+                        url = item.SubtitleUrl,
+                        lan = item.Lan,
+                        path = $"{aid}/{aid}.{cid}.{item.Lan}.srt"
+                    }));
+                }
                //有空的URL 不合法
                if (subtitles.Any(s => string.IsNullOrEmpty(s.url)))
                    throw new Exception("Bad url");
@@ -421,9 +414,17 @@ namespace BBDown.Core.Util
            }
            else
            {
-                subtitles = await GetSubtitlesFromApi2Async(aid, cid, epId, index)
-                    ?? await GetSubtitlesFromApi1Async(aid, cid, epId, index)
-                    ?? await GetSubtitlesFromApi3Async(aid, cid, epId, index);
+                if (Config.COOKIE == "")
+                {
+                    subtitles = await GetSubtitlesFromApi3Async(aid, cid, epId, index); // 未登录只有APP可以拿到字幕了
+                }
+                else
+                {
+                    subtitles = await GetSubtitlesFromApi2Async(aid, cid, epId, index)
+                        ?? await GetSubtitlesFromApi1Async(aid, cid, epId, index)
+                        ?? await GetSubtitlesFromApi3Async(aid, cid, epId, index);
+                }
+
            }

            if (subtitles == null)
@@ -480,7 +481,5 @@ namespace BBDown.Core.Util

        [GeneratedRegex("-[a-z]")]
        private static partial Regex NonCapsRegex();
-        [GeneratedRegex("(zh-Han[st]).*?(http.*?\\.json)")]
-        private static partial Regex CnJsonRegex();
    }
 }
--- a/bbdown/BBDown/BBDown.csproj
+++ b/bbdown/BBDown/BBDown.csproj
@@ -4,7 +4,7 @@
    <OutputType>Exe</OutputType>
    <TargetFramework>net8.0</TargetFramework>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
    <Description>BBDown是一个免费且便捷高效的哔哩哔哩下载/解析软件.</Description>
    <PackageProjectUrl>https://github.com/nilaoda/BBDown</PackageProjectUrl>
    <StartupObject></StartupObject>
--- a/bbdown/BBDown/Program.cs
+++ b/bbdown/BBDown/Program.cs
@@ -123,7 +123,7 @@ namespace BBDown
                return 1;
            }

-            if (commandLineResult.CommandResult.Command.Name.ToLower() != Path.GetFileNameWithoutExtension(Environment.ProcessPath)!.ToLower())
+            if (commandLineResult.CommandResult.Command.Name.ToLower() != Path.GetFileNameWithoutExtension(Environment.ProcessPath)!.ToLower() && Path.GetFileNameWithoutExtension(Environment.ProcessPath)!.ToLower() != "dotnet")
            {
                // 服务器模式需要完整的arg列表
                if (commandLineResult.CommandResult.Command.Name.ToLower() == "serve")
@@ -332,7 +332,7 @@ namespace BBDown
                    }
                }

-                await DownloadPageAsync(p, myOption, vInfo, encodingPriority, dfnPriority, firstEncoding,
+                await DownloadPageAsync(p, myOption, vInfo, pagesInfo, encodingPriority, dfnPriority, firstEncoding,
                    downloadDanmaku, input, savePathFormat, lang, aidOri, apiType, relatedTask);

                if (myOption.SaveArchivesToFile)
@@ -344,13 +344,12 @@ namespace BBDown
            Log("任务完成");
        }

-        private static async Task DownloadPageAsync(Page p, MyOption myOption, VInfo vInfo, Dictionary<string, byte> encodingPriority, Dictionary<string, int> dfnPriority,
+        private static async Task DownloadPageAsync(Page p, MyOption myOption, VInfo vInfo, List<Page> selectedPagesInfo, Dictionary<string, byte> encodingPriority, Dictionary<string, int> dfnPriority,
            string? firstEncoding, bool downloadDanmaku, string input, string savePathFormat, string lang, string aidOri, string apiType, DownloadTask? relatedTask = null)
        {
-            List<Page> pagesInfo = vInfo.PagesInfo;
            string desc = string.IsNullOrEmpty(p.desc) ? vInfo.Desc : p.desc;
            bool bangumi = vInfo.IsBangumi;
-            var pagesCount = pagesInfo.Count;
+            var pagesCount = selectedPagesInfo.Count;
            List<Subtitle> subtitleInfo = new();
            string title = vInfo.Title;
            string pic = vInfo.Pic;
@@ -448,13 +447,13 @@ namespace BBDown
                {
                    if (parsedResult.VideoTracks.Count == 0)
                    {
-                        LogError("没有找到符合要求的视频流");
-                        if (!myOption.AudioOnly) return;
+                        LogWarn("没有找到符合要求的视频流");
+                        if (myOption.VideoOnly) return;
                    }
                    if (parsedResult.AudioTracks.Count == 0)
                    {
-                        LogError("没有找到符合要求的音频流");
-                        if (!myOption.VideoOnly) return;
+                        LogWarn("没有找到符合要求的音频流");
+                        if (myOption.AudioOnly) return;
                    }

                    if (myOption.AudioOnly)
@@ -638,7 +637,7 @@ namespace BBDown
                    if (p.points.Any()) File.Delete(Path.Combine(Path.GetDirectoryName(string.IsNullOrEmpty(videoPath) ? audioPath : videoPath)!, "chapters"));
                    foreach (var s in subtitleInfo) File.Delete(s.path);
                    foreach (var a in audioMaterial) File.Delete(a.path);
-                    if (pagesInfo.Count == 1 || p.index == pagesInfo.Last().index || p.aid != pagesInfo.Last().aid)
+                    if (selectedPagesInfo.Count == 1 || p.index == selectedPagesInfo.Last().index || p.aid != selectedPagesInfo.Last().aid)
                        File.Delete(coverPath);
                    if (Directory.Exists(p.aid) && Directory.GetFiles(p.aid).Length == 0) Directory.Delete(p.aid, true);
                }
@@ -685,7 +684,7 @@ namespace BBDown
                    if (File.Exists(savePath) && new FileInfo(savePath).Length != 0)
                    {
                        Log($"{savePath}已存在, 跳过下载...");
-                        if (pagesInfo.Count == 1 && Directory.Exists(p.aid))
+                        if (selectedPagesInfo.Count == 1 && Directory.Exists(p.aid))
                        {
                            Directory.Delete(p.aid, true);
                        }
@@ -726,7 +725,7 @@ namespace BBDown
                    foreach (var s in subtitleInfo) File.Delete(s.path);
                    foreach (var a in audioMaterial) File.Delete(a.path);
                    if (p.points.Any()) File.Delete(Path.Combine(Path.GetDirectoryName(string.IsNullOrEmpty(videoPath) ? audioPath : videoPath)!, "chapters"));
-                    if (pagesInfo.Count == 1 || p.index == pagesInfo.Last().index || p.aid != pagesInfo.Last().aid)
+                    if (selectedPagesInfo.Count == 1 || p.index == selectedPagesInfo.Last().index || p.aid != selectedPagesInfo.Last().aid)
                        File.Delete(coverPath);
                    if (Directory.Exists(p.aid) && Directory.GetFiles(p.aid).Length == 0) Directory.Delete(p.aid, true);
                }
@@ -842,7 +841,7 @@ namespace BBDown
            return result;
        }

-        [GeneratedRegex("<([\\w:]+?)>")]
+        [GeneratedRegex("<([\\w:\\-.]+?)>")]
        private static partial Regex InfoRegex();
    }
 }
--- a/bbdown/README.md
+++ b/bbdown/README.md
@@ -48,7 +48,7 @@ Options:
  -q, --dfn-priority <dfn-priority>              画质优先级,用逗号分隔 例: "8K 超高清, 1080P 高码率, HDR 真彩, 杜比视界"
  -info, --only-show-info                        仅解析而不进行下载
  --show-all                                     展示所有分P标题
-  --use-aria2c                                   调用aria2c进行下载(你需要自行准备好二进制可执行文件)
+  -aria2, --use-aria2c                           调用aria2c进行下载(你需要自行准备好二进制可执行文件)
  -ia, --interactive                             交互式选择清晰度
  -hs, --hide-streams                            不要显示所有可用音视频流
  -mt, --multi-thread                            使用多线程下载(默认开启)
@@ -68,7 +68,7 @@ Options:
  --audio-ascending                              音频升序(最小体积优先)
  --allow-pcdn                                   不替换PCDN域名, 仅在正常情况与--upos-host均无法下载时使用
  -F, --file-pattern <file-pattern>              使用内置变量自定义单P存储文件名:
-
+  
                                                 <videoTitle>: 视频主标题
                                                 <pageNumber>: 视频分P序号
                                                 <pageNumberWithZero>: 视频分P序号(前缀补零)
@@ -85,14 +85,15 @@ Options:
                                                 <audioBandwidth>: 音频码率
                                                 <ownerName>: 上传者名称
                                                 <ownerMid>: 上传者mid
-                                                 <publishDate>: 发布时间
+                                                 <publishDate>: 收藏夹/番剧/合集发布时间
+                                                 <videoDate>: 视频发布时间(分p视频发布时间与<publishDate>相同)
                                                 <apiType>: API类型(TV/APP/INTL/WEB)
-
+  
                                                 默认为: <videoTitle>
  -M, --multi-file-pattern <multi-file-pattern>  使用内置变量自定义多P存储文件名:
-
+  
                                                 默认为: <videoTitle>/[P<pageNumberWithZero>]<pageTitle>
-  -p, --select-page <select-page>                选择指定分p或分p范围: (-p 8 或 -p 1,2 或 -p 3-5 或 -p ALL 或 -p LAST)
+  -p, --select-page <select-page>                选择指定分p或分p范围: (-p 8 或 -p 1,2 或 -p 3-5 或 -p ALL 或 -p LAST 或 -p 3,5,LATEST)
  --language <language>                          设置混流的音频语言(代码), 如chi, jpn等
  -ua, --user-agent <user-agent>                 指定user-agent, 否则使用随机user-agent
  -c, --cookie <cookie>                          设置字符串cookie用以下载网页接口的会员内容
@@ -104,6 +105,7 @@ Options:
  --aria2c-path <aria2c-path>                    设置aria2c的路径
  --upos-host <upos-host>                        自定义upos服务器
  --force-replace-host                           强制替换下载服务器host(默认开启)
+  --save-archives-to-file                        将下载过的视频记录到本地文件中, 用于后续跳过下载同个视频
  --delay-per-page <delay-per-page>              设置下载合集分P之间的下载间隔时间(单位: 秒, 默认无间隔)
  --host <host>                                  指定BiliPlus host(使用BiliPlus需要access_token, 不需要cookie, 解析服务器能够获取你账号的大部分权限!)
  --ep-host <ep-host>                            指定BiliPlus EP host(用于代理api.bilibili.com/pgc/view/web/season, 大部分解析服务器不支持代理该接口)
@@ -116,6 +118,7 @@ Options:
 Commands:
  login    通过APP扫描二维码以登录您的WEB账号
  logintv  通过APP扫描二维码以登录您的TV账号
+  serve    以服务器模式运行
 ```

 # 功能
--- a/clash-meta/.github/693def151adff1af707d82d28f55dba81ceb08e1.diff
+++ b/clash-meta/.github/693def151adff1af707d82d28f55dba81ceb08e1.diff
@@ -0,0 +1,158 @@
+diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
+index 62738e2cb1a7d..d0dcc7cc71fc0 100644
+--- a/src/crypto/rand/rand.go
+++ b/src/crypto/rand/rand.go
+@@ -15,7 +15,7 @@ import "io"
+ // available, /dev/urandom otherwise.
+ // On OpenBSD and macOS, Reader uses getentropy(2).
+ // On other Unix-like systems, Reader reads from /dev/urandom.
+-// On Windows systems, Reader uses the RtlGenRandom API.
+// On Windows systems, Reader uses the ProcessPrng API.
+ // On JS/Wasm, Reader uses the Web Crypto API.
+ // On WASIP1/Wasm, Reader uses random_get from wasi_snapshot_preview1.
+ var Reader io.Reader
+diff --git a/src/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
+index 6c0655c72b692..7380f1f0f1e6e 100644
+--- a/src/crypto/rand/rand_windows.go
+++ b/src/crypto/rand/rand_windows.go
+@@ -15,11 +15,8 @@ func init() { Reader = &rngReader{} }
+ 
+ type rngReader struct{}
+ 
+-func (r *rngReader) Read(b []byte) (n int, err error) {
+-	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
+-	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
+-	// and 64-bit systems.
+-	if err := batched(windows.RtlGenRandom, 1<<31-1)(b); err != nil {
+func (r *rngReader) Read(b []byte) (int, error) {
+	if err := windows.ProcessPrng(b); err != nil {
+ 		return 0, err
+ 	}
+ 	return len(b), nil
+diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
+index ab4ad2ec64108..5854ca60b5cef 100644
+--- a/src/internal/syscall/windows/syscall_windows.go
+++ b/src/internal/syscall/windows/syscall_windows.go
+@@ -373,7 +373,7 @@ func ErrorLoadingGetTempPath2() error {
+ //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
+ //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
+ 
+-//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
+//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
+ 
+ type FILE_ID_BOTH_DIR_INFO struct {
+ 	NextEntryOffset uint32
+diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
+index e3f6d8d2a2208..5a587ad4f146c 100644
+--- a/src/internal/syscall/windows/zsyscall_windows.go
+++ b/src/internal/syscall/windows/zsyscall_windows.go
+@@ -37,13 +37,14 @@ func errnoErr(e syscall.Errno) error {
+ }
+ 
+ var (
+-	modadvapi32 = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
+-	modiphlpapi = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
+-	modkernel32 = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
+-	modnetapi32 = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
+-	modpsapi    = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
+-	moduserenv  = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
+-	modws2_32   = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
+	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
+	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
+	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
+	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
+	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
+	modpsapi            = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
+	moduserenv          = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
+	modws2_32           = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
+ 
+ 	procAdjustTokenPrivileges             = modadvapi32.NewProc("AdjustTokenPrivileges")
+ 	procDuplicateTokenEx                  = modadvapi32.NewProc("DuplicateTokenEx")
+@@ -55,7 +56,7 @@ var (
+ 	procQueryServiceStatus                = modadvapi32.NewProc("QueryServiceStatus")
+ 	procRevertToSelf                      = modadvapi32.NewProc("RevertToSelf")
+ 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
+-	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
+	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
+ 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
+ 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
+ 	procGetACP                            = modkernel32.NewProc("GetACP")
+@@ -179,12 +180,12 @@ func SetTokenInformation(tokenHandle syscall.Token, tokenInformationClass uint32
+ 	return
+ }
+ 
+-func RtlGenRandom(buf []byte) (err error) {
+func ProcessPrng(buf []byte) (err error) {
+ 	var _p0 *byte
+ 	if len(buf) > 0 {
+ 		_p0 = &buf[0]
+ 	}
+-	r1, _, e1 := syscall.Syscall(procSystemFunction036.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
+	r1, _, e1 := syscall.Syscall(procProcessPrng.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
+ 	if r1 == 0 {
+ 		err = errnoErr(e1)
+ 	}
+diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
+index 8ca8d7790909e..3772a864b2ff4 100644
+--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
+@@ -127,15 +127,8 @@ var (
+ 	_WriteFile,
+ 	_ stdFunction
+ 
+-	// Use RtlGenRandom to generate cryptographically random data.
+-	// This approach has been recommended by Microsoft (see issue
+-	// 15589 for details).
+-	// The RtlGenRandom is not listed in advapi32.dll, instead
+-	// RtlGenRandom function can be found by searching for SystemFunction036.
+-	// Also some versions of Mingw cannot link to SystemFunction036
+-	// when building executable as Cgo. So load SystemFunction036
+-	// manually during runtime startup.
+-	_RtlGenRandom stdFunction
+	// Use ProcessPrng to generate cryptographically random data.
+	_ProcessPrng stdFunction
+ 
+ 	// Load ntdll.dll manually during startup, otherwise Mingw
+ 	// links wrong printf function to cgo executable (see issue
+@@ -151,11 +144,11 @@ var (
+ )
+ 
+ var (
+-	advapi32dll = [...]uint16{'a', 'd', 'v', 'a', 'p', 'i', '3', '2', '.', 'd', 'l', 'l', 0}
+-	ntdlldll    = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
+-	powrprofdll = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
+-	winmmdll    = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
+-	ws2_32dll   = [...]uint16{'w', 's', '2', '_', '3', '2', '.', 'd', 'l', 'l', 0}
+	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
+	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
+	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
+	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
+	ws2_32dll           = [...]uint16{'w', 's', '2', '_', '3', '2', '.', 'd', 'l', 'l', 0}
+ )
+ 
+ // Function to be called by windows CreateThread
+@@ -251,11 +244,11 @@ func windowsLoadSystemLib(name []uint16) uintptr {
+ }
+ 
+ func loadOptionalSyscalls() {
+-	a32 := windowsLoadSystemLib(advapi32dll[:])
+-	if a32 == 0 {
+-		throw("advapi32.dll not found")
+	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
+	if bcryptPrimitives == 0 {
+		throw("bcryptprimitives.dll not found")
+ 	}
+-	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
+	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
+ 
+ 	n32 := windowsLoadSystemLib(ntdlldll[:])
+ 	if n32 == 0 {
+@@ -531,7 +524,7 @@ func osinit() {
+ //go:nosplit
+ func readRandom(r []byte) int {
+ 	n := 0
+-	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
+	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
+ 		n = len(r)
+ 	}
+ 	return n
--- a/clash-meta/.github/workflows/build.yml
+++ b/clash-meta/.github/workflows/build.yml
@@ -64,12 +64,6 @@ jobs:
          - { goos: android, goarch: arm, ndk: armv7a-linux-androideabi34, output: armv7 }
          - { goos: android, goarch: arm64, ndk: aarch64-linux-android34, output: arm64-v8 }

-          # Go 1.21 can revert commit `9e4385` to work on Windows 7
-          # https://github.com/golang/go/issues/64622#issuecomment-1847475161
-          - { goos: windows, goarch: '386', output: '386-go121', goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go121, goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-go121, goversion: '1.21' }
-
          # Go 1.20 is the last release that will run on any release of Windows 7, 8, Server 2008 and Server 2012. Go 1.21 will require at least Windows 10 or Server 2016.
          - { goos: windows, goarch: '386', output: '386-go120', goversion: '1.20' }
          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go120, goversion: '1.20' }
@@ -115,11 +109,13 @@ jobs:
        echo "/usr/local/go/bin" >> $GITHUB_PATH

      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-    - name: Set up Go1.21 for Windows
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.21' }}
+      # this patch file only works on golang1.22.x
+      # that means after golang1.23 release it must be changed
+    - name: Revert Golang1.22 commit for Windows7/8
+      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '' }}
      run: |
        cd $(go env GOROOT)
-        curl https://github.com/golang/go/commit/9e43850a3298a9b8b1162ba0033d4c53f8637571.diff | patch --verbose -R -p 1
+        patch --verbose -R -p 1 < $GITHUB_WORKSPACE/.github/693def151adff1af707d82d28f55dba81ceb08e1.diff

    - name: Set variables
      if: ${{github.ref_name=='Alpha'}}
--- a/clash-meta/adapter/adapter.go
+++ b/clash-meta/adapter/adapter.go
@@ -2,6 +2,7 @@ package adapter

 import (
 	"context"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -14,6 +15,7 @@ import (
 	"github.com/metacubex/mihomo/common/atomic"
 	"github.com/metacubex/mihomo/common/queue"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/ca"
 	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/puzpuzpuz/xsync/v3"
@@ -230,6 +232,7 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 		IdleConnTimeout:       90 * time.Second,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
+		TLSClientConfig:       ca.GetGlobalTLSConfig(&tls.Config{}),
 	}

 	client := http.Client{
--- a/clash-meta/adapter/outbound/shadowsocks.go
+++ b/clash-meta/adapter/outbound/shadowsocks.go
@@ -273,6 +273,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		if opts.TLS {
 			v2rayOption.TLS = true
 			v2rayOption.SkipCertVerify = opts.SkipCertVerify
+			v2rayOption.Fingerprint = opts.Fingerprint
 		}
 	} else if option.Plugin == shadowtls.Mode {
 		obfsMode = shadowtls.Mode
--- a/clash-meta/adapter/outbound/vmess.go
+++ b/clash-meta/adapter/outbound/vmess.go
@@ -179,6 +179,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		tlsOpts := mihomoVMess.TLSConfig{
 			Host:              host,
 			SkipCertVerify:    v.option.SkipCertVerify,
+			FingerPrint:       v.option.Fingerprint,
 			NextProtos:        []string{"h2"},
 			ClientFingerprint: v.option.ClientFingerprint,
 			Reality:           v.realityConfig,
@@ -208,6 +209,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			tlsOpts := &mihomoVMess.TLSConfig{
 				Host:              host,
 				SkipCertVerify:    v.option.SkipCertVerify,
+				FingerPrint:       v.option.Fingerprint,
 				ClientFingerprint: v.option.ClientFingerprint,
 				Reality:           v.realityConfig,
 				NextProtos:        v.option.ALPN,
--- a/clash-meta/component/ca/config.go
+++ b/clash-meta/component/ca/config.go
@@ -67,9 +67,6 @@ func ResetCertificate() {
 }

 func getCertPool() *x509.CertPool {
-	if len(trustCerts) == 0 {
-		return nil
-	}
 	if globalCertPool == nil {
 		mutex.Lock()
 		defer mutex.Unlock()
--- a/clash-meta/component/ca/fix_windows.go
+++ b/clash-meta/component/ca/fix_windows.go
@@ -0,0 +1,14 @@
+package ca
+
+import (
+	"github.com/metacubex/mihomo/constant/features"
+)
+
+func init() {
+	// crypto/x509: certificate validation in Windows fails to validate IP in SAN
+	// https://github.com/golang/go/issues/37176
+	// As far as I can tell this is still the case on most older versions of Windows (but seems to be fixed in 10)
+	if features.WindowsMajorVersion < 10 && len(_CaCertificates) > 0 {
+		DisableSystemCa = true
+	}
+}
--- a/clash-meta/component/dialer/dialer.go
+++ b/clash-meta/component/dialer/dialer.go
@@ -164,7 +164,7 @@ func dialContext(ctx context.Context, network string, destination netip.Addr, po
 	if opt.mpTcp {
 		setMultiPathTCP(dialer)
 	}
-	if opt.tfo {
+	if opt.tfo && !DisableTFO {
 		return dialTFO(ctx, *dialer, network, address)
 	}
 	return dialer.DialContext(ctx, network, address)
--- a/clash-meta/component/dialer/tfo.go
+++ b/clash-meta/component/dialer/tfo.go
@@ -9,6 +9,8 @@ import (
 	"github.com/metacubex/tfo-go"
 )

+var DisableTFO = false
+
 type tfoConn struct {
 	net.Conn
 	closed bool
--- a/clash-meta/component/dialer/tfo_windows.go
+++ b/clash-meta/component/dialer/tfo_windows.go
@@ -0,0 +1,11 @@
+package dialer
+
+import "github.com/metacubex/mihomo/constant/features"
+
+func init() {
+	// According to MSDN, this option is available since Windows 10, 1607
+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms738596(v=vs.85).aspx
+	if features.WindowsMajorVersion < 10 || (features.WindowsMajorVersion == 10 && features.WindowsBuildNumber < 14393) {
+		DisableTFO = true
+	}
+}
--- a/clash-meta/constant/features/version.go
+++ b/clash-meta/constant/features/version.go
@@ -0,0 +1,5 @@
+package features
+
+var WindowsMajorVersion uint32
+var WindowsMinorVersion uint32
+var WindowsBuildNumber uint32
--- a/clash-meta/constant/features/version_windows.go
+++ b/clash-meta/constant/features/version_windows.go
@@ -0,0 +1,10 @@
+package features
+
+import "golang.org/x/sys/windows"
+
+func init() {
+	version := windows.RtlGetVersion()
+	WindowsMajorVersion = version.MajorVersion
+	WindowsMinorVersion = version.MinorVersion
+	WindowsBuildNumber = version.MinorVersion
+}
--- a/clash-meta/go.mod
+++ b/clash-meta/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/metacubex/sing-quic v0.0.0-20240501013754-2a2b0f262f9f
 	github.com/metacubex/sing-shadowsocks v0.2.6
 	github.com/metacubex/sing-shadowsocks2 v0.2.0
-	github.com/metacubex/sing-tun v0.2.6
+	github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f
 	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66
--- a/clash-meta/go.sum
+++ b/clash-meta/go.sum
@@ -114,8 +114,8 @@ github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwV
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.6 h1:frc58BqnIClqcC9KcYBfVAn5bgO6WW1ANKvZW3/HYAQ=
-github.com/metacubex/sing-tun v0.2.6/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
+github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
 github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
--- a/clash-meta/listener/sing_tun/server.go
+++ b/clash-meta/listener/sing_tun/server.go
@@ -20,12 +20,14 @@ import (

 	tun "github.com/metacubex/sing-tun"
 	"github.com/sagernet/sing/common"
+	"github.com/sagernet/sing/common/control"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
 	"github.com/sagernet/sing/common/ranges"
 )

 var InterfaceName = "Meta"
+var EnforceBindInterface = false

 type Listener struct {
 	closed  bool
@@ -263,6 +265,8 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 		UDPTimeout:             udpTimeout,
 		Handler:                handler,
 		Logger:                 log.SingLogger,
+		InterfaceFinder:        control.DefaultInterfaceFinder(),
+		EnforceBindInterface:   EnforceBindInterface,
 	}

 	if options.FileDescriptor > 0 {
--- a/clash-meta/listener/sing_tun/server_windows.go
+++ b/clash-meta/listener/sing_tun/server_windows.go
@@ -3,6 +3,7 @@ package sing_tun
 import (
 	"time"

+	"github.com/metacubex/mihomo/constant/features"
 	"github.com/metacubex/mihomo/log"

 	tun "github.com/metacubex/sing-tun"
@@ -27,4 +28,9 @@ func tunNew(options tun.Options) (tunIf tun.Tun, err error) {

 func init() {
 	tun.TunnelType = InterfaceName
+
+	if features.WindowsMajorVersion < 10 {
+		// to resolve "bind: The requested address is not valid in its context"
+		EnforceBindInterface = true
+	}
 }
--- a/clash-meta/transport/trojan/trojan.go
+++ b/clash-meta/transport/trojan/trojan.go
@@ -129,6 +129,12 @@ func (t *Trojan) StreamWebsocketConn(ctx context.Context, conn net.Conn, wsOptio
 		ServerName:         t.option.ServerName,
 	}

+	var err error
+	tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, t.option.Fingerprint)
+	if err != nil {
+		return nil, err
+	}
+
 	return vmess.StreamWebsocketConn(ctx, conn, &vmess.WebsocketConfig{
 		Host:                     wsOptions.Host,
 		Port:                     wsOptions.Port,
--- a/clash-nyanpasu/frontend/nyanpasu/package.json
+++ b/clash-nyanpasu/frontend/nyanpasu/package.json
@@ -13,7 +13,7 @@
    "@dnd-kit/sortable": "8.0.0",
    "@dnd-kit/utilities": "3.2.2",
    "@emotion/styled": "11.11.5",
-    "@generouted/react-router": "1.19.3",
+    "@generouted/react-router": "1.19.4",
    "@juggle/resize-observer": "3.4.0",
    "@material/material-color-utilities": "0.2.7",
    "@mui/icons-material": "5.15.17",
--- a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/delay-button.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/delay-button.tsx
@@ -1,5 +1,5 @@
 import { classNames } from "@/utils";
-import { Bolt } from "@mui/icons-material";
+import { Bolt, Done } from "@mui/icons-material";
 import {
  alpha,
  Button,
@@ -7,6 +7,7 @@ import {
  Tooltip,
  useTheme,
 } from "@mui/material";
+import { useDebounceFn, useLockFn } from "ahooks";
 import { memo, useState } from "react";
 import { useTranslation } from "react-i18next";

@@ -21,23 +22,38 @@ export const DelayButton = memo(function DelayButton({

  const [loading, setLoading] = useState(false);

-  const handleClick = async () => {
+  const [mounted, setMounted] = useState(false);
+
+  const { run: runMounted, cancel: cancelMounted } = useDebounceFn(
+    () => setMounted(false),
+    { wait: 1000 },
+  );
+
+  const handleClick = useLockFn(async () => {
    try {
      setLoading(true);
+      setMounted(true);
+      cancelMounted();

      await onClick();
    } finally {
      setLoading(false);
+      runMounted();
    }
-  };
+  });
+
+  const isSuccess = mounted && !loading;

  return (
    <Tooltip title={t("Delay check")}>
      <Button
-        className="size-16 backdrop-blur !rounded-2xl !fixed z-10 bottom-16 right-16"
+        className="size-16 backdrop-blur !rounded-2xl !fixed z-10 bottom-8 right-8"
        sx={{
          boxShadow: 8,
-          backgroundColor: alpha(palette.primary.main, 0.3),
+          backgroundColor: alpha(
+            palette[isSuccess ? "success" : "primary"].main,
+            isSuccess ? 0.7 : 0.3,
+          ),

          "&:hover": {
            backgroundColor: alpha(palette.primary.main, 0.45),
@@ -52,17 +68,29 @@ export const DelayButton = memo(function DelayButton({
        <Bolt
          className={classNames(
            "!size-8",
-            "transition-opacity",
-            loading ? "opacity-0" : "opacity-1",
+            "!transition-opacity",
+            mounted ? "opacity-0" : "opacity-1",
          )}
        />

-        <CircularProgress
-          size={32}
+        {mounted && (
+          <CircularProgress
+            size={32}
+            className={classNames(
+              "transition-opacity",
+              "absolute",
+              loading ? "opacity-1" : "opacity-0",
+            )}
+          />
+        )}
+
+        <Done
+          color="success"
          className={classNames(
-            "transition-opacity",
+            "!size-8",
            "absolute",
-            loading ? "opacity-1" : "opacity-0",
+            "!transition-opacity",
+            isSuccess ? "opacity-1" : "opacity-0",
          )}
        />
      </Button>
--- a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx
@@ -7,12 +7,12 @@ import {
 } from "@mui/material";
 import { PaperSwitchButton } from "../setting/modules/system-proxy";
 import { Clash, useClashCore, useNyanpasu } from "@nyanpasu/interface";
+import { useBreakpoint } from "@nyanpasu/ui";
 import { useAtom, useAtomValue } from "jotai";
 import { proxyGroupAtom, proxyGroupSortAtom } from "@/store";
 import { CSSProperties, memo, useEffect, useMemo, useState } from "react";
 import { classNames } from "@/utils";
 import { VList } from "virtua";
-import { useBreakpoint } from "@/hooks/use-breakpoint";

 type History = Clash.Proxy["history"];

--- a/clash-nyanpasu/frontend/ui/hooks/index.ts
+++ b/clash-nyanpasu/frontend/ui/hooks/index.ts
@@ -0,0 +1 @@
+export * from "./use-breakpoint";
--- a/clash-nyanpasu/frontend/nyanpasu/src/hooks/use-breakpoint.ts
+++ b/clash-nyanpasu/frontend/nyanpasu/src/hooks/use-breakpoint.ts
@@ -1,7 +1,15 @@
 import { useTheme } from "@mui/material";
 import { useEffect, useState } from "react";

-export const useBreakpoint = (columnMapping: { [key: string]: number }) => {
+export const useBreakpoint = (
+  columnMapping: { [key: string]: number } = {
+    sm: 1,
+    md: 1,
+    lg: 2,
+    xl: 3,
+    default: 4,
+  },
+) => {
  const { breakpoints } = useTheme();

  const [breakpoint, setBreakpoint] = useState({
--- a/clash-nyanpasu/frontend/ui/index.ts
+++ b/clash-nyanpasu/frontend/ui/index.ts
@@ -1 +1,2 @@
 export * from "./materialYou";
+export * from "./hooks";
--- a/clash-nyanpasu/manifest/version.json
+++ b/clash-nyanpasu/manifest/version.json
@@ -2,7 +2,7 @@
  "manifest_version": 1,
  "latest": {
    "mihomo": "v1.18.4",
-    "mihomo_alpha": "alpha-6d1c62b",
+    "mihomo_alpha": "alpha-619f341",
    "clash_rs": "v0.1.17",
    "clash_premium": "2023-09-05-gdcc8d87"
  },
@@ -36,5 +36,5 @@
      "darwin-x64": "clash-darwin-amd64-n{}.gz"
    }
  },
-  "updated_at": "2024-05-10T22:19:54.762Z"
+  "updated_at": "2024-05-11T22:19:04.208Z"
 }
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -103,7 +103,7 @@
    "stylelint-order": "6.0.4",
    "stylelint-scss": "6.3.0",
    "tailwindcss": "3.4.3",
-    "tsx": "4.9.5",
+    "tsx": "4.10.1",
    "typescript": "5.4.5"
  },
  "packageManager": "pnpm@9.1.0",
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -134,8 +134,8 @@ importers:
        specifier: 3.4.3
        version: 3.4.3
      tsx:
-        specifier: 4.9.5
-        version: 4.9.5
+        specifier: 4.10.1
+        version: 4.10.1
      typescript:
        specifier: 5.4.5
        version: 5.4.5
@@ -174,8 +174,8 @@ importers:
        specifier: 11.11.5
        version: 11.11.5(@emotion/react@11.11.4(react@19.0.0-beta-04b058868c-20240508)(types-react@19.0.0-beta.1))(react@19.0.0-beta-04b058868c-20240508)(types-react@19.0.0-beta.1)
      '@generouted/react-router':
-        specifier: 1.19.3
-        version: 1.19.3(react-router-dom@6.23.1(react-dom@19.0.0-beta-04b058868c-20240508(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508)(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))
+        specifier: 1.19.4
+        version: 1.19.4(react-router-dom@6.23.1(react-dom@19.0.0-beta-04b058868c-20240508(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508)(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))
      '@juggle/resize-observer':
        specifier: 3.4.0
        version: 3.4.0
@@ -1003,8 +1003,8 @@ packages:
  '@floating-ui/utils@0.2.2':
    resolution: {integrity: sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==}

-  '@generouted/react-router@1.19.3':
-    resolution: {integrity: sha512-3/Y0j302HnwxyU0KOoCOFSVwJZN4eD73+CVtSaOKUnLbGW1ftP1dT8Eur14PALGvZOVR4gsFrUJFq6a4c/kWvQ==}
+  '@generouted/react-router@1.19.4':
+    resolution: {integrity: sha512-VpOSWt1GA334bf9r3M482GTOpEcYaGiBgfonMMN8VABBX11oxZuYNF4Gw7AWoa8wu+0VerdS0q5KnRXklS2fow==}
    peerDependencies:
      react: npm:react@beta
      react-router-dom: '>=6'
@@ -2675,8 +2675,8 @@ packages:
  functions-have-names@1.2.3:
    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}

-  generouted@1.19.3:
-    resolution: {integrity: sha512-1KnOmPYBNryAm+9PvvOTOzKiWvuBKRwK+Xr4dP/I9U00y7UAv/VrFGeb0v7mYMiny6jpWBmfBFKaUvq4Q0Z4dQ==}
+  generouted@1.19.4:
+    resolution: {integrity: sha512-33y/vqC6zSIVO274fZKcuJfLQ+urJ+eHn+XdKpiYp5ZTsd83deTjQCp4qcQ8rJbKBNjchj+HUDlTGdXg1mgtOw==}
    peerDependencies:
      vite: '>=3'

@@ -4535,8 +4535,8 @@ packages:
  tslib@2.6.2:
    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}

-  tsx@4.9.5:
-    resolution: {integrity: sha512-bVKowxL5sqd5Pxkkgy6M9IGpxyY9+SPxWPNviZyqNBT/i6/X9EHbmuLDUw/6/Tugw1ca8VXNDtcM/amQjXcEOA==}
+  tsx@4.10.1:
+    resolution: {integrity: sha512-G+CcyTOopwhuI81FU+KpzGN5UBhHgGEDlGt8mHAXKxv8pDGr6WI7hI7aRjTRol5WzFVsSNuzl3ekCZ0eLIJlEQ==}
    engines: {node: '>=18.0.0'}
    hasBin: true

@@ -5467,10 +5467,10 @@ snapshots:

  '@floating-ui/utils@0.2.2': {}

-  '@generouted/react-router@1.19.3(react-router-dom@6.23.1(react-dom@19.0.0-beta-04b058868c-20240508(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508)(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))':
+  '@generouted/react-router@1.19.4(react-router-dom@6.23.1(react-dom@19.0.0-beta-04b058868c-20240508(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508)(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))':
    dependencies:
      fast-glob: 3.3.2
-      generouted: 1.19.3(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))
+      generouted: 1.19.4(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0))
      react: 19.0.0-beta-04b058868c-20240508
      react-router-dom: 6.23.1(react-dom@19.0.0-beta-04b058868c-20240508(react@19.0.0-beta-04b058868c-20240508))(react@19.0.0-beta-04b058868c-20240508)
      vite: 5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0)
@@ -7329,7 +7329,7 @@ snapshots:

  functions-have-names@1.2.3: {}

-  generouted@1.19.3(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0)):
+  generouted@1.19.4(vite@5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0)):
    dependencies:
      vite: 5.2.11(@types/node@20.12.11)(less@4.2.0)(sass@1.77.1)(stylus@0.62.0)

@@ -9399,7 +9399,7 @@ snapshots:

  tslib@2.6.2: {}

-  tsx@4.9.5:
+  tsx@4.10.1:
    dependencies:
      esbuild: 0.20.2
      get-tsconfig: 4.7.4
--- a/clash-verge-rev/README.md
+++ b/clash-verge-rev/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="./src/assets/image/logo.png" alt="Clash" width="128" />
+  <img src="./src-tauri/icons/icon.png" alt="Clash" width="128" />
  <br>
  Continuation of <a href="https://github.com/zzzgydi/clash-verge">Clash Verge</a>
  <br>
@@ -11,7 +11,9 @@ A Clash Meta GUI based on <a href="https://github.com/tauri-apps/tauri">Tauri</a

 ## Preview

-![preview](./docs/preview.png)
+| Dark                             | Light                             |
+| -------------------------------- | --------------------------------- |
+| ![预览](./docs/preview_dark.png) | ![预览](./docs/preview_light.png) |

 ## Install

--- a/clash-verge-rev/docs/preview.png
+++ b/clash-verge-rev/docs/preview.png
--- a/clash-verge-rev/docs/preview_dark.png
+++ b/clash-verge-rev/docs/preview_dark.png
--- a/clash-verge-rev/docs/preview_light.png
+++ b/clash-verge-rev/docs/preview_light.png
--- a/clash-verge-rev/src-tauri/Cargo.toml
+++ b/clash-verge-rev/src-tauri/Cargo.toml
@@ -37,7 +37,7 @@ serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
 sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
 auto-launch = { git="https://github.com/zzzgydi/auto-launch", branch = "main" }
-tauri = { version = "1.6", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
+tauri = { version = "1.6", features = [ "http-all", "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }

 [target.'cfg(windows)'.dependencies]
 runas = "=1.2.0"
--- a/clash-verge-rev/src-tauri/icons/128x128.png
+++ b/clash-verge-rev/src-tauri/icons/128x128.png
--- a/clash-verge-rev/src-tauri/icons/128x128@2x.png
+++ b/clash-verge-rev/src-tauri/icons/128x128@2x.png
--- a/clash-verge-rev/src-tauri/icons/32x32.png
+++ b/clash-verge-rev/src-tauri/icons/32x32.png
--- a/clash-verge-rev/src-tauri/icons/Square107x107Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square107x107Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square142x142Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square142x142Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square150x150Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square150x150Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square284x284Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square284x284Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square30x30Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square30x30Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square310x310Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square310x310Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square44x44Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square44x44Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square71x71Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square71x71Logo.png
--- a/clash-verge-rev/src-tauri/icons/Square89x89Logo.png
+++ b/clash-verge-rev/src-tauri/icons/Square89x89Logo.png
--- a/clash-verge-rev/src-tauri/icons/StoreLogo.png
+++ b/clash-verge-rev/src-tauri/icons/StoreLogo.png
--- a/clash-verge-rev/src-tauri/icons/icon-new.icns
+++ b/clash-verge-rev/src-tauri/icons/icon-new.icns
--- a/clash-verge-rev/src-tauri/icons/icon-shrink.png
+++ b/clash-verge-rev/src-tauri/icons/icon-shrink.png
--- a/clash-verge-rev/src-tauri/icons/icon.icns
+++ b/clash-verge-rev/src-tauri/icons/icon.icns
--- a/clash-verge-rev/src-tauri/icons/icon.ico
+++ b/clash-verge-rev/src-tauri/icons/icon.ico
--- a/clash-verge-rev/src-tauri/icons/icon.png
+++ b/clash-verge-rev/src-tauri/icons/icon.png
--- a/clash-verge-rev/src-tauri/icons/mac-tray-icon-sys.png
+++ b/clash-verge-rev/src-tauri/icons/mac-tray-icon-sys.png
--- a/clash-verge-rev/src-tauri/icons/mac-tray-icon-tun.png
+++ b/clash-verge-rev/src-tauri/icons/mac-tray-icon-tun.png
--- a/clash-verge-rev/src-tauri/icons/mac-tray-icon.png
+++ b/clash-verge-rev/src-tauri/icons/mac-tray-icon.png
--- a/clash-verge-rev/src-tauri/icons/tray-icon-sys.ico
+++ b/clash-verge-rev/src-tauri/icons/tray-icon-sys.ico
--- a/clash-verge-rev/src-tauri/icons/tray-icon-sys.png
+++ b/clash-verge-rev/src-tauri/icons/tray-icon-sys.png
--- a/clash-verge-rev/src-tauri/icons/tray-icon-tun.ico
+++ b/clash-verge-rev/src-tauri/icons/tray-icon-tun.ico
--- a/clash-verge-rev/src-tauri/icons/tray-icon-tun.png
+++ b/clash-verge-rev/src-tauri/icons/tray-icon-tun.png
--- a/clash-verge-rev/src-tauri/icons/tray-icon.ico
+++ b/clash-verge-rev/src-tauri/icons/tray-icon.ico
--- a/clash-verge-rev/src-tauri/icons/tray-icon.png
+++ b/clash-verge-rev/src-tauri/icons/tray-icon.png
--- a/clash-verge-rev/src-tauri/src/core/core.rs
+++ b/clash-verge-rev/src-tauri/src/core/core.rs
@@ -5,6 +5,7 @@ use crate::{config::*, utils::dirs};
 use anyhow::{bail, Context, Result};
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
+use serde_yaml::Mapping;
 use std::{fs, io::Write, sync::Arc, time::Duration};
 use sysinfo::{Pid, System};
 use tauri::api::process::{Command, CommandChild, CommandEvent};
@@ -232,6 +233,16 @@ impl CoreManager {

    /// 停止核心运行
    pub fn stop_core(&self) -> Result<()> {
+        // 关闭tun模式
+        tauri::async_runtime::block_on(async move {
+            let mut disable = Mapping::new();
+            let mut tun = Mapping::new();
+            tun.insert("enable".into(), false.into());
+            disable.insert("tun".into(), tun.into());
+            log::debug!(target: "app", "disable tun mode");
+            let _ = clash_api::patch_configs(&disable).await;
+        });
+
        if *self.use_service_mode.lock() {
            log::debug!(target: "app", "stop the core by service");
            tauri::async_runtime::block_on(async move {
--- a/clash-verge-rev/src-tauri/src/core/tray.rs
+++ b/clash-verge-rev/src-tauri/src/core/tray.rs
@@ -177,10 +177,9 @@ impl Tray {
        let tun_tray_icon = verge.tun_tray_icon.as_ref().unwrap_or(&false);

        let mut indication_icon = if *system_proxy {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon-sys.png").to_vec();
            #[cfg(target_os = "macos")]
-            let mut icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec();
+            let _ = tray.set_icon_as_template(false);
+            let mut icon = include_bytes!("../../icons/tray-icon-sys.ico").to_vec();
            if *sysproxy_tray_icon {
                let icon_dir_path = dirs::app_home_dir()?.join("icons");
                let png_path = icon_dir_path.join("sysproxy.png");
@@ -193,10 +192,12 @@ impl Tray {
            }
            icon
        } else {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon.png").to_vec();
+            #[cfg(target_os = "macos")]
+            let _ = tray.set_icon_as_template(true);
            #[cfg(target_os = "macos")]
            let mut icon = include_bytes!("../../icons/mac-tray-icon.png").to_vec();
+            #[cfg(not(target_os = "macos"))]
+            let mut icon = include_bytes!("../../icons/tray-icon.ico").to_vec();
            if *common_tray_icon {
                let icon_dir_path = dirs::app_home_dir()?.join("icons");
                let png_path = icon_dir_path.join("common.png");
@@ -211,10 +212,9 @@ impl Tray {
        };

        if *tun_mode {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec();
            #[cfg(target_os = "macos")]
-            let mut icon = include_bytes!("../../icons/mac-tray-icon-tun.png").to_vec();
+            let _ = tray.set_icon_as_template(false);
+            let mut icon = include_bytes!("../../icons/tray-icon-tun.ico").to_vec();
            if *tun_tray_icon {
                let icon_dir_path = dirs::app_home_dir()?.join("icons");
                let png_path = icon_dir_path.join("tun.png");
--- a/clash-verge-rev/src-tauri/tauri.conf.json
+++ b/clash-verge-rev/src-tauri/tauri.conf.json
@@ -18,7 +18,7 @@
        "icons/32x32.png",
        "icons/128x128.png",
        "icons/128x128@2x.png",
-        "icons/icon-new.icns",
+        "icons/icon.icns",
        "icons/icon.ico"
      ],
      "resources": ["resources"],
--- a/clash-verge-rev/src-tauri/tauri.linux.conf.json
+++ b/clash-verge-rev/src-tauri/tauri.linux.conf.json
@@ -2,7 +2,7 @@
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "tauri": {
    "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
    },
    "bundle": {
      "identifier": "io.github.clash-verge-rev.clash-verge-rev",
--- a/clash-verge-rev/src-tauri/tauri.windows.conf.json
+++ b/clash-verge-rev/src-tauri/tauri.windows.conf.json
@@ -2,7 +2,7 @@
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "tauri": {
    "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
    },
    "bundle": {
      "identifier": "io.github.clash-verge-rev.clash-verge-rev",
--- a/clash-verge-rev/src-tauri/webview2.arm64.json
+++ b/clash-verge-rev/src-tauri/webview2.arm64.json
@@ -2,7 +2,7 @@
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "tauri": {
    "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
    },
    "bundle": {
      "identifier": "io.github.clash-verge-rev.clash-verge-rev",
--- a/clash-verge-rev/src-tauri/webview2.x64.json
+++ b/clash-verge-rev/src-tauri/webview2.x64.json
@@ -2,7 +2,7 @@
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "tauri": {
    "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
    },
    "bundle": {
      "identifier": "io.github.clash-verge-rev.clash-verge-rev",
--- a/clash-verge-rev/src-tauri/webview2.x86.json
+++ b/clash-verge-rev/src-tauri/webview2.x86.json
@@ -2,7 +2,7 @@
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "tauri": {
    "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
    },
    "bundle": {
      "identifier": "io.github.clash-verge-rev.clash-verge-rev",
--- a/clash-verge-rev/src/assets/image/icon_dark.png
+++ b/clash-verge-rev/src/assets/image/icon_dark.png
--- a/clash-verge-rev/src/assets/image/icon_light.png
+++ b/clash-verge-rev/src/assets/image/icon_light.png
--- a/clash-verge-rev/src/assets/image/logo-box.png
+++ b/clash-verge-rev/src/assets/image/logo-box.png
--- a/clash-verge-rev/src/assets/image/logo.bak.svg
+++ b/clash-verge-rev/src/assets/image/logo.bak.svg
@@ -1,18 +0,0 @@
-<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400"
-  height="400" viewBox="0, 0, 400,400">
-  <defs>
-    <linearGradient id="Gradient2" x1="0" x2="-0.1" y1="0" y2="1">
-      <stop offset="0%" stop-color="#5b5c9d" />
-      <stop offset="80%" stop-color="rgb(63, 64, 109)" />
-      <stop offset="100%" stop-color="rgb(63, 64, 109)" />
-    </linearGradient>
-  </defs>
-  <g id="svgg">
-    <path id="path0"
-      d="M118.124 39.858 C 116.645 40.182,114.562 42.930,113.283 46.247 C 111.908 49.812,110.887 54.542,107.205 74.400 C 106.736 76.930,105.926 81.160,105.404 83.800 C 104.527 88.237,103.654 92.889,102.177 101.000 C 101.856 102.760,101.413 105.100,101.192 106.200 C 100.754 108.375,100.784 108.199,98.436 122.200 C 96.675 132.702,95.947 137.215,94.984 143.600 C 94.636 145.910,94.098 149.420,93.789 151.400 C 92.649 158.697,91.961 164.413,92.180 164.768 C 92.304 164.968,92.223 165.192,92.000 165.266 C 91.777 165.340,96.852 165.347,103.277 165.282 C 116.520 165.149,115.721 165.379,116.358 161.519 C 122.839 122.279,179.334 121.580,186.617 160.650 C 186.981 162.602,187.463 164.425,187.689 164.700 C 188.328 165.481,229.717 165.423,230.367 164.640 C 230.622 164.332,231.013 162.937,231.235 161.540 C 237.531 121.949,295.239 121.807,301.620 161.367 C 302.274 165.421,301.855 165.252,310.962 165.117 C 315.273 165.052,318.861 165.090,318.935 165.200 C 319.009 165.310,319.005 165.152,318.927 164.848 C 318.849 164.545,318.519 162.610,318.193 160.548 C 317.867 158.487,317.330 155.135,317.000 153.100 C 316.162 147.934,315.312 142.663,314.823 139.600 C 314.595 138.170,314.226 136.010,314.004 134.800 C 313.781 133.590,312.423 125.400,310.985 116.600 C 304.278 75.545,304.008 74.156,298.145 50.400 C 295.961 41.553,294.621 39.584,290.800 39.611 C 287.927 39.631,283.053 43.395,279.420 48.400 C 277.509 51.032,261.566 79.109,256.960 87.953 C 253.991 93.654,253.647 93.789,245.600 92.402 C 218.757 87.774,194.454 87.780,170.478 92.420 C 162.868 93.893,163.987 94.596,157.579 84.306 C 133.879 46.247,126.566 38.009,118.124 39.858 M147.277 134.807 C 123.365 138.118,111.083 165.918,124.948 185.349 C 140.543 207.202,173.704 202.274,182.466 176.800 C 190.000 154.900,170.471 131.596,147.277 134.807 M262.051 134.810 C 235.780 138.440,224.730 170.720,243.356 189.422 C 264.398 210.548,299.874 195.275,298.689 165.600 C 297.927 146.523,280.892 132.207,262.051 134.810 M157.600 153.840 C 163.092 156.341,166.343 161.914,165.902 168.074 C 164.875 182.425,145.082 186.221,138.715 173.287 C 132.759 161.189,145.324 148.250,157.600 153.840 M273.193 153.597 C 279.788 156.926,283.287 165.159,280.844 171.600 C 275.229 186.406,253.594 183.910,252.135 168.287 C 251.125 157.467,263.609 148.758,273.193 153.597 M91.200 168.809 C 91.200 169.522,90.939 171.836,90.621 173.952 C 89.933 178.523,87.567 196.170,85.788 210.000 C 85.462 212.530,85.012 215.860,84.786 217.400 C 84.561 218.940,84.191 221.820,83.964 223.800 C 83.737 225.780,83.288 229.560,82.965 232.200 C 81.886 241.026,80.172 255.664,79.404 262.600 C 78.867 267.450,78.532 270.381,76.987 283.800 C 76.251 290.187,75.405 297.881,74.568 305.800 C 74.220 309.100,73.789 313.150,73.613 314.800 C 73.436 316.450,73.063 320.230,72.784 323.200 C 72.504 326.170,72.169 328.723,72.038 328.874 C 71.701 329.262,59.638 327.033,54.028 325.546 C 34.668 320.412,26.096 301.951,35.625 285.911 C 38.026 281.869,41.515 278.587,49.795 272.581 C 58.081 266.570,59.262 265.247,59.510 261.702 C 59.969 255.136,50.677 252.070,40.551 255.447 C -6.127 271.014,-3.894 337.227,43.806 351.951 C 50.541 354.030,58.050 355.239,67.760 355.807 C 72.410 356.079,75.202 356.542,82.181 358.199 C 88.822 359.777,100.215 360.425,156.000 362.398 C 170.725 362.918,255.192 362.921,267.760 362.401 C 273.062 362.182,281.900 361.820,287.400 361.597 C 302.851 360.972,326.558 359.339,333.200 358.444 C 343.055 357.116,343.889 354.966,341.839 336.200 C 341.502 333.120,340.948 327.900,340.607 324.600 C 340.266 321.300,339.709 315.990,339.370 312.800 C 339.030 309.610,338.499 304.570,338.189 301.600 C 337.022 290.393,335.650 278.160,334.622 269.800 C 333.105 257.460,332.638 254.027,330.408 238.800 C 329.716 234.070,328.983 229.030,328.781 227.600 C 328.579 226.170,328.231 223.920,328.008 222.600 C 327.785 221.280,326.695 214.260,325.587 207.000 C 324.478 199.740,323.124 191.010,322.578 187.600 C 322.032 184.190,321.325 179.780,321.007 177.800 C 320.689 175.820,320.203 172.711,319.925 170.892 C 319.508 168.155,319.315 167.635,318.810 167.885 C 318.475 168.051,314.780 168.279,310.600 168.393 C 301.870 168.631,302.159 168.535,301.810 171.300 C 299.468 189.825,283.036 203.371,264.230 202.279 C 247.552 201.310,233.532 188.465,231.203 172.020 C 230.651 168.125,232.337 168.400,209.000 168.400 C 185.703 168.400,187.432 168.114,186.814 172.064 C 180.639 211.474,123.556 212.329,116.559 173.117 C 115.684 168.218,116.787 168.629,103.881 168.400 C 97.676 168.290,92.285 168.046,91.900 167.857 C 91.307 167.567,91.200 167.712,91.200 168.809 M211.015 197.632 C 214.247 200.942,215.394 201.357,220.447 201.050 C 225.236 200.759,225.846 201.071,224.310 203.023 C 221.899 206.089,216.333 205.843,210.779 202.425 C 208.312 200.907,207.846 200.906,205.600 202.405 C 200.180 206.022,193.561 206.136,191.600 202.647 C 190.824 201.267,191.555 200.665,193.600 201.001 C 199.643 201.993,201.561 201.450,204.900 197.805 C 207.534 194.929,208.352 194.906,211.015 197.632 "
-      stroke="none" fill="url(#Gradient2)" fill-rule="evenodd"></path>
-    <path id="path1"
-      d="M148.000 131.622 C 132.020 133.140,119.114 145.293,116.377 161.400 C 115.675 165.535,116.697 165.239,103.579 165.112 C 97.252 165.050,92.159 165.135,92.261 165.300 C 92.364 165.465,92.279 165.600,92.074 165.600 C 91.391 165.600,91.684 167.617,92.424 168.013 C 92.839 168.235,97.730 168.400,103.897 168.400 C 116.551 168.400,115.666 168.070,116.562 173.117 C 123.522 212.326,180.639 211.470,186.814 172.064 C 187.432 168.114,185.703 168.400,209.000 168.400 C 232.337 168.400,230.651 168.125,231.203 172.020 C 233.532 188.465,247.552 201.310,264.230 202.279 C 283.039 203.371,299.468 189.826,301.811 171.294 C 302.169 168.458,302.345 168.400,310.600 168.400 C 318.988 168.400,319.609 168.159,318.852 165.200 C 318.824 165.090,315.273 165.052,310.961 165.117 C 301.855 165.252,302.274 165.421,301.620 161.367 C 295.239 121.807,237.531 121.949,231.235 161.540 C 231.013 162.937,230.622 164.332,230.367 164.640 C 229.717 165.423,188.328 165.481,187.689 164.700 C 187.463 164.425,186.981 162.602,186.617 160.650 C 183.194 142.288,166.648 129.850,148.000 131.622 M159.886 135.622 C 183.880 141.759,192.035 172.033,174.435 189.636 C 156.404 207.671,125.892 198.962,119.944 174.084 C 114.368 150.761,136.343 129.601,159.886 135.622 M274.658 135.615 C 299.082 141.861,307.061 172.817,288.734 190.222 C 267.975 209.936,234.188 195.420,234.219 166.800 C 234.241 145.502,253.935 130.315,274.658 135.615 M148.542 152.793 C 139.499 154.706,134.598 164.925,138.715 173.287 C 145.082 186.221,164.875 182.425,165.902 168.074 C 166.591 158.446,157.916 150.811,148.542 152.793 M262.091 153.188 C 253.922 156.127,249.883 165.408,253.408 173.139 C 257.835 182.850,271.593 184.491,278.201 176.097 C 287.389 164.426,275.974 148.192,262.091 153.188 M204.900 197.805 C 201.561 201.450,199.643 201.993,193.600 201.001 C 191.555 200.665,190.824 201.267,191.600 202.647 C 193.561 206.136,200.180 206.022,205.600 202.405 C 207.846 200.906,208.312 200.907,210.779 202.425 C 216.333 205.843,221.899 206.089,224.310 203.023 C 225.846 201.071,225.236 200.759,220.447 201.050 C 215.394 201.357,214.247 200.942,211.015 197.632 C 208.352 194.906,207.534 194.929,204.900 197.805 "
-      stroke="none" fill="#ffffff" fill-rule="evenodd"></path>
-  </g>
-</svg>
--- a/clash-verge-rev/src/assets/image/logo.ico
+++ b/clash-verge-rev/src/assets/image/logo.ico
--- a/clash-verge-rev/src/assets/image/logo.png
+++ b/clash-verge-rev/src/assets/image/logo.png
--- a/clash-verge-rev/src/assets/image/logo.svg
+++ b/clash-verge-rev/src/assets/image/logo.svg
@@ -1,25 +1,50 @@
-<svg width="157" height="28" viewBox="0 0 157 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="logo" clip-path="url(#clip0_189_16)">
-<g id="&#228;&#187;&#163;&#231;&#144;&#134;&#231;&#187;&#132;">
-<path id="Vector" d="M155.711 21.92C155.205 22.2266 154.611 22.4533 153.931 22.6C153.265 22.7466 152.618 22.82 151.991 22.82C149.858 22.82 148.238 22.3133 147.131 21.3C146.038 20.2866 145.491 18.8667 145.491 17.04C145.491 15.2267 145.978 13.84 146.951 12.88C147.938 11.9066 149.278 11.42 150.971 11.42C152.651 11.42 153.978 11.9066 154.951 12.88C155.938 13.84 156.431 15.2267 156.431 17.04C156.431 17.24 156.418 17.5266 156.391 17.9H148.611C148.905 19.62 150.031 20.48 151.991 20.48C153.365 20.48 154.605 20.0733 155.711 19.26V21.92ZM153.411 15.66C153.238 14.9933 152.938 14.5 152.511 14.18C152.085 13.86 151.571 13.7 150.971 13.7C150.411 13.7 149.931 13.8666 149.531 14.2C149.145 14.5333 148.871 15.02 148.711 15.66H153.411Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_2" d="M138.386 27.06C137.572 27.06 136.752 27.0067 135.926 26.9C135.112 26.7933 134.379 26.64 133.726 26.44V23.82C135.152 24.14 136.579 24.3 138.006 24.3C138.912 24.3 139.599 24.1 140.066 23.7C140.532 23.3 140.766 22.7467 140.766 22.04C140.032 22.52 139.159 22.76 138.146 22.76C137.159 22.76 136.292 22.52 135.546 22.04C134.799 21.56 134.226 20.9 133.826 20.06C133.426 19.2067 133.226 18.2267 133.226 17.12C133.226 16.0133 133.426 15.0333 133.826 14.18C134.239 13.3133 134.812 12.64 135.546 12.16C136.292 11.68 137.159 11.44 138.146 11.44C139.066 11.44 139.939 11.7467 140.766 12.36V11.7H143.886V22.46C143.886 25.5267 142.052 27.06 138.386 27.06ZM136.286 17.12C136.286 17.7333 136.406 18.2933 136.646 18.8C136.899 19.3067 137.226 19.7133 137.626 20.02C138.039 20.3133 138.472 20.46 138.926 20.46C139.259 20.46 139.632 20.3867 140.046 20.24C140.459 20.08 140.812 19.7533 141.106 19.26L141.206 18.86V15.16C140.926 14.5867 140.566 14.2133 140.126 14.04C139.686 13.8533 139.286 13.76 138.926 13.76C138.472 13.76 138.039 13.9067 137.626 14.2C137.226 14.4933 136.899 14.9 136.646 15.42C136.406 15.9267 136.286 16.4933 136.286 17.12Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_3" d="M129.052 11.7V12.86C129.399 12.4867 129.812 12.2 130.292 12C130.786 11.7867 131.272 11.68 131.752 11.68C132.086 11.68 132.399 11.7267 132.692 11.82V14.28C132.319 14.1867 131.966 14.14 131.632 14.14C131.126 14.14 130.646 14.2267 130.192 14.4C129.739 14.56 129.359 14.82 129.052 15.18V22.5H125.852V11.7H129.052Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_4" d="M123.524 21.92C123.017 22.2266 122.424 22.4533 121.744 22.6C121.077 22.7466 120.43 22.82 119.804 22.82C117.67 22.82 116.05 22.3133 114.944 21.3C113.85 20.2866 113.304 18.8667 113.304 17.04C113.304 15.2267 113.79 13.84 114.764 12.88C115.75 11.9066 117.09 11.42 118.784 11.42C120.464 11.42 121.79 11.9066 122.764 12.88C123.75 13.84 124.244 15.2267 124.244 17.04C124.244 17.24 124.23 17.5266 124.204 17.9H116.424C116.717 19.62 117.844 20.48 119.804 20.48C121.177 20.48 122.417 20.0733 123.524 19.26V21.92ZM121.224 15.66C121.05 14.9933 120.75 14.5 120.324 14.18C119.897 13.86 119.384 13.7 118.784 13.7C118.224 13.7 117.744 13.8666 117.344 14.2C116.957 14.5333 116.684 15.02 116.524 15.66H121.224Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_5" d="M99.3491 8.5H102.929L106.289 20.28H106.369L109.729 8.5H113.309L108.989 22.5H103.669L99.3491 8.5Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_6" d="M86.2201 7.12V12.86C86.7001 12.46 87.2335 12.1533 87.8201 11.94C88.4068 11.7133 89.0001 11.6 89.6001 11.6C90.6268 11.6 91.4401 11.9 92.0401 12.5C92.6535 13.1 92.9601 13.88 92.9601 14.84V22.5H89.7601V15.38C89.7601 14.9933 89.6001 14.68 89.2801 14.44C88.9601 14.1867 88.5801 14.06 88.1401 14.06C87.8868 14.06 87.5735 14.14 87.2001 14.3C86.8268 14.46 86.5001 14.66 86.2201 14.9V22.5H83.0201V7.12H86.2201Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_7" d="M77.7898 22.74C76.9765 22.78 76.1498 22.7133 75.3098 22.54C74.4832 22.38 73.7632 22.1267 73.1498 21.78V18.9C73.6965 19.3 74.3498 19.6333 75.1098 19.9C75.8832 20.1533 76.5632 20.26 77.1498 20.22C77.5632 20.1933 77.8632 20.1067 78.0498 19.96C78.2365 19.8 78.3432 19.64 78.3698 19.48C78.4365 19.0667 78.3365 18.7533 78.0698 18.54C77.8032 18.3267 77.3032 18.12 76.5698 17.92C75.7565 17.6933 75.1098 17.4333 74.6298 17.14C74.1498 16.8333 73.7832 16.4933 73.5298 16.12C73.2898 15.7333 73.1698 15.2467 73.1698 14.66C73.1698 14.0467 73.3298 13.5 73.6498 13.02C73.9698 12.5267 74.4765 12.14 75.1698 11.86C75.8632 11.58 76.6098 11.44 77.4098 11.44C78.0098 11.44 78.6165 11.5 79.2298 11.62C79.8432 11.7267 80.3565 11.8733 80.7698 12.06V14.64C80.3432 14.4267 79.8365 14.24 79.2498 14.08C78.6765 13.9067 78.1765 13.82 77.7498 13.82C76.8432 13.82 76.3498 14.06 76.2698 14.54C76.2298 14.82 76.3565 15.0667 76.6498 15.28C76.9565 15.4933 77.3898 15.6867 77.9498 15.86C78.7498 16.1133 79.4032 16.3733 79.9098 16.64C80.4298 16.9067 80.8365 17.2533 81.1298 17.68C81.4232 18.1067 81.5698 18.6533 81.5698 19.32C81.5698 20.3067 81.2165 21.1133 80.5098 21.74C79.8032 22.3533 78.8965 22.6867 77.7898 22.74Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_8" d="M65.667 22.76C64.6537 22.76 63.767 22.52 63.007 22.04C62.2603 21.56 61.6803 20.9 61.267 20.06C60.867 19.22 60.667 18.24 60.667 17.12C60.667 16.0133 60.867 15.0333 61.267 14.18C61.6803 13.3133 62.2537 12.64 62.987 12.16C63.7337 11.68 64.6003 11.44 65.587 11.44C66.0403 11.44 66.4937 11.5267 66.947 11.7C67.4137 11.86 67.847 12.0867 68.247 12.38V11.7H71.447V19.98C71.447 21.06 71.5803 21.9 71.847 22.5H68.847C68.7537 22.3133 68.6737 22.0733 68.607 21.78C67.7803 22.4333 66.8003 22.76 65.667 22.76ZM63.727 17.12C63.727 17.7333 63.847 18.2933 64.087 18.8C64.3403 19.3067 64.667 19.7133 65.067 20.02C65.4803 20.3133 65.9137 20.46 66.367 20.46C66.687 20.46 67.047 20.3933 67.447 20.26C67.847 20.1133 68.1937 19.8067 68.487 19.34V14.86C68.1937 14.3933 67.847 14.0933 67.447 13.96C67.0603 13.8267 66.7003 13.76 66.367 13.76C65.9137 13.76 65.4803 13.9067 65.067 14.2C64.667 14.4933 64.3403 14.9 64.087 15.42C63.847 15.9267 63.727 16.4933 63.727 17.12Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_9" d="M58.3398 22.66C57.1398 22.66 56.2332 22.3267 55.6198 21.66C55.0065 20.98 54.6998 19.9867 54.6998 18.68V7.12H57.8998V17.88C57.8998 18.4133 57.9398 18.82 58.0198 19.1C58.0998 19.38 58.2332 19.5933 58.4198 19.74C58.5665 19.86 58.7265 19.94 58.8998 19.98C59.0865 20.0067 59.4065 20.02 59.8598 20.02V22.66H58.3398Z" fill="black" fill-opacity="0.88"/>
-<path id="Vector_10" d="M48.6679 22.76C47.1479 22.76 45.7946 22.48 44.6079 21.92C43.4346 21.36 42.5079 20.5467 41.8279 19.48C41.1613 18.4133 40.8279 17.1467 40.8279 15.68C40.8279 14.1333 41.1546 12.8067 41.8079 11.7C42.4613 10.58 43.3746 9.72666 44.5479 9.13999C45.7213 8.53999 47.0613 8.23999 48.5679 8.23999C49.3146 8.23999 50.0679 8.31332 50.8279 8.45999C51.5879 8.60666 52.2146 8.79332 52.7079 9.01999V11.5C51.3613 11.0067 50.1079 10.76 48.9479 10.76C47.5613 10.76 46.4346 11.1667 45.5679 11.98C44.7146 12.7933 44.2879 14.0267 44.2879 15.68C44.2879 16.56 44.5013 17.34 44.9279 18.02C45.3546 18.6867 45.9146 19.2067 46.6079 19.58C47.3013 19.9533 48.0479 20.1667 48.8479 20.22L49.2879 20.24C49.9013 20.24 50.5079 20.1533 51.1079 19.98C51.7079 19.8067 52.2413 19.5733 52.7079 19.28V22.04C52.1346 22.3067 51.5213 22.4933 50.8679 22.6C50.2279 22.7067 49.4946 22.76 48.6679 22.76Z" fill="black" fill-opacity="0.88"/>
+<svg version="1.1" id="layout1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 117 27" style="enable-background:new 0 0 117 27;" xml:space="preserve">
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="-39.9" width="157" height="27"/>
+	</defs>
+	<clipPath id="SVGID_00000023248255305809236420000007367745325967865768_">
+		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000023248255305809236420000007367745325967865768_);">
+		<path class="st1" d="M115.9,21.4c-0.5,0.3-1.1,0.5-1.8,0.7c-0.7,0.1-1.3,0.2-1.9,0.2c-2.1,0-3.8-0.5-4.9-1.5
+			c-1.1-1-1.6-2.4-1.6-4.3c0-1.8,0.5-3.2,1.5-4.2c1-1,2.3-1.5,4-1.5c1.7,0,3,0.5,4,1.5c1,1,1.5,2.3,1.5,4.2c0,0.2,0,0.5,0,0.9h-7.8
+			c0.3,1.7,1.4,2.6,3.4,2.6c1.4,0,2.6-0.4,3.7-1.2V21.4z M113.6,15.2c-0.2-0.7-0.5-1.2-0.9-1.5c-0.4-0.3-0.9-0.5-1.5-0.5
+			c-0.6,0-1,0.2-1.4,0.5c-0.4,0.3-0.7,0.8-0.8,1.5H113.6z"/>
+		<path class="st1" d="M98.5,26.6c-0.8,0-1.6-0.1-2.5-0.2c-0.8-0.1-1.5-0.3-2.2-0.5v-2.6c1.4,0.3,2.9,0.5,4.3,0.5
+			c0.9,0,1.6-0.2,2.1-0.6c0.5-0.4,0.7-1,0.7-1.7c-0.7,0.5-1.6,0.7-2.6,0.7c-1,0-1.9-0.2-2.6-0.7c-0.7-0.5-1.3-1.1-1.7-2
+			c-0.4-0.9-0.6-1.8-0.6-2.9c0-1.1,0.2-2.1,0.6-2.9c0.4-0.9,1-1.5,1.7-2c0.7-0.5,1.6-0.7,2.6-0.7c0.9,0,1.8,0.3,2.6,0.9v-0.7h3.1V22
+			C104,25,102.2,26.6,98.5,26.6z M96.4,16.6c0,0.6,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1,1.2c0.4,0.3,0.8,0.4,1.3,0.4
+			c0.3,0,0.7-0.1,1.1-0.2c0.4-0.2,0.8-0.5,1.1-1l0.1-0.4v-3.7c-0.3-0.6-0.6-0.9-1.1-1.1c-0.4-0.2-0.8-0.3-1.2-0.3
+			c-0.5,0-0.9,0.1-1.3,0.4c-0.4,0.3-0.7,0.7-1,1.2C96.6,15.4,96.4,16,96.4,16.6z"/>
+		<path class="st1" d="M89.2,11.2v1.2c0.3-0.4,0.8-0.7,1.2-0.9c0.5-0.2,1-0.3,1.5-0.3c0.3,0,0.6,0,0.9,0.1v2.5
+			c-0.4-0.1-0.7-0.1-1.1-0.1c-0.5,0-1,0.1-1.4,0.3c-0.5,0.2-0.8,0.4-1.1,0.8V22H86V11.2H89.2z"/>
+		<path class="st1" d="M83.7,21.4c-0.5,0.3-1.1,0.5-1.8,0.7c-0.7,0.1-1.3,0.2-1.9,0.2c-2.1,0-3.8-0.5-4.9-1.5
+			c-1.1-1-1.6-2.4-1.6-4.3c0-1.8,0.5-3.2,1.5-4.2c1-1,2.3-1.5,4-1.5c1.7,0,3,0.5,4,1.5c1,1,1.5,2.3,1.5,4.2c0,0.2,0,0.5,0,0.9h-7.8
+			C76.9,19.1,78,20,80,20c1.4,0,2.6-0.4,3.7-1.2V21.4z M81.4,15.2c-0.2-0.7-0.5-1.2-0.9-1.5c-0.4-0.3-0.9-0.5-1.5-0.5
+			c-0.6,0-1,0.2-1.4,0.5c-0.4,0.3-0.7,0.8-0.8,1.5H81.4z"/>
+		<path class="st1" d="M59.5,8h3.6l3.4,11.8h0.1L69.9,8h3.6l-4.3,14h-5.3L59.5,8z"/>
+		<path class="st1" d="M46.4,6.6v5.7c0.5-0.4,1-0.7,1.6-0.9c0.6-0.2,1.2-0.3,1.8-0.3c1,0,1.8,0.3,2.4,0.9c0.6,0.6,0.9,1.4,0.9,2.3
+			V22h-3.2v-7.1c0-0.4-0.2-0.7-0.5-0.9c-0.3-0.3-0.7-0.4-1.1-0.4c-0.3,0-0.6,0.1-0.9,0.2c-0.4,0.2-0.7,0.4-1,0.6V22h-3.2V6.6H46.4z"
+			/>
+		<path class="st1" d="M37.9,22.2c-0.8,0-1.6,0-2.5-0.2c-0.8-0.2-1.5-0.4-2.2-0.8v-2.9c0.5,0.4,1.2,0.7,2,1c0.8,0.3,1.5,0.4,2,0.3
+			c0.4,0,0.7-0.1,0.9-0.3c0.2-0.2,0.3-0.3,0.3-0.5c0.1-0.4,0-0.7-0.3-0.9c-0.3-0.2-0.8-0.4-1.5-0.6c-0.8-0.2-1.5-0.5-1.9-0.8
+			c-0.5-0.3-0.8-0.6-1.1-1c-0.2-0.4-0.4-0.9-0.4-1.5c0-0.6,0.2-1.2,0.5-1.6c0.3-0.5,0.8-0.9,1.5-1.2c0.7-0.3,1.4-0.4,2.2-0.4
+			c0.6,0,1.2,0.1,1.8,0.2c0.6,0.1,1.1,0.3,1.5,0.4v2.6c-0.4-0.2-0.9-0.4-1.5-0.6c-0.6-0.2-1.1-0.3-1.5-0.3c-0.9,0-1.4,0.2-1.5,0.7
+			c0,0.3,0.1,0.5,0.4,0.7c0.3,0.2,0.7,0.4,1.3,0.6c0.8,0.3,1.5,0.5,2,0.8c0.5,0.3,0.9,0.6,1.2,1c0.3,0.4,0.4,1,0.4,1.6
+			c0,1-0.4,1.8-1.1,2.4C40,21.9,39,22.2,37.9,22.2z"/>
+		<path class="st1" d="M25.8,22.3c-1,0-1.9-0.2-2.7-0.7c-0.7-0.5-1.3-1.1-1.7-2c-0.4-0.8-0.6-1.8-0.6-2.9c0-1.1,0.2-2.1,0.6-2.9
+			c0.4-0.9,1-1.5,1.7-2c0.7-0.5,1.6-0.7,2.6-0.7c0.5,0,0.9,0.1,1.4,0.3c0.5,0.2,0.9,0.4,1.3,0.7v-0.7h3.2v8.3c0,1.1,0.1,1.9,0.4,2.5
+			h-3c-0.1-0.2-0.2-0.4-0.2-0.7C27.9,21.9,26.9,22.3,25.8,22.3z M23.9,16.6c0,0.6,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1,1.2
+			c0.4,0.3,0.8,0.4,1.3,0.4c0.3,0,0.7-0.1,1.1-0.2c0.4-0.1,0.7-0.5,1-0.9v-4.5c-0.3-0.5-0.6-0.8-1-0.9c-0.4-0.1-0.7-0.2-1.1-0.2
+			c-0.5,0-0.9,0.1-1.3,0.4c-0.4,0.3-0.7,0.7-1,1.2C24,15.4,23.9,16,23.9,16.6z"/>
+		<path class="st1" d="M18.5,22.2c-1.2,0-2.1-0.3-2.7-1c-0.6-0.7-0.9-1.7-0.9-3V6.6H18v10.8c0,0.5,0,0.9,0.1,1.2
+			c0.1,0.3,0.2,0.5,0.4,0.6c0.1,0.1,0.3,0.2,0.5,0.2c0.2,0,0.5,0,1,0v2.6H18.5z"/>
+		<path class="st1" d="M8.8,22.3c-1.5,0-2.9-0.3-4.1-0.8C3.6,20.9,2.7,20,2,19c-0.7-1.1-1-2.3-1-3.8c0-1.5,0.3-2.9,1-4
+			c0.7-1.1,1.6-2,2.7-2.6c1.2-0.6,2.5-0.9,4-0.9c0.7,0,1.5,0.1,2.3,0.2s1.4,0.3,1.9,0.6V11c-1.3-0.5-2.6-0.7-3.8-0.7
+			c-1.4,0-2.5,0.4-3.4,1.2c-0.9,0.8-1.3,2-1.3,3.7c0,0.9,0.2,1.7,0.6,2.3c0.4,0.7,1,1.2,1.7,1.6c0.7,0.4,1.4,0.6,2.2,0.6l0.4,0
+			c0.6,0,1.2-0.1,1.8-0.3c0.6-0.2,1.1-0.4,1.6-0.7v2.8c-0.6,0.3-1.2,0.5-1.8,0.6C10.4,22.2,9.6,22.3,8.8,22.3z"/>
+	</g>
 </g>
-<g id="svgg">
-<path id="path0" fill-rule="evenodd" clip-rule="evenodd" d="M9.45822 0.677484C9.3398 0.703426 9.17301 0.923458 9.0706 1.18905C8.96051 1.4745 8.87876 1.85323 8.58394 3.44325C8.54639 3.64583 8.48153 3.98453 8.43973 4.19591C8.36951 4.55118 8.29961 4.92366 8.18135 5.57311C8.15565 5.71403 8.12018 5.9014 8.10248 5.98947C8.06741 6.16362 8.06981 6.14953 7.88181 7.27059C7.7408 8.11148 7.68251 8.47284 7.60541 8.98408C7.57754 9.16904 7.53446 9.45009 7.50972 9.60863C7.41844 10.1929 7.36336 10.6506 7.38089 10.679C7.39082 10.695 7.38433 10.7129 7.36648 10.7189C7.34862 10.7248 7.75498 10.7254 8.26943 10.7202C9.32979 10.7095 9.26581 10.7279 9.31682 10.4189C9.83575 7.27691 14.3593 7.22095 14.9424 10.3493C14.9716 10.5056 15.0102 10.6515 15.0283 10.6736C15.0794 10.7361 18.3935 10.7314 18.4455 10.6687C18.4659 10.6441 18.4972 10.5324 18.515 10.4205C19.0191 7.25049 23.6398 7.23912 24.1507 10.4067C24.2031 10.7313 24.1695 10.7178 24.8987 10.7069C25.2439 10.7017 25.5312 10.7048 25.5371 10.7136C25.543 10.7224 25.5427 10.7097 25.5365 10.6854C25.5302 10.6611 25.5038 10.5062 25.4777 10.3411C25.4516 10.1761 25.4086 9.90769 25.3822 9.74475C25.3151 9.3311 25.247 8.90906 25.2079 8.6638C25.1896 8.5493 25.1601 8.37635 25.1423 8.27947C25.1244 8.18258 25.0157 7.52681 24.9006 6.8222C24.3635 3.53493 24.3419 3.42372 23.8725 1.52158C23.6976 0.813202 23.5903 0.655544 23.2844 0.657706C23.0543 0.659308 22.6641 0.96069 22.3732 1.36144C22.2201 1.57218 20.9436 3.8203 20.5748 4.52844C20.3371 4.98492 20.3095 4.99573 19.6652 4.88467C17.5159 4.51411 15.5699 4.51459 13.6502 4.88611C13.0409 5.00405 13.1305 5.06034 12.6174 4.23642C10.7197 1.18905 10.1342 0.529434 9.45822 0.677484ZM11.7925 8.28003C9.87787 8.54514 8.89445 10.7711 10.0046 12.3269C11.2533 14.0767 13.9085 13.6821 14.6101 11.6424C15.2133 9.88887 13.6496 8.02292 11.7925 8.28003ZM20.9824 8.28027C18.8789 8.57092 17.9941 11.1556 19.4855 12.653C21.1704 14.3446 24.0109 13.1217 23.916 10.7456C23.855 9.21813 22.491 8.07185 20.9824 8.28027ZM12.6191 9.804C13.0588 10.0043 13.3191 10.4505 13.2838 10.9437C13.2016 12.0928 11.6167 12.3967 11.1069 11.3611C10.63 10.3924 11.6361 9.35641 12.6191 9.804ZM21.8746 9.78454C22.4026 10.0511 22.6828 10.7103 22.4872 11.226C22.0376 12.4115 20.3053 12.2117 20.1885 10.9608C20.1076 10.0944 21.1072 9.39708 21.8746 9.78454ZM7.30242 11.0026C7.30242 11.0597 7.28152 11.2449 7.25606 11.4144C7.20097 11.7804 7.01153 13.1933 6.86908 14.3007C6.84298 14.5033 6.80695 14.7699 6.78885 14.8932C6.77084 15.0165 6.74121 15.2471 6.72304 15.4057C6.70486 15.5642 6.66891 15.8669 6.64305 16.0783C6.55665 16.785 6.41941 17.957 6.35792 18.5124C6.31492 18.9007 6.2881 19.1354 6.16439 20.2099C6.10546 20.7213 6.03772 21.3373 5.9707 21.9714C5.94284 22.2356 5.90833 22.5599 5.89423 22.692C5.88006 22.8241 5.8502 23.1268 5.82786 23.3646C5.80544 23.6024 5.77861 23.8068 5.76813 23.8189C5.74114 23.85 4.77526 23.6715 4.32607 23.5525C2.77592 23.1414 2.08956 21.6632 2.85254 20.3789C3.04479 20.0552 3.32416 19.7925 3.98713 19.3116C4.65059 18.8303 4.74515 18.7243 4.76501 18.4405C4.80176 17.9147 4.05775 17.6693 3.24697 17.9396C-0.49053 19.1861 -0.311734 24.4878 3.5076 25.6667C4.04687 25.8332 4.64811 25.93 5.42559 25.9754C5.79791 25.9972 6.02147 26.0343 6.58027 26.167C7.11202 26.2933 8.02425 26.3452 12.4909 26.5032C13.67 26.5448 20.4332 26.5451 21.4395 26.5034C21.8641 26.4859 22.5717 26.4569 23.0121 26.4391C24.2493 26.389 26.1475 26.2583 26.6793 26.1866C27.4684 26.0803 27.5352 25.9081 27.371 24.4055C27.3441 24.1589 27.2997 23.7409 27.2724 23.4767C27.2451 23.2125 27.2005 22.7873 27.1733 22.5319C27.1461 22.2765 27.1036 21.8729 27.0788 21.6351C26.9853 20.7378 26.8755 19.7583 26.7932 19.0889C26.6717 18.1008 26.6343 17.8259 26.4558 16.6067C26.4003 16.228 26.3417 15.8244 26.3255 15.7099C26.3093 15.5954 26.2814 15.4153 26.2636 15.3096C26.2457 15.2039 26.1585 14.6418 26.0697 14.0605C25.9809 13.4792 25.8725 12.7802 25.8288 12.5072C25.7851 12.2341 25.7285 11.881 25.703 11.7225C25.6776 11.5639 25.6386 11.315 25.6164 11.1693C25.583 10.9502 25.5675 10.9086 25.5271 10.9286C25.5003 10.9419 25.2044 10.9601 24.8697 10.9693C24.1707 10.9883 24.1939 10.9806 24.1659 11.202C23.9784 12.6853 22.6627 13.7699 21.1569 13.6825C19.8215 13.6049 18.6989 12.5764 18.5124 11.2597C18.4682 10.9478 18.6032 10.9698 16.7346 10.9698C14.8693 10.9698 15.0077 10.9469 14.9582 11.2632C14.4638 14.4187 9.89316 14.4872 9.33291 11.3475C9.26285 10.9552 9.35117 10.9881 8.31779 10.9698C7.82095 10.961 7.3893 10.9415 7.35847 10.9263C7.31099 10.9031 7.30242 10.9147 7.30242 11.0026ZM16.896 13.3104C17.1548 13.5754 17.2466 13.6087 17.6512 13.5841C18.0347 13.5608 18.0835 13.5858 17.9605 13.7421C17.7675 13.9876 17.3218 13.9679 16.8771 13.6942C16.6796 13.5726 16.6422 13.5726 16.4624 13.6926C16.0284 13.9822 15.4984 13.9913 15.3414 13.712C15.2793 13.6015 15.3378 13.5533 15.5016 13.5802C15.9854 13.6596 16.139 13.6161 16.4064 13.3243C16.6173 13.094 16.6828 13.0921 16.896 13.3104Z" fill="#40416F"/>
-<path id="path1" fill-rule="evenodd" clip-rule="evenodd" d="M11.8504 8.025C10.5709 8.14655 9.53748 9.11964 9.31833 10.4093C9.26212 10.7404 9.34395 10.7167 8.29359 10.7065C7.78699 10.7016 7.3792 10.7084 7.38736 10.7216C7.39561 10.7348 7.38881 10.7456 7.37239 10.7456C7.3177 10.7456 7.34116 10.9071 7.40042 10.9388C7.43364 10.9566 7.82527 10.9698 8.31906 10.9698C9.33226 10.9698 9.2614 10.9434 9.33314 11.3475C9.89043 14.487 14.4638 14.4184 14.9582 11.2632C15.0077 10.9469 14.8692 10.9698 16.7346 10.9698C18.6032 10.9698 18.4682 10.9478 18.5124 11.2597C18.6989 12.5764 19.8215 13.6049 21.1569 13.6825C22.6629 13.7699 23.9784 12.6854 24.166 11.2015C24.1947 10.9745 24.2087 10.9698 24.8697 10.9698C25.5413 10.9698 25.5911 10.9505 25.5305 10.7136C25.5282 10.7048 25.2439 10.7017 24.8986 10.7069C24.1695 10.7177 24.2031 10.7313 24.1507 10.4067C23.6398 7.23912 19.0191 7.25049 18.515 10.4205C18.4972 10.5324 18.4659 10.6441 18.4455 10.6687C18.3934 10.7314 15.0794 10.7361 15.0283 10.6736C15.0102 10.6515 14.9716 10.5056 14.9424 10.3493C14.6683 8.87903 13.3435 7.88312 11.8504 8.025ZM12.8021 8.34528C14.7233 8.83667 15.3762 11.2607 13.967 12.6702C12.5233 14.1142 10.0802 13.4169 9.60394 11.4249C9.15747 9.55746 10.917 7.86318 12.8021 8.34528ZM21.9918 8.34472C23.9475 8.84484 24.5864 11.3235 23.1189 12.7171C21.4567 14.2956 18.7514 13.1333 18.7539 10.8417C18.7557 9.13637 20.3326 7.92035 21.9918 8.34472ZM11.8938 9.72016C11.1697 9.87333 10.7773 10.6916 11.1069 11.3611C11.6167 12.3967 13.2016 12.0928 13.2838 10.9437C13.339 10.1728 12.6443 9.56146 11.8938 9.72016ZM20.9856 9.75179C20.3315 9.98711 20.0081 10.7302 20.2904 11.3493C20.6448 12.1268 21.7464 12.2582 22.2755 11.5861C23.0112 10.6516 22.0972 9.35176 20.9856 9.75179ZM16.4063 13.3243C16.139 13.6161 15.9854 13.6596 15.5016 13.5802C15.3378 13.5533 15.2793 13.6015 15.3414 13.712C15.4984 13.9913 16.0284 13.9822 16.4624 13.6926C16.6422 13.5726 16.6795 13.5726 16.8771 13.6942C17.3218 13.9679 17.7674 13.9876 17.9605 13.7421C18.0835 13.5858 18.0346 13.5608 17.6512 13.5841C17.2466 13.6087 17.1548 13.5754 16.896 13.3104C16.6827 13.0921 16.6172 13.094 16.4063 13.3243Z" fill="white"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_189_16">
-<rect width="157" height="27" fill="white" transform="translate(0 0.5)"/>
-</clipPath>
-</defs>
 </svg>
--- a/clash-verge-rev/src/assets/image/logo_dark.svg
+++ b/clash-verge-rev/src/assets/image/logo_dark.svg
@@ -1,20 +0,0 @@
-<svg width="157" height="27" viewBox="0 0 157 27" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_745_54)">
-<path d="M155.711 21.42C155.205 21.7266 154.611 21.9533 153.931 22.1C153.265 22.2466 152.618 22.32 151.991 22.32C149.858 22.32 148.238 21.8133 147.131 20.8C146.038 19.7866 145.491 18.3667 145.491 16.54C145.491 14.7267 145.978 13.34 146.951 12.38C147.938 11.4066 149.278 10.92 150.971 10.92C152.651 10.92 153.978 11.4066 154.951 12.38C155.938 13.34 156.431 14.7267 156.431 16.54C156.431 16.74 156.418 17.0266 156.391 17.4H148.611C148.905 19.12 150.031 19.98 151.991 19.98C153.365 19.98 154.605 19.5733 155.711 18.76V21.42ZM153.411 15.16C153.238 14.4933 152.938 14 152.511 13.68C152.085 13.36 151.571 13.2 150.971 13.2C150.411 13.2 149.931 13.3666 149.531 13.7C149.145 14.0333 148.871 14.52 148.711 15.16H153.411Z" fill="white"/>
-<path d="M138.386 26.56C137.572 26.56 136.752 26.5067 135.926 26.4C135.112 26.2933 134.379 26.14 133.726 25.94V23.32C135.152 23.64 136.579 23.8 138.006 23.8C138.912 23.8 139.599 23.6 140.066 23.2C140.532 22.8 140.766 22.2467 140.766 21.54C140.032 22.02 139.159 22.26 138.146 22.26C137.159 22.26 136.292 22.02 135.546 21.54C134.799 21.06 134.226 20.4 133.826 19.56C133.426 18.7067 133.226 17.7267 133.226 16.62C133.226 15.5133 133.426 14.5333 133.826 13.68C134.239 12.8133 134.812 12.14 135.546 11.66C136.292 11.18 137.159 10.94 138.146 10.94C139.066 10.94 139.939 11.2467 140.766 11.86V11.2H143.886V21.96C143.886 25.0267 142.052 26.56 138.386 26.56ZM136.286 16.62C136.286 17.2333 136.406 17.7933 136.646 18.3C136.899 18.8067 137.226 19.2133 137.626 19.52C138.039 19.8133 138.472 19.96 138.926 19.96C139.259 19.96 139.632 19.8867 140.046 19.74C140.459 19.58 140.812 19.2533 141.106 18.76L141.206 18.36V14.66C140.926 14.0867 140.566 13.7133 140.126 13.54C139.686 13.3533 139.286 13.26 138.926 13.26C138.472 13.26 138.039 13.4067 137.626 13.7C137.226 13.9933 136.899 14.4 136.646 14.92C136.406 15.4267 136.286 15.9933 136.286 16.62Z" fill="white"/>
-<path d="M129.052 11.2V12.36C129.399 11.9867 129.812 11.7 130.292 11.5C130.786 11.2867 131.272 11.18 131.752 11.18C132.086 11.18 132.399 11.2267 132.692 11.32V13.78C132.319 13.6867 131.966 13.64 131.632 13.64C131.126 13.64 130.646 13.7267 130.192 13.9C129.739 14.06 129.359 14.32 129.052 14.68V22H125.852V11.2H129.052Z" fill="white"/>
-<path d="M123.524 21.42C123.017 21.7266 122.424 21.9533 121.744 22.1C121.077 22.2466 120.43 22.32 119.804 22.32C117.67 22.32 116.05 21.8133 114.944 20.8C113.85 19.7866 113.304 18.3667 113.304 16.54C113.304 14.7267 113.79 13.34 114.764 12.38C115.75 11.4066 117.09 10.92 118.784 10.92C120.464 10.92 121.79 11.4066 122.764 12.38C123.75 13.34 124.244 14.7267 124.244 16.54C124.244 16.74 124.23 17.0266 124.204 17.4H116.424C116.717 19.12 117.844 19.98 119.804 19.98C121.177 19.98 122.417 19.5733 123.524 18.76V21.42ZM121.224 15.16C121.05 14.4933 120.75 14 120.324 13.68C119.897 13.36 119.384 13.2 118.784 13.2C118.224 13.2 117.744 13.3666 117.344 13.7C116.957 14.0333 116.684 14.52 116.524 15.16H121.224Z" fill="white"/>
-<path d="M99.3491 8H102.929L106.289 19.78H106.369L109.729 8H113.309L108.989 22H103.669L99.3491 8Z" fill="white"/>
-<path d="M86.2201 6.62V12.36C86.7001 11.96 87.2335 11.6533 87.8201 11.44C88.4068 11.2133 89.0001 11.1 89.6001 11.1C90.6268 11.1 91.4401 11.4 92.0401 12C92.6535 12.6 92.9601 13.38 92.9601 14.34V22H89.7601V14.88C89.7601 14.4933 89.6001 14.18 89.2801 13.94C88.9601 13.6867 88.5801 13.56 88.1401 13.56C87.8868 13.56 87.5735 13.64 87.2001 13.8C86.8268 13.96 86.5001 14.16 86.2201 14.4V22H83.0201V6.62H86.2201Z" fill="white"/>
-<path d="M77.7898 22.24C76.9765 22.28 76.1498 22.2133 75.3098 22.04C74.4832 21.88 73.7632 21.6267 73.1498 21.28V18.4C73.6965 18.8 74.3498 19.1333 75.1098 19.4C75.8832 19.6533 76.5632 19.76 77.1498 19.72C77.5632 19.6933 77.8632 19.6067 78.0498 19.46C78.2365 19.3 78.3432 19.14 78.3698 18.98C78.4365 18.5667 78.3365 18.2533 78.0698 18.04C77.8032 17.8267 77.3032 17.62 76.5698 17.42C75.7565 17.1933 75.1098 16.9333 74.6298 16.64C74.1498 16.3333 73.7832 15.9933 73.5298 15.62C73.2898 15.2333 73.1698 14.7467 73.1698 14.16C73.1698 13.5467 73.3298 13 73.6498 12.52C73.9698 12.0267 74.4765 11.64 75.1698 11.36C75.8632 11.08 76.6098 10.94 77.4098 10.94C78.0098 10.94 78.6165 11 79.2298 11.12C79.8432 11.2267 80.3565 11.3733 80.7698 11.56V14.14C80.3432 13.9267 79.8365 13.74 79.2498 13.58C78.6765 13.4067 78.1765 13.32 77.7498 13.32C76.8432 13.32 76.3498 13.56 76.2698 14.04C76.2298 14.32 76.3565 14.5667 76.6498 14.78C76.9565 14.9933 77.3898 15.1867 77.9498 15.36C78.7498 15.6133 79.4032 15.8733 79.9098 16.14C80.4298 16.4067 80.8365 16.7533 81.1298 17.18C81.4232 17.6067 81.5698 18.1533 81.5698 18.82C81.5698 19.8067 81.2165 20.6133 80.5098 21.24C79.8032 21.8533 78.8965 22.1867 77.7898 22.24Z" fill="white"/>
-<path d="M65.667 22.26C64.6537 22.26 63.767 22.02 63.007 21.54C62.2603 21.06 61.6803 20.4 61.267 19.56C60.867 18.72 60.667 17.74 60.667 16.62C60.667 15.5133 60.867 14.5333 61.267 13.68C61.6803 12.8133 62.2537 12.14 62.987 11.66C63.7337 11.18 64.6003 10.94 65.587 10.94C66.0403 10.94 66.4937 11.0267 66.947 11.2C67.4137 11.36 67.847 11.5867 68.247 11.88V11.2H71.447V19.48C71.447 20.56 71.5803 21.4 71.847 22H68.847C68.7537 21.8133 68.6737 21.5733 68.607 21.28C67.7803 21.9333 66.8003 22.26 65.667 22.26ZM63.727 16.62C63.727 17.2333 63.847 17.7933 64.087 18.3C64.3403 18.8067 64.667 19.2133 65.067 19.52C65.4803 19.8133 65.9137 19.96 66.367 19.96C66.687 19.96 67.047 19.8933 67.447 19.76C67.847 19.6133 68.1937 19.3067 68.487 18.84V14.36C68.1937 13.8933 67.847 13.5933 67.447 13.46C67.0603 13.3267 66.7003 13.26 66.367 13.26C65.9137 13.26 65.4803 13.4067 65.067 13.7C64.667 13.9933 64.3403 14.4 64.087 14.92C63.847 15.4267 63.727 15.9933 63.727 16.62Z" fill="white"/>
-<path d="M58.3398 22.16C57.1398 22.16 56.2332 21.8267 55.6198 21.16C55.0065 20.48 54.6998 19.4867 54.6998 18.18V6.62H57.8998V17.38C57.8998 17.9133 57.9398 18.32 58.0198 18.6C58.0998 18.88 58.2332 19.0933 58.4198 19.24C58.5665 19.36 58.7265 19.44 58.8998 19.48C59.0865 19.5067 59.4065 19.52 59.8598 19.52V22.16H58.3398Z" fill="white"/>
-<path d="M48.6679 22.26C47.1479 22.26 45.7946 21.98 44.6079 21.42C43.4346 20.86 42.5079 20.0467 41.8279 18.98C41.1613 17.9133 40.8279 16.6467 40.8279 15.18C40.8279 13.6333 41.1546 12.3067 41.8079 11.2C42.4613 10.08 43.3746 9.22666 44.5479 8.63999C45.7213 8.03999 47.0613 7.73999 48.5679 7.73999C49.3146 7.73999 50.0679 7.81332 50.8279 7.95999C51.5879 8.10666 52.2146 8.29332 52.7079 8.51999V11C51.3613 10.5067 50.1079 10.26 48.9479 10.26C47.5613 10.26 46.4346 10.6667 45.5679 11.48C44.7146 12.2933 44.2879 13.5267 44.2879 15.18C44.2879 16.06 44.5013 16.84 44.9279 17.52C45.3546 18.1867 45.9146 18.7067 46.6079 19.08C47.3013 19.4533 48.0479 19.6667 48.8479 19.72L49.2879 19.74C49.9013 19.74 50.5079 19.6533 51.1079 19.48C51.7079 19.3067 52.2413 19.0733 52.7079 18.78V21.54C52.1346 21.8067 51.5213 21.9933 50.8679 22.1C50.2279 22.2067 49.4946 22.26 48.6679 22.26Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.45822 0.177484C9.3398 0.203426 9.17301 0.423458 9.0706 0.689049C8.96051 0.974498 8.87876 1.35323 8.58394 2.94325C8.54639 3.14583 8.48153 3.48453 8.43973 3.69591C8.36951 4.05118 8.29961 4.42366 8.18135 5.07311C8.15565 5.21403 8.12018 5.4014 8.10248 5.48947C8.06741 5.66362 8.06981 5.64953 7.88181 6.77059C7.7408 7.61148 7.68251 7.97284 7.60541 8.48408C7.57754 8.66904 7.53446 8.95009 7.50972 9.10863C7.41844 9.69289 7.36336 10.1506 7.38089 10.179C7.39082 10.195 7.38433 10.2129 7.36648 10.2189C7.34862 10.2248 7.75498 10.2254 8.26943 10.2202C9.32979 10.2095 9.26581 10.2279 9.31682 9.91885C9.83575 6.77691 14.3593 6.72095 14.9424 9.84927C14.9716 10.0056 15.0102 10.1515 15.0283 10.1736C15.0794 10.2361 18.3935 10.2314 18.4455 10.1687C18.4659 10.1441 18.4972 10.0324 18.515 9.92053C19.0191 6.75049 23.6398 6.73912 24.1507 9.90668C24.2031 10.2313 24.1695 10.2178 24.8987 10.2069C25.2439 10.2017 25.5312 10.2048 25.5371 10.2136C25.543 10.2224 25.5427 10.2097 25.5365 10.1854C25.5302 10.1611 25.5038 10.0062 25.4777 9.8411C25.4516 9.67608 25.4086 9.40769 25.3822 9.24475C25.3151 8.8311 25.247 8.40906 25.2079 8.1638C25.1896 8.0493 25.1601 7.87635 25.1423 7.77947C25.1244 7.68258 25.0157 7.02681 24.9006 6.3222C24.3635 3.03493 24.3419 2.92372 23.8725 1.02158C23.6976 0.313202 23.5903 0.155544 23.2844 0.157706C23.0543 0.159308 22.6641 0.46069 22.3732 0.86144C22.2201 1.07218 20.9436 3.3203 20.5748 4.02844C20.3371 4.48492 20.3095 4.49573 19.6652 4.38467C17.5159 4.01411 15.5699 4.01459 13.6502 4.38611C13.0409 4.50405 13.1305 4.56034 12.6174 3.73642C10.7197 0.689049 10.1342 0.0294346 9.45822 0.177484ZM11.7925 7.78003C9.87787 8.04514 8.89445 10.2711 10.0046 11.8269C11.2533 13.5767 13.9085 13.1821 14.6101 11.1424C15.2133 9.38887 13.6496 7.52292 11.7925 7.78003ZM20.9824 7.78027C18.8789 8.07092 17.9941 10.6556 19.4855 12.153C21.1704 13.8446 24.0109 12.6217 23.916 10.2456C23.855 8.71813 22.491 7.57185 20.9824 7.78027ZM12.6191 9.304C13.0588 9.50425 13.3191 9.95048 13.2838 10.4437C13.2016 11.5928 11.6167 11.8967 11.1069 10.8611C10.63 9.89243 11.6361 8.85641 12.6191 9.304ZM21.8746 9.28454C22.4026 9.55109 22.6828 10.2103 22.4872 10.726C22.0376 11.9115 20.3053 11.7117 20.1885 10.4608C20.1076 9.59441 21.1072 8.89708 21.8746 9.28454ZM7.30242 10.5026C7.30242 10.5597 7.28152 10.7449 7.25606 10.9144C7.20097 11.2804 7.01153 12.6933 6.86908 13.8007C6.84298 14.0033 6.80695 14.2699 6.78885 14.3932C6.77084 14.5165 6.74121 14.7471 6.72304 14.9057C6.70486 15.0642 6.66891 15.3669 6.64305 15.5783C6.55665 16.285 6.41941 17.457 6.35792 18.0124C6.31492 18.4007 6.2881 18.6354 6.16439 19.7099C6.10546 20.2213 6.03772 20.8373 5.9707 21.4714C5.94284 21.7356 5.90833 22.0599 5.89423 22.192C5.88006 22.3241 5.8502 22.6268 5.82786 22.8646C5.80544 23.1024 5.77861 23.3068 5.76813 23.3189C5.74114 23.35 4.77526 23.1715 4.32607 23.0525C2.77592 22.6414 2.08956 21.1632 2.85254 19.8789C3.04479 19.5552 3.32416 19.2925 3.98713 18.8116C4.65059 18.3303 4.74515 18.2243 4.76501 17.9405C4.80176 17.4147 4.05775 17.1693 3.24697 17.4396C-0.490531 18.6861 -0.311735 23.9878 3.5076 25.1667C4.04687 25.3332 4.64811 25.43 5.42559 25.4754C5.79791 25.4972 6.02147 25.5343 6.58027 25.667C7.11202 25.7933 8.02425 25.8452 12.4909 26.0032C13.67 26.0448 20.4332 26.0451 21.4395 26.0034C21.8641 25.9859 22.5717 25.9569 23.0121 25.9391C24.2493 25.889 26.1475 25.7583 26.6793 25.6866C27.4684 25.5803 27.5352 25.4081 27.371 23.9055C27.3441 23.6589 27.2997 23.2409 27.2724 22.9767C27.2451 22.7125 27.2005 22.2873 27.1733 22.0319C27.1461 21.7765 27.1036 21.3729 27.0788 21.1351C26.9853 20.2378 26.8755 19.2583 26.7932 18.5889C26.6717 17.6008 26.6343 17.3259 26.4558 16.1067C26.4003 15.728 26.3417 15.3244 26.3255 15.2099C26.3093 15.0954 26.2814 14.9153 26.2636 14.8096C26.2457 14.7039 26.1585 14.1418 26.0697 13.5605C25.9809 12.9792 25.8725 12.2802 25.8288 12.0072C25.7851 11.7341 25.7285 11.381 25.703 11.2225C25.6776 11.0639 25.6386 10.815 25.6164 10.6693C25.583 10.4502 25.5675 10.4086 25.5271 10.4286C25.5003 10.4419 25.2044 10.4601 24.8697 10.4693C24.1707 10.4883 24.1939 10.4806 24.1659 10.702C23.9784 12.1853 22.6627 13.2699 21.1569 13.1825C19.8215 13.1049 18.6989 12.0764 18.5124 10.7597C18.4682 10.4478 18.6032 10.4698 16.7346 10.4698C14.8693 10.4698 15.0077 10.4469 14.9582 10.7632C14.4638 13.9187 9.89316 13.9872 9.33291 10.8475C9.26285 10.4552 9.35117 10.4881 8.31779 10.4698C7.82095 10.461 7.3893 10.4415 7.35847 10.4263C7.31099 10.4031 7.30242 10.4147 7.30242 10.5026ZM16.896 12.8104C17.1548 13.0754 17.2466 13.1087 17.6512 13.0841C18.0347 13.0608 18.0835 13.0858 17.9605 13.2421C17.7675 13.4876 17.3218 13.4679 16.8771 13.1942C16.6796 13.0726 16.6422 13.0726 16.4624 13.1926C16.0284 13.4822 15.4984 13.4913 15.3414 13.212C15.2793 13.1015 15.3378 13.0533 15.5016 13.0802C15.9854 13.1596 16.139 13.1161 16.4064 12.8243C16.6173 12.594 16.6828 12.5921 16.896 12.8104Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_745_54">
-<rect width="157" height="27" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/clash-verge-rev/src/components/setting/mods/clash-core-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/clash-core-viewer.tsx
@@ -52,7 +52,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
        mutate("getClashConfig");
        mutate("getVersion");
      }, 100);
-      Notice.success(`Successfully switch to ${core}`, 1000);
+      Notice.success(t("Switched to _clash Core", { core: `${core}` }), 1000);
    } catch (err: any) {
      Notice.error(err?.message || err.toString());
    }
@@ -63,7 +63,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
      await grantPermission(core);
      // 自动重启
      if (core === clash_core) await restartSidecar();
-      Notice.success(`Successfully grant permission to ${core}`, 1000);
+      Notice.success(t("Permissions Granted Successfully for _clash Core", { core: `${core}` }), 1000);
    } catch (err: any) {
      Notice.error(err?.message || err.toString());
    }
@@ -72,7 +72,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
  const onRestart = useLockFn(async () => {
    try {
      await restartSidecar();
-      Notice.success(`Successfully restart core`, 1000);
+      Notice.success(t(`Clash Core Restarted`), 1000);
    } catch (err: any) {
      Notice.error(err?.message || err.toString());
    }
@@ -83,7 +83,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
      setUpgrading(true);
      await upgradeCore();
      setUpgrading(false);
-      Notice.success(`Successfully upgrade core`, 1000);
+      Notice.success(t(`Core Version Updated`), 1000);
    } catch (err: any) {
      setUpgrading(false);
      Notice.error(err?.response.data.message || err.toString());
--- a/clash-verge-rev/src/components/setting/mods/clash-port-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/clash-port-viewer.tsx
@@ -79,18 +79,18 @@ export const ClashPortViewer = forwardRef<DialogRef>((props, ref) => {
      OS === "linux" &&
      new Set([redirPort, tproxyPort, mixedPort, socksPort, port]).size !== 5
    ) {
-      Notice.error("Port conflict!", 4000);
+      Notice.error(t("Port Conflict"), 4000);
      return;
    }
    if (
      OS === "macos" &&
      new Set([redirPort, mixedPort, socksPort, port]).size !== 4
    ) {
-      Notice.error("Port conflict!", 4000);
+      Notice.error(t("Port Conflict"), 4000);
      return;
    }
    if (OS === "windows" && new Set([mixedPort, socksPort, port]).size !== 3) {
-      Notice.error("Port conflict!", 4000);
+      Notice.error(t("Port Conflict"), 4000);
      return;
    }
    try {
@@ -113,7 +113,7 @@ export const ClashPortViewer = forwardRef<DialogRef>((props, ref) => {
      await patchVerge({ verge_socks_enabled: socksEnabled });
      await patchVerge({ verge_http_enabled: httpEnabled });
      setOpen(false);
-      Notice.success("Change Clash port successfully!", 1000);
+      Notice.success(t("Clash Port Modified"), 1000);
    } catch (err: any) {
      Notice.error(err.message || err.toString(), 4000);
    }
--- a/clash-verge-rev/src/components/setting/mods/controller-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/controller-viewer.tsx
@@ -26,7 +26,7 @@ export const ControllerViewer = forwardRef<DialogRef>((props, ref) => {
  const onSave = useLockFn(async () => {
    try {
      await patchInfo({ "external-controller": controller, secret });
-      Notice.success("Change Clash Config successfully!", 1000);
+      Notice.success(t("External Controller Address Modified"), 1000);
      setOpen(false);
    } catch (err: any) {
      Notice.error(err.message || err.toString(), 4000);
--- a/clash-verge-rev/src/components/setting/mods/service-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/service-viewer.tsx
@@ -43,7 +43,7 @@ export const ServiceViewer = forwardRef<DialogRef, Props>((props, ref) => {
      await installService();
      mutateCheck();
      setOpen(false);
-      Notice.success("Service installed successfully");
+      Notice.success(t("Service Installed Successfully"));
    } catch (err: any) {
      mutateCheck();
      Notice.error(err.message || err.toString());
@@ -59,7 +59,7 @@ export const ServiceViewer = forwardRef<DialogRef, Props>((props, ref) => {
      await uninstallService();
      mutateCheck();
      setOpen(false);
-      Notice.success("Service uninstalled successfully");
+      Notice.success(t("Service Uninstalled Successfully"));
    } catch (err: any) {
      mutateCheck();
      Notice.error(err.message || err.toString());
--- a/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx
@@ -53,7 +53,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {

  const onSave = useLockFn(async () => {
    if (value.duration < 1) {
-      Notice.error("Proxy guard duration at least 1 seconds");
+      Notice.error(t("Proxy Daemon Duration Cannot be Less than 1 Second"));
      return;
    }

--- a/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx
@@ -68,7 +68,7 @@ export const TunViewer = forwardRef<DialogRef>((props, ref) => {
      );
      try {
        await enhanceProfiles();
-        Notice.success("Refresh clash config", 1000);
+        Notice.success(t("Settings Applied"), 1000);
      } catch (err: any) {
        Notice.error(err.message || err.toString(), 3000);
      }
--- a/clash-verge-rev/src/components/setting/setting-clash.tsx
+++ b/clash-verge-rev/src/components/setting/setting-clash.tsx
@@ -54,7 +54,7 @@ const SettingClash = ({ onError }: Props) => {
  const onUpdateGeo = useLockFn(async () => {
    try {
      await updateGeoData();
-      Notice.success("Start update geodata");
+      Notice.success(t("GeoData Updated"));
    } catch (err: any) {
      Notice.error(err?.response.data.message || err.toString());
    }
@@ -120,7 +120,7 @@ const SettingClash = ({ onError }: Props) => {
              color={enable_random_port ? "primary" : "inherit"}
              size="small"
              onClick={() => {
-                Notice.success(t("After restart to take effect"), 1000);
+                Notice.success(t("Restart Application to Apply Modifications"), 1000);
                onChangeVerge({ enable_random_port: !enable_random_port });
                patchVerge({ enable_random_port: !enable_random_port });
              }}
--- a/clash-verge-rev/src/components/setting/setting-verge.tsx
+++ b/clash-verge-rev/src/components/setting/setting-verge.tsx
@@ -67,7 +67,7 @@ const SettingVerge = ({ onError }: Props) => {
    try {
      const info = await checkUpdate();
      if (!info?.shouldUpdate) {
-        Notice.success("No Updates Available");
+        Notice.success(t("Currently on the Latest Version"));
      } else {
        updateRef.current?.open();
      }
--- a/clash-verge-rev/src/locales/en.json
+++ b/clash-verge-rev/src/locales/en.json
@@ -85,7 +85,7 @@
  "Log Level": "Log Level",
  "Port Config": "Port Config",
  "Random Port": "Random Port",
-  "After restart to take effect": "After restart to take effect",
+  "Restart Application to Apply Modifications": "Restart Application to Apply Modifications",
  "External": "External",
  "External Controller": "External Controller",
  "Core Secret": "Core Secret",
@@ -200,5 +200,24 @@
  "System and Mixed Can Only be Used in Service Mode": "System and Mixed Can Only be Used in Service Mode",
  "Information: Please make sure that the Clash Verge Service is installed and enabled": "Information: Please make sure that the Clash Verge Service is installed and enabled",

-  "Use Regular Expression": "Use Regular Expression"
+  "Use Regular Expression": "Use Regular Expression",
+
+  "External Controller Address Modified": "External Controller Address Modified",
+  "Clash Port Modified": "Clash Port Modified",
+  "Currently on the Latest Version": "Currently on the Latest Version",
+  "Only YAML Files Supported": "Only YAML Files Supported",
+  "Port Conflict": "Port Conflict",
+  "Proxy Daemon Duration Cannot be Less than 1 Second": "Proxy Daemon Duration Cannot be Less than 1 Second",
+  "Profile Switched": "Profile Switched",
+  "Profile Reactivated": "Profile Reactivated",
+  "Clash Config Updated": "Clash Config Updated",
+  "Settings Applied": "Settings Applied",
+  "Service Installed Successfully": "Service Installed Successfully",
+  "Service Uninstalled Successfully": "Service Uninstalled Successfully",
+  "GeoData Updated": "GeoData Updated",
+  "Permissions Granted Successfully for _clash Core": "Permissions Granted Successfully for {{core}} Core",
+  "Profile Imported Successfully": "Profile Imported Successfully",
+  "Clash Core Restarted": "Clash Core Restarted",
+  "Switched to _clash Core": "Switched to {{core}} Core",
+  "Core Version Updated": "Core Version Updated"
 }
--- a/clash-verge-rev/src/locales/ru.json
+++ b/clash-verge-rev/src/locales/ru.json
@@ -85,12 +85,12 @@
  "Log Level": "Уровень логов",
  "Port Config": "Настройка порта",
  "Random Port": "Случайный порт",
-  "After restart to take effect": "Чтобы изменения вступили в силу, необходимо перезапустить приложение",
+  "Restart Application to Apply Modifications": "Чтобы изменения вступили в силу, необходимо перезапустить приложение",
  "External": "Внешний",
  "External Controller": "Адрес прослушивания внешнего контроллера",
  "Core Secret": "Секрет",
  "Recommended": "Рекомендуется",
-  "Clash Core": "Ядро Clash",
+  "Clash Core": "Ядра Clash",
  "Grant": "Предоставить",
  "Tun mode requires": "Требуется Режим туннеля",
  "Tun Mode": "Режим туннеля",
@@ -115,10 +115,10 @@
  "Startup Script": "Скрипт запуска",
  "Browse": "Просмотреть",
  "Show Main Window": "Показать главное окно",
-  "Theme Setting": "Настройка темы",
-  "Layout Setting": "Настройка раскладки",
-  "Miscellaneous": "Настройка различные",
-  "Hotkey Setting": "Настройка клавиатурных сокращений",
+  "Theme Setting": "Настройки темы",
+  "Layout Setting": "Настройки раскладки",
+  "Miscellaneous": "Настройки Прочие",
+  "Hotkey Setting": "Настройки клавиатурных сокращений",
  "Traffic Graph": "График трафика",
  "Memory Usage": "Использование памяти",
  "Proxy Group Icon": "Иконка Группы прокси",
@@ -155,7 +155,7 @@
  "Download Speed": "Скорость загрузки",
  "Upload Speed": "Скорость загрузки",

-  "open_or_close_dashboard": "Open/Close Dashboard",
+  "open_or_close_dashboard": "Открыть/Закрыть панель управления",
  "clash_mode_rule": "Режим правил",
  "clash_mode_global": "Глобальный режим",
  "clash_mode_direct": "Прямой режим",
@@ -196,9 +196,28 @@
  "Uninstall": "Удалить",

  "Portable Updater Error": "Портативная версия не поддерживает обновление внутри приложения, пожалуйста, скачайте и замените вручную",
-  "Tun Mode Info": "Режим туннеля требует предоставления разрешений, связанных с ядром. Пожалуйста, включите сервисный режим перед его использованием",
+  "Tun Mode Info": "Режим туннеля требует предоставления разрешений, связанных с ядрам. Пожалуйста, включите сервисный режим перед его использованием",
  "System and Mixed Can Only be Used in Service Mode": "Система и смешанные могут использоваться только в сервисном режиме",
  "Information: Please make sure that the Clash Verge Service is installed and enabled": "Информация: Пожалуйста, убедитесь, что сервис Clash Verge Service установлен и включен",

-  "Use Regular Expression": "Использование регулярных выражений"
+  "Use Regular Expression": "Использование регулярных выражений",
+
+  "External Controller Address Modified": "Изменен адрес внешнего контроллера",
+  "Clash Port Modified": "Clash порт изменен",
+  "Currently on the Latest Version": "В настоящее время используется последняя версия",
+  "Only YAML Files Supported": "Поддерживаются только файлы YAML",
+  "Port Conflict": "Конфликт портов",
+  "Proxy Daemon Duration Cannot be Less than 1 Second": "Продолжительность работы прокси-демона не может быть меньше 1 секунды",
+  "Profile Switched": "Профиль изменен",
+  "Profile Reactivated": "Профиль повторно активирован",
+  "Clash Config Updated": "Clash конфигурация Обновлена",
+  "Settings Applied": "Применены настройки",
+  "Service Installed Successfully": "Служба успешно установлена",
+  "Service Uninstalled Successfully": "Служба успешно удалена",
+  "GeoData Updated": "GeoData Обновлена",
+  "Permissions Granted Successfully for _clash Core": "Разрешения успешно предоставлены для ядра {{core}}",
+  "Profile Imported Successfully": "Профиль успешно импортирован",
+  "Clash Core Restarted": "Clash ядра перезапущено",
+  "Switched to _clash Core": "Переключено на ядра {{core}}",
+  "Core Version Updated": "Обновлена версия ядра"
 }
--- a/clash-verge-rev/src/locales/zh.json
+++ b/clash-verge-rev/src/locales/zh.json
@@ -85,7 +85,7 @@
  "Log Level": "日志等级",
  "Port Config": "端口设置",
  "Random Port": "随机端口",
-  "After restart to take effect": "重启后生效",
+  "Restart Application to Apply Modifications": "重启应用程序以应用修改",
  "External": "外部控制",
  "External Controller": "外部控制器监听地址",
  "Core Secret": "API 访问密钥",
@@ -200,5 +200,24 @@
  "System and Mixed Can Only be Used in Service Mode": "System 和 Mixed 只能在服务模式下使用",
  "Information: Please make sure that the Clash Verge Service is installed and enabled": "提示信息: 请确保 Clash Verge Service 已安装并启用",

-  "Use Regular Expression": "使用正则表达式"
+  "Use Regular Expression": "使用正则表达式",
+
+  "External Controller Address Modified": "外部控制器监听地址已修改",
+  "Clash Port Modified": "Clash 端口已修改",
+  "Currently on the Latest Version": "当前已是最新版本",
+  "Only YAML Files Supported": "仅支持 YAML 文件",
+  "Port Conflict": "端口冲突",
+  "Proxy Daemon Duration Cannot be Less than 1 Second": "代理守护间隔时间不得低于1秒",
+  "Profile Switched": "订阅已切换",
+  "Profile Reactivated": "订阅已激活",
+  "Clash Config Updated": "Clash 配置已更新",
+  "Settings Applied": "设置已应用",
+  "Service Installed Successfully": "已成功安装服务",
+  "Service Uninstalled Successfully": "已成功卸载服务",
+  "GeoData Updated": "已更新 GeoData",
+  "Permissions Granted Successfully for _clash Core": "{{core}} 内核授权成功",
+  "Profile Imported Successfully": "导入订阅成功",
+  "Clash Core Restarted": "已重启 Clash 内核",
+  "Switched to _clash Core": "已切换至 {{core}} 内核",
+  "Core Version Updated": "内核版本已更新"
 }
--- a/clash-verge-rev/src/pages/_layout.tsx
+++ b/clash-verge-rev/src/pages/_layout.tsx
@@ -12,7 +12,8 @@ import { routers } from "./_routers";
 import { getAxios } from "@/services/api";
 import { useVerge } from "@/hooks/use-verge";
 import LogoSvg from "@/assets/image/logo.svg?react";
-import LogoSvg_dark from "@/assets/image/logo_dark.svg?react";
+import iconLight from "@/assets/image/icon_light.png";
+import iconDark from "@/assets/image/icon_dark.png";
 import { atomThemeMode } from "@/services/states";
 import { useRecoilState } from "recoil";
 import { Notice } from "@/components/base";
@@ -72,7 +73,7 @@ const Layout = () => {
      const [status, msg] = payload as [string, string];
      switch (status) {
        case "set_config::ok":
-          Notice.success("Refresh clash config");
+          Notice.success(t("Clash Config Updated"));
          break;
        case "set_config::error":
          Notice.error(msg);
@@ -137,7 +138,26 @@ const Layout = () => {
        >
          <div className="layout__left">
            <div className="the-logo" data-tauri-drag-region="true">
-              {!isDark ? <LogoSvg /> : <LogoSvg_dark />}
+              <div
+                style={{
+                  height: "27px",
+                  display: "flex",
+                  justifyContent: "space-between",
+                }}
+              >
+                <img
+                  src={isDark ? iconDark : iconLight}
+                  style={{
+                    height: "36px",
+                    width: "36px",
+                    marginTop: "-3px",
+                    marginRight: "5px",
+                    marginLeft: "-3px",
+                    display: "flex",
+                  }}
+                />
+                <LogoSvg fill={isDark ? "white" : "black"} />
+              </div>
              {<UpdateButton className="the-newbtn" />}
            </div>

--- a/clash-verge-rev/src/pages/profiles.tsx
+++ b/clash-verge-rev/src/pages/profiles.tsx
@@ -72,7 +72,7 @@ const ProfilePage = () => {
      const fileList = event.payload as string[];
      for (let file of fileList) {
        if (!file.endsWith(".yaml") && !file.endsWith(".yml")) {
-          Notice.error("Only support YAML files.");
+          Notice.error(t("Only YAML Files Supported"));
          continue;
        }
        const item = {
@@ -136,7 +136,7 @@ const ProfilePage = () => {

    try {
      await importProfile(url);
-      Notice.success("Successfully import profile.");
+      Notice.success(t("Profile Imported Successfully"));
      setUrl("");
      setLoading(false);

@@ -179,7 +179,7 @@ const ProfilePage = () => {
      mutateLogs();
      closeAllConnections();
      setTimeout(() => activateSelected(), 2000);
-      Notice.success("Refresh clash config", 1000);
+      Notice.success(t("Profile Switched"), 1000);
    } catch (err: any) {
      Notice.error(err?.message || err.toString(), 4000);
    } finally {
@@ -192,7 +192,7 @@ const ProfilePage = () => {
    try {
      await enhanceProfiles();
      mutateLogs();
-      Notice.success("Refresh clash config", 1000);
+      Notice.success(t("Profile Reactivated"), 1000);
    } catch (err: any) {
      Notice.error(err.message || err.toString(), 3000);
    }
--- a/filebrowser/frontend/src/components/prompts/UploadFiles.vue
+++ b/filebrowser/frontend/src/components/prompts/UploadFiles.vue
@@ -117,3 +117,13 @@ export default {
  },
 };
 </script>
+
+<style scoped>
+
+.upload-info{
+  min-width: 19ch; 
+  width:auto;
+  text-align: left; 
+}
+
+</style>
--- a/filebrowser/frontend/src/views/Files.vue
+++ b/filebrowser/frontend/src/views/Files.vue
@@ -45,6 +45,8 @@ import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
 import FileListing from "@/views/files/FileListing.vue";
 import { StatusError } from "@/api/utils";
+import { name } from "../utils/constants";
+
 const Editor = defineAsyncComponent(() => import("@/views/files/Editor.vue"));
 const Preview = defineAsyncComponent(() => import("@/views/files/Preview.vue"));

@@ -148,7 +150,8 @@ const fetchData = async () => {
    }

    fileStore.updateRequest(res);
-    document.title = `${res.name} - ${document.title}`;
+    document.title = `${res.name} - ${t("files.files")} - ${name}`;
+    
  } catch (err) {
    if (err instanceof Error) {
      error.value = err;
--- a/hysteria/app/internal/proxymux/internal/mocks/mock_Conn.go
+++ b/hysteria/app/internal/proxymux/internal/mocks/mock_Conn.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.42.2. DO NOT EDIT.
+// Code generated by mockery v2.43.0. DO NOT EDIT.

 package mocks

--- a/hysteria/app/internal/proxymux/internal/mocks/mock_Listener.go
+++ b/hysteria/app/internal/proxymux/internal/mocks/mock_Listener.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.42.2. DO NOT EDIT.
+// Code generated by mockery v2.43.0. DO NOT EDIT.

 package mocks

--- a/hysteria/core/client/mock_udpIO.go
+++ b/hysteria/core/client/mock_udpIO.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.32.0. DO NOT EDIT.
+// Code generated by mockery v2.43.0. DO NOT EDIT.

 package client

@@ -24,6 +24,10 @@ func (_m *mockUDPIO) EXPECT() *mockUDPIO_Expecter {
 func (_m *mockUDPIO) ReceiveMessage() (*protocol.UDPMessage, error) {
 	ret := _m.Called()

+	if len(ret) == 0 {
+		panic("no return value specified for ReceiveMessage")
+	}
+
 	var r0 *protocol.UDPMessage
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*protocol.UDPMessage, error)); ok {
@@ -77,6 +81,10 @@ func (_c *mockUDPIO_ReceiveMessage_Call) RunAndReturn(run func() (*protocol.UDPM
 func (_m *mockUDPIO) SendMessage(_a0 []byte, _a1 *protocol.UDPMessage) error {
 	ret := _m.Called(_a0, _a1)

+	if len(ret) == 0 {
+		panic("no return value specified for SendMessage")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]byte, *protocol.UDPMessage) error); ok {
 		r0 = rf(_a0, _a1)
--- a/Show More
+++ b/Show More