diff --git a/Protobuf/Protobuf.csproj b/Protobuf/Protobuf.csproj
index 9880a97..e6882f0 100644
--- a/Protobuf/Protobuf.csproj
+++ b/Protobuf/Protobuf.csproj
@@ -5,6 +5,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Google.Protobuf" Version="3.25.2" />
+	  <PackageReference Include="Google.Protobuf" Version="3.25.3" />
 	</ItemGroup>
 </Project>
diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json
index 6551a65..3b63cda 100644
--- a/Qwilight/Assets/Language.json
+++ b/Qwilight/Assets/Language.json
@@ -2323,6 +2323,10 @@
     "ko-KR": "노트 파일 목록 탐색 중… ({0})",
     "en-US": "Navigating chart list… ({0})"
   },
+  "NoteFilesBundleText": {
+    "ko-KR": "BMS 폴더",
+    "en-US": "BMS folder"
+  },
   "NoteFilesLevelText": {
     "ko-KR": "동봉 사이트",
     "en-US": "Enclosed Site"
@@ -2807,10 +2811,6 @@
     "ko-KR": "스트레치 화면",
     "en-US": "Stretch screen"
   },
-  "RAMWarning": {
-    "ko-KR": "남은 메모리가 {0} 만큼 부족하여 공격적으로 GC가 수행되므로 게임 성능이 감소됩니다.",
-    "en-US": "Game performance is reduced because GC is aggressively performed due to lack of remaining memory by {0}."
-  },
   "SaltContents": {
     "ko-KR": "BMS 랜덤이나 게임 모드 등에 사용되는 시드입니다.",
     "en-US": "Seed used for BMS random or game mode."
diff --git a/Qwilight/System/AudioSystem/AudioNote.cs b/Qwilight/System/AudioSystem/AudioNote.cs
index 74ab11a..2b3ba9f 100644
--- a/Qwilight/System/AudioSystem/AudioNote.cs
+++ b/Qwilight/System/AudioSystem/AudioNote.cs
@@ -11,10 +11,5 @@
         public int Salt { get; init; }
 
         public string BMSID { get; init; }
-
-        public AudioNote()
-        {
-
-        }
     }
 }
