diff --git a/src/ListeningTask/GroupMessageTask.cs b/src/ListeningTask/GroupMessageTask.cs
index dd6d38f..6735da7 100644
--- a/src/ListeningTask/GroupMessageTask.cs
+++ b/src/ListeningTask/GroupMessageTask.cs
@@ -165,111 +165,14 @@ namespace Milimoe.RainBOT.ListeningTask
                 }
 
                 // 发音频API
-                if (e.detail.Contains("kun", StringComparison.CurrentCultureIgnoreCase))
+                var match_music = Music.MusicList.Keys.Where(s => e.detail.Contains(s, StringComparison.CurrentCultureIgnoreCase));
+                if (match_music.Any())
                 {
                     TaskUtility.NewTask(async () =>
                     {
                         if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
                         GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["ikun"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("csgo", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["懂CSGO"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("架不住") || e.detail.Contains("打不死") || e.detail.Contains("不玩了"))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["令人沮丧的游戏"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                }
-                if (e.detail.Contains("man", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["man"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("马云", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["马云"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("电锯", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["电锯"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("疤王", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["疤王"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("终极", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["终极"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("高考", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList["高考"]));
-                        await Bot.SendGroupMessage(e.group_id, "Record", content);
-                    });
-                    return;
-                }
-                if (e.detail.Contains("音乐", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    TaskUtility.NewTask(async () =>
-                    {
-                        if (!await Bot.CheckBlackList(true, e.user_id, e.group_id)) return;
-                        GroupMessageContent content = new(e.group_id);
-                        content.message.Add(new RecordMessage(Music.MusicList[Music.MusicList.Keys.ToArray()[new Random().Next(Music.MusicList.Count)]]));
+                        content.message.Add(new RecordMessage(Music.MusicList[match_music.First()]));
                         await Bot.SendGroupMessage(e.group_id, "Record", content);
                     });
                     return;
diff --git a/src/Settings/Music.cs b/src/Settings/Music.cs
index a5f6745..48215a1 100644
--- a/src/Settings/Music.cs
+++ b/src/Settings/Music.cs
@@ -2,24 +2,14 @@
 {
     public class Music
     {
-        /// <summary>
-        /// 目前支持的语音包：<para/>
-        /// ikun<para/>
-        /// 懂CSGO<para/>
-        /// 令人沮丧的游戏<para/>
-        /// man<para/>
-        /// 马云<para/>
-        /// 疤王<para/>
-        /// 电锯<para/>
-        /// 终极<para/>
-        /// 高考<para/>
-        /// </summary>
         public static Dictionary<string, string> MusicList { get; set; } = [];
 
         public static void InitMusicList()
         {
-            MusicList.Add("ikun", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\ikun.mp3");
-            MusicList.Add("懂CSGO", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\懂CSGO.mp3");
+            MusicList.Add("kun", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\ikun.mp3");
+            MusicList.Add("csgo", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\懂CSGO.mp3");
+            MusicList.Add("架不住", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\令人沮丧的游戏.mp3");
+            MusicList.Add("不玩了", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\令人沮丧的游戏.mp3");
             MusicList.Add("令人沮丧的游戏", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\令人沮丧的游戏.mp3");
             MusicList.Add("man", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\man.mp3");
             MusicList.Add("马云", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\马云.mp3");
@@ -27,6 +17,40 @@
             MusicList.Add("电锯", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\电锯.mp3");
             MusicList.Add("终极", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\终极.mp3");
             MusicList.Add("高考", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\高考.mp3");
+            MusicList.Add("8位", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\8位.mp3");
+            MusicList.Add("8bit", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\8位.mp3");
+            MusicList.Add("躺平青年", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\躺平青年.mp3");
+            MusicList.Add("有为青年", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\有为青年.mp3");
+            MusicList.Add("年少有为", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\有为青年.mp3");
+            MusicList.Add("花脸", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\花脸.mp3");
+            MusicList.Add("爱莉克斯", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\爱莉克斯.mp3");
+            MusicList.Add("alyx", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\爱莉克斯.mp3");
+            MusicList.Add("巴克拉姆", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\巴克拉姆.mp3");
+            MusicList.Add("尘归尘", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\尘归尘.mp3");
+            MusicList.Add("好好干", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\好好干.mp3");
+            MusicList.Add("好好活", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\好好干.mp3");
+            MusicList.Add("冲击星", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\冲击星.mp3");
+            MusicList.Add("触摸能量", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\触摸能量.mp3");
+            MusicList.Add("非人类", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\非人类.mp3");
+            MusicList.Add("黄色魔法", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\黄色魔法.mp3");
+            MusicList.Add("精彩时刻", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\精彩时刻.mp3");
+            MusicList.Add("巨龙之眼", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\巨龙之眼.mp3");
+            MusicList.Add("绝对统御", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\绝对统御.mp3");
+            MusicList.Add("困兽", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\困兽.mp3");
+            MusicList.Add("理由", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\理由.mp3");
+            MusicList.Add("令人发指", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\令人发指.mp3");
+            MusicList.Add("你急了", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\你急了.mp3");
+            MusicList.Add("枪炮", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\枪炮卷饼卡车.mp3");
+            MusicList.Add("卡车", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\枪炮卷饼卡车.mp3");
+            MusicList.Add("求佛", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\求佛.mp3");
+            MusicList.Add("青山", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\人生何处不青山.mp3");
+            MusicList.Add("如日中天", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\如日中天.mp3");
+            MusicList.Add("通宵达旦", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\通宵达旦.mp3");
+            MusicList.Add("万众瞩目", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\万众瞩目.mp3");
+            MusicList.Add("燥起来", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\燥起来.mp3");
+            MusicList.Add("追溯起源", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\追溯起源.mp3");
+            MusicList.Add("zood", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\zood.mp3");
+            MusicList.Add("igs", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\igotsmoke.mp3");
         }
     }
 }
diff --git a/src/Settings/OSMCore.cs b/src/Settings/OSMCore.cs
index 22395ba..a128935 100644
--- a/src/Settings/OSMCore.cs
+++ b/src/Settings/OSMCore.cs
@@ -4,7 +4,7 @@
     {
         public const string version = "v1.0";
         public const string version2 = "Patch2 Test";
-        public const string time = "Mar. 22nd, 2024";
+        public const string time = "Mar. 25th, 2024";
 
         public static string Info => $"OSM Core {version} {version2}\r\nAuthor: Milimoe\r\nBuilt on {time}\r\nSee: https://github.com/milimoe";
     }