diff --git a/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/System/BaseUI/BaseUI.cs
index 2fb4811..6b83e71 100644
--- a/Qwilight/System/BaseUI/BaseUI.cs
+++ b/Qwilight/System/BaseUI/BaseUI.cs
@@ -1607,10 +1607,9 @@
             {
                 if (paintProperty?.DrawingVariety == 11)
                 {
-                    var etc = paintProperty.Etc;
+                    var etc = paintProperty.Etc.Replace("\"", string.Empty);
                     paintProperty.HandledMediaItems = (GetMultipleMediaFilePathsComputer().IsMatch(etc) ? etc.Substring(etc.IndexOf('[') + 1, etc.LastIndexOf(']') - 1).Split(',').Select(text => text.Trim()) : [etc]).Select(mediaFileName =>
                     {
-                        mediaFileName = mediaFileName.Replace("\"", string.Empty);
                         if (handledMediaValues.TryGetValue(mediaFileName, out var handledMediaItem))
                         {
                             return handledMediaItem;
diff --git a/Qwilight/System/Configure/Configure.cs b/Qwilight/System/Configure/Configure.cs
index ef3e6ce..a0415ea 100644
--- a/Qwilight/System/Configure/Configure.cs
+++ b/Qwilight/System/Configure/Configure.cs
@@ -756,7 +756,7 @@
 
         public Version Date { get; set; }
 
-        public long DefaultNoteDate { get; set; }
+        public long DefaultNoteFileDate { get; set; }
 
         public long DefaultUIDate { get; set; }
 
diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
index 9ae2dc4..1170de3 100644
--- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
+++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
@@ -583,6 +583,7 @@
         public string NoteFileBundleText { get; set; }
         public string NoteFileLevelText { get; set; }
         public string NoteFileModeSituationContents { get; set; }
+        public string NoteFilesBundleText { get; set; }
         public string NoteFilesLevelText { get; set; }
         public string NoteFormat { get; set; }
         public string NoteFormatIDText65001 { get; set; }
@@ -704,7 +705,6 @@
         public string QwilightBundleText { get; set; }
         public string QwilightFillContents { get; set; }
         public string QwilightFillText { get; set; }
-        public string RAMWarning { get; set; }
         public string SaltContents { get; set; }
         public string SaltModeContents { get; set; }
         public string SaveAsBundle { get; set; }
diff --git a/Qwilight/System/TwilightSystem.cs b/Qwilight/System/TwilightSystem.cs
index f18d65b..e99ce67 100644
--- a/Qwilight/System/TwilightSystem.cs
+++ b/Qwilight/System/TwilightSystem.cs
@@ -279,7 +279,7 @@
                                             });
                                         }
                                     }
-                                    _ = GetDefaultNoteDate(Configure.Instance.DefaultNoteDate, Configure.Instance.AutoGetDefaultNote);
+                                    _ = GetDefaultNoteDate(Configure.Instance.DefaultNoteFileDate, Configure.Instance.AutoGetDefaultNote);
                                     _ = GetDefaultUIDate(Configure.Instance.DefaultUIDate, Configure.Instance.AutoGetDefaultUI);
                                     break;
                                 case Event.Types.EventID.UnavailableDate:
@@ -429,7 +429,8 @@
                                         {
                                             ((BundleItem.BundleVariety)bundleDataItem.bundleVariety switch
                                             {
-                                                BundleItem.BundleVariety.Note => noteFileBundleItems,
+                                                BundleItem.BundleVariety.NoteFiles => noteFilesBundleItems,
+                                                BundleItem.BundleVariety.NoteFile => noteFileBundleItems,
                                                 BundleItem.BundleVariety.UI => valueUIBundleItems,
                                                 BundleItem.BundleVariety.Qwilight => qwilightBundleItems,
                                                 BundleItem.BundleVariety.EventNote => eventNoteBundleItems,
@@ -446,12 +447,19 @@
                                                 Variety = (BundleItem.BundleVariety)bundleDataItem.bundleVariety
                                             });
                                         }
+                                        var noteFilesBundleItemCollection = bundleViewModel.NoteFilesBundleItemCollection;
                                         var noteFileBundleItemCollection = bundleViewModel.NoteFileBundleItemCollection;
                                         var valueUIBundleItemCollection = bundleViewModel.UIBundleItemCollection;
                                         var qwilightBundleItemCollection = bundleViewModel.QwilightBundleItemCollection;
                                         var eventNoteBundleItemCollection = bundleViewModel.EventNoteBundleItemCollection;
                                         UIHandler.Instance.HandleParallel(() =>
                                         {
+                                            noteFilesBundleItemCollection.Clear();
+                                            foreach (var noteFilesBundleItem in noteFilesBundleItems)
+                                            {
+                                                noteFilesBundleItem.BundleItemCollection = noteFilesBundleItemCollection;
+                                                noteFilesBundleItemCollection.Add(noteFilesBundleItem);
+                                            }
                                             noteFileBundleItemCollection.Clear();
                                             foreach (var noteFileBundleItem in noteFileBundleItems)
                                             {
@@ -749,6 +757,7 @@
                                                 switch (saveAsBundleVariety)
                                                 {
                                                     case BundleItem.BundleVariety.Net:
+                                                    case BundleItem.BundleVariety.NoteFiles:
                                                         zipFile.AddDirectory(bundleEntryPath);
                                                         zipFile.SaveProgress += OnSavingZipFile;
                                                         zipFile.Save(rms);
@@ -809,7 +818,7 @@
                                                         var eventNoteData = Encoding.UTF8.GetBytes(bundleEntryPath);
                                                         rms.Write(eventNoteData, 0, eventNoteData.Length);
                                                         break;
-                                                    case BundleItem.BundleVariety.Note:
+                                                    case BundleItem.BundleVariety.NoteFile:
                                                         twilightSaveAsBundle.bundleEntryPath = Path.GetDirectoryName(bundleEntryPath)!;
                                                         zipFile.AddFile(bundleEntryPath, string.Empty);
                                                         zipFile.SaveProgress += OnSavingZipFile;
@@ -918,7 +927,7 @@
                                     };
                                     _savingBundleItems[saveBundleID] = savingBundleItem;
                                     UIHandler.Instance.HandleParallel(() => toNotifyViewModel.NotifyItemCollection.Insert(0, savingBundleItem));
-                                    if (saveBundleVariety != BundleItem.BundleVariety.DefaultNotes && saveBundleVariety != BundleItem.BundleVariety.DefaultUI)
+                                    if (saveBundleVariety != BundleItem.BundleVariety.DefaultNoteFiles && saveBundleVariety != BundleItem.BundleVariety.DefaultUI)
                                     {
                                         NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.NotSave, savingBundleItem.Text);
                                     }
@@ -954,12 +963,13 @@
                                                 var dataFlow = savingBundleItem.DataFlow;
                                                 dataFlow.Position = 0;
                                                 var bundleVariety = (BundleItem.BundleVariety)twilightSavedBundle.bundleVariety;
-                                                var isNotDefaultBundle = bundleVariety != BundleItem.BundleVariety.DefaultNotes && bundleVariety != BundleItem.BundleVariety.DefaultUI;
+                                                var isNotDefaultBundle = bundleVariety != BundleItem.BundleVariety.DefaultNoteFiles && bundleVariety != BundleItem.BundleVariety.DefaultUI;
                                                 try
                                                 {
                                                     switch (bundleVariety)
                                                     {
-                                                        case BundleItem.BundleVariety.DefaultNotes:
+                                                        case BundleItem.BundleVariety.NoteFiles:
+                                                        case BundleItem.BundleVariety.DefaultNoteFiles:
                                                         case BundleItem.BundleVariety.Net:
                                                             var bundleEntryPath = Path.Combine(QwilightComponent.BundleEntryPath, twilightSavedBundle.bundleName);
                                                             using (var zipFile = ZipFile.Read(dataFlow))
@@ -1046,7 +1056,7 @@
                                                                 NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Warning, NotifySystem.NotifyConfigure.Default, LanguageSystem.Instance.BeforeEventNoteContents);
                                                             }
                                                             break;
-                                                        case BundleItem.BundleVariety.Note:
+                                                        case BundleItem.BundleVariety.NoteFile:
                                                             var noteID = twilightSavedBundle.etc.Split('/').FirstOrDefault(noteID512s => mainViewModel.NoteID512s.ContainsKey(noteID512s));
                                                             if (noteID != null && mainViewModel.NoteID512s.TryGetValue(noteID, out var noteFile))
                                                             {
@@ -1547,7 +1557,7 @@
             if (twilightWwwDefaultDate.HasValue)
             {
                 var date = twilightWwwDefaultDate.Value.date;
-                Configure.Instance.DefaultNoteDate = date;
+                Configure.Instance.DefaultNoteFileDate = date;
                 if (isSilent)
                 {
                     GetDefaultNote();
diff --git a/Qwilight/UIComponent/BundleItem.cs b/Qwilight/UIComponent/BundleItem.cs
index 4bf7c63..ec65e6e 100644
--- a/Qwilight/UIComponent/BundleItem.cs
+++ b/Qwilight/UIComponent/BundleItem.cs
@@ -11,11 +11,12 @@
         public enum BundleVariety
         {
             DefaultUI = -2,
-            DefaultNotes = -1,
+            DefaultNoteFiles = -1,
+            NoteFiles = 0,
             UI = 1,
             Qwilight = 2,
             EventNote = 3,
-            Note = 4,
+            NoteFile = 4,
             Net = 5
         }
 
diff --git a/Qwilight/View/BundleWindow/BundleView.xaml b/Qwilight/View/BundleWindow/BundleView.xaml
index 5fe054f..2195133 100644
--- a/Qwilight/View/BundleWindow/BundleView.xaml
+++ b/Qwilight/View/BundleWindow/BundleView.xaml
@@ -21,13 +21,18 @@
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{StaticResource StandardInput}" Command="{Binding SaveCommand}" Content="{Binding SaveBundle, Source={StaticResource LanguageSystem}}" />
                                 <Button Style="{StaticResource StandardInput}" Command="{Binding WipeCommand}" Visibility="{Binding BundleValue.IsMe, Source={StaticResource ViewModels}, Converter={StaticResource VisibilityModifier}}" Content="{Binding WipeBundleText, Source={StaticResource LanguageSystem}}" />
-                                <ComboBox Style="{StaticResource StandardItemsInput}" IsEnabled="{Binding BundleValue.IsMe, Source={StaticResource ViewModels}}" SelectedItem="{Binding BundleCompetence, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding BundleCompetence.Paint}" HorizontalAlignment="Left">
+                                <ComboBox Style="{StaticResource StandardItemsInput}" IsEnabled="{Binding BundleValue.IsMe, Source={StaticResource ViewModels}}" SelectedItem="{Binding BundleCompetence, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left">
                                     <ComboBox.Items>
                                         <quic:BundleCompetence Data="{StaticResource BundleCallable}" />
                                         <quic:BundleCompetence Data="{StaticResource BundleAvatar}" />
                                         <quic:BundleCompetence Data="{StaticResource BundleUbuntu}" />
                                         <quic:BundleCompetence Data="{StaticResource BundleVoid}" />
                                     </ComboBox.Items>
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding}" Foreground="{Binding Paint}" />
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
                                 </ComboBox>
                             </StackPanel>
                         </StackPanel>
diff --git a/Qwilight/View/BundleWindow/BundleWindow.xaml b/Qwilight/View/BundleWindow/BundleWindow.xaml
index 07d1de8..71b9d79 100644
--- a/Qwilight/View/BundleWindow/BundleWindow.xaml
+++ b/Qwilight/View/BundleWindow/BundleWindow.xaml
@@ -20,6 +20,9 @@
                     </StackPanel>
                 </StackPanel>
                 <TabControl Style="{StaticResource StandardPageView}" Grid.Row="1" TabStripPlacement="Left">
+                    <TabItem Style="{StaticResource StandardPageItem}" Header="{Binding NoteFilesBundleText, Source={StaticResource LanguageSystem}}">
+                        <view:BundleView BundleItemCollection="{Binding NoteFilesBundleItemCollection}" />
+                    </TabItem>
                     <TabItem Style="{StaticResource StandardPageItem}" Header="{Binding NoteFileBundleText, Source={StaticResource LanguageSystem}}">
                         <view:BundleView BundleItemCollection="{Binding NoteFileBundleItemCollection}" />
                     </TabItem>
diff --git a/Qwilight/View/NoteFileWindow.xaml b/Qwilight/View/NoteFileWindow.xaml
index 0c76435..7ad7d91 100644
--- a/Qwilight/View/NoteFileWindow.xaml
+++ b/Qwilight/View/NoteFileWindow.xaml
@@ -117,7 +117,15 @@
                     </Button>
                     <Button Style="{StaticResource StandardInput}" Content="{Binding NewEventNote, Source={StaticResource LanguageSystem}}" Command="{Binding NewEventNoteCommand}" Visibility="{Binding MainValue.IsNoteFileNotLogical,Source={StaticResource ViewModels}, Converter={StaticResource VisibilityModifier}}" />
                     <Button Style="{StaticResource StandardInput}" Content="{Binding ModifyEventNoteName, Source={StaticResource LanguageSystem}}" Command="{Binding ModifyEventNoteNameCommand}" Visibility="{Binding MainValue.IsEntryItemEventNote, Source={StaticResource ViewModels},Converter={StaticResource VisibilityModifier}}" />
-                    <Button Style="{StaticResource StandardInput}" Content="{Binding SaveAsBundle, Source={StaticResource LanguageSystem}}" Command="{Binding SaveAsBundleCommand}" Visibility="{Binding MainValue.CanSaveAsBundle, Source={StaticResource ViewModels},Converter={StaticResource VisibilityModifier}}" />
+                    <Button Style="{StaticResource StandardInput}" Content="{Binding SaveAsBundle, Source={StaticResource LanguageSystem}}" PreviewMouseDown="OnViewItems" Visibility="{Binding MainValue.CanSaveAsBundle, Source={StaticResource ViewModels},Converter={StaticResource VisibilityModifier}}">
+                        <Button.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Command="{Binding SaveAsNoteFilesBundleCommand}" Header="{Binding NoteFilesBundleText, Source={StaticResource LanguageSystem}}" Visibility="{Binding MainValue.IsEntryItemEventNote, Source={StaticResource ViewModels}, Converter={StaticResource VisibilityNotModifier}}" />
+                                <MenuItem Command="{Binding SaveAsNoteFileBundleCommand}" Header="{Binding NoteFileBundleText, Source={StaticResource LanguageSystem}}" />
+                                <MenuItem Command="{Binding SaveAsEventNoteBundleCommand}" Header="{Binding EventNoteBundleText, Source={StaticResource LanguageSystem}}" Visibility="{Binding MainValue.IsEntryItemEventNote, Source={StaticResource ViewModels}, Converter={StaticResource VisibilityModifier}}" />
+                            </ContextMenu>
+                        </Button.ContextMenu>
+                    </Button>
                     <Button Style="{StaticResource StandardInput}" Content="{Binding NoteFormat, Source={StaticResource LanguageSystem}}" PreviewMouseDown="OnViewItems" Visibility="{Binding MainValue.IsNoteFileNotLogical, Source={StaticResource ViewModels},Converter={StaticResource VisibilityModifier}}">
                         <Button.ContextMenu>
                             <ContextMenu>
diff --git a/Qwilight/ViewModel/BundleViewModel.cs b/Qwilight/ViewModel/BundleViewModel.cs
index 20c1f58..6ef3977 100644
--- a/Qwilight/ViewModel/BundleViewModel.cs
+++ b/Qwilight/ViewModel/BundleViewModel.cs
@@ -9,6 +9,8 @@
     {
         string _targetBundleAvatar = string.Empty;
 
+        public ObservableCollection<BundleItem> NoteFilesBundleItemCollection { get; } = new();
+
         public ObservableCollection<BundleItem> NoteFileBundleItemCollection { get; } = new();
 
         public ObservableCollection<BundleItem> UIBundleItemCollection { get; } = new();
diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs
index f4d0c2f..4591cb7 100644
--- a/Qwilight/ViewModel/MainViewModel.cs
+++ b/Qwilight/ViewModel/MainViewModel.cs
@@ -257,17 +257,6 @@
                 if (value)
                 {
                     var lazyGC = Configure.Instance.LazyGCV2 * 1000L * 1000L;
-                    try
-                    {
-                        var eagerRAM = 0.1 * QwilightComponent.RAM - (1000L * (long)Utility.GetWMI("SELECT FreePhysicalMemory FROM Win32_OperatingSystem").Select(o => (ulong)o["FreePhysicalMemory"]).Single() - lazyGC);
-                        if (eagerRAM > 0.0)
-                        {
-                            NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Warning, NotifySystem.NotifyConfigure.Default, string.Format(LanguageSystem.Instance.RAMWarning, Utility.FormatLength((long)eagerRAM)));
-                        }
-                    }
-                    catch
-                    {
-                    }
                     if (lazyGC > 0L)
                     {
                         try
diff --git a/Qwilight/ViewModel/NoteFileViewModel.cs b/Qwilight/ViewModel/NoteFileViewModel.cs
index 88796cc..18816eb 100644
--- a/Qwilight/ViewModel/NoteFileViewModel.cs
+++ b/Qwilight/ViewModel/NoteFileViewModel.cs
@@ -307,33 +307,43 @@
         }
 
         [RelayCommand]
-        void OnSaveAsBundle()
+        void OnSaveAsNoteFilesBundle()
         {
-            if (string.IsNullOrEmpty(EntryItemValue.EventNoteID))
+            TwilightSystem.Instance.SendParallel(Event.Types.EventID.SaveAsBundle, new
             {
-                TwilightSystem.Instance.SendParallel(Event.Types.EventID.SaveAsBundle, new
-                {
-                    bundleVariety = BundleItem.BundleVariety.Note,
-                    bundleName = EntryItemValue.NoteFile.Title,
-                    bundleEntryPath = EntryItemValue.NoteFile.NoteFilePath,
-                    etc = string.Join('/', EntryItemValue.CompatibleNoteFiles.Select(noteFile => noteFile.GetNoteID512()))
-                });
-            }
-            else
+                bundleVariety = BundleItem.BundleVariety.NoteFiles,
+                bundleName = EntryItemValue.Title,
+                bundleEntryPath = EntryItemValue.EntryPath
+            });
+        }
+
+        [RelayCommand]
+        void OnSaveAsNoteFileBundle()
+        {
+            TwilightSystem.Instance.SendParallel(Event.Types.EventID.SaveAsBundle, new
             {
-                TwilightSystem.Instance.SendParallel(Event.Types.EventID.SaveAsBundle, new
+                bundleVariety = BundleItem.BundleVariety.NoteFile,
+                bundleName = EntryItemValue.NoteFile.Title,
+                bundleEntryPath = EntryItemValue.NoteFile.NoteFilePath,
+                etc = string.Join('/', EntryItemValue.NoteFile.EntryItem.CompatibleNoteFiles.Select(noteFile => noteFile.GetNoteID512()))
+            });
+        }
+
+        [RelayCommand]
+        void OnSaveAsEventNoteBundle()
+        {
+            TwilightSystem.Instance.SendParallel(Event.Types.EventID.SaveAsBundle, new
+            {
+                bundleVariety = BundleItem.BundleVariety.EventNote,
+                bundleName = EntryItemValue.EventNoteName,
+                bundleEntryPath = EntryItemValue.EventNoteID,
+                etc = EntryItemValue.EventNoteVariety switch
                 {
-                    bundleVariety = BundleItem.BundleVariety.EventNote,
-                    bundleName = EntryItemValue.EventNoteName,
-                    bundleEntryPath = EntryItemValue.EventNoteID,
-                    etc = EntryItemValue.EventNoteVariety switch
-                    {
-                        DB.EventNoteVariety.MD5 => "MD5",
-                        DB.EventNoteVariety.Qwilight => "Qwilight",
-                        _ => default
-                    }
-                });
-            }
+                    DB.EventNoteVariety.MD5 => "MD5",
+                    DB.EventNoteVariety.Qwilight => "Qwilight",
+                    _ => default
+                }
+            });
         }
 
         [RelayCommand]
diff --git a/Test/Test.csproj b/Test/Test.csproj
index d0e39a8..658c32b 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -25,12 +25,12 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 		<PackageReference Include="Moq" Version="4.20.70" />
-		<PackageReference Include="xunit" Version="2.6.6" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.1">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>