From 962e87bfb839c573b5795085fc1424217b87ab09 Mon Sep 17 00:00:00 2001
From: Fengming Zhang <andyfushan@126.com>
Date: Thu, 14 May 2026 17:11:31 +0800
Subject: [PATCH 1/8] Added a simple and more easy theme-changing window

---
 OpenUtau/Strings/Strings.axaml                | 12 +++--
 OpenUtau/ViewModels/ThemeEditorViewModel.cs   |  8 ++++
 OpenUtau/Views/EasyThemeEditorWindow.axaml    | 33 +++++++++++++
 OpenUtau/Views/EasyThemeEditorWindow.axaml.cs | 47 +++++++++++++++++++
 OpenUtau/Views/PreferencesDialog.axaml        | 20 ++++++--
 OpenUtau/Views/PreferencesDialog.axaml.cs     |  4 ++
 6 files changed, 118 insertions(+), 6 deletions(-)
 create mode 100644 OpenUtau/Views/EasyThemeEditorWindow.axaml
 create mode 100644 OpenUtau/Views/EasyThemeEditorWindow.axaml.cs

diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 45eb4a17a..bc47dabef 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -149,6 +149,10 @@ Do you want to continue by splitting at the nearest position after current playh
   <system:String x:Key="dialogs.transcribe.game.batchduration">Max Batch Duration (s)</system:String>
   <system:String x:Key="dialogs.transcribe.longchunk.message">One or more audio segments are very long and may consume large amount of memory when transcribing. This usually happens when the audio contains accompaniment. Still proceed?</system:String>
 
+  <system:String x:Key="easythemeeditor.title">Easy Theme Editor</system:String>
+  <system:String x:Key="easythemeeditor.save">Save</system:String>
+  <system:String x:Key="easythemeeditor.cancel">Cancel</system:String>
+
   <system:String x:Key="errors.caption">Error</system:String>
   <system:String x:Key="errors.details">Error Details</system:String>
   <system:String x:Key="errors.diffsinger.downloadvocoder">Error loading vocoder "{0}". Please download vocoder from {1}</system:String>
@@ -573,6 +577,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="prefs.appearance.theme.dark">Dark</system:String>
   <system:String x:Key="prefs.appearance.theme.light">Light</system:String>
   <system:String x:Key="prefs.appearance.customtheme.edit.title">Edit Custom Theme</system:String>
+  <system:String x:Key="prefs.appearance.customtheme.easyedit.title">Edit Custom Theme Colorsets</system:String>
   <system:String x:Key="prefs.appearance.customtheme.delete.title">Delete Custom Theme</system:String>
   <system:String x:Key="prefs.appearance.customtheme.delete.message">Are you sure you want to delete this theme?</system:String>
   <system:String x:Key="prefs.appearance.customtheme.create.title">Create Custom Theme</system:String>
@@ -747,6 +752,10 @@ The voicebank may not work on another OS.</system:String>
   <system:String x:Key="singersetup.textfileencoding.prompt">Choose an encoding that make file contents look right.</system:String>
   <system:String x:Key="singersetup.title">Singer Setup</system:String>
 
+  <system:String x:Key="themeeditor.title">Theme Editor</system:String>
+  <system:String x:Key="themeeditor.save">Save</system:String>
+  <system:String x:Key="themeeditor.cancel">Cancel</system:String>
+
   <system:String x:Key="tip.aliasbox">Override Alias</system:String>
   <system:String x:Key="tip.exps">Numerical,Options Type
     Left Button Draw: Set expressions
@@ -827,7 +836,4 @@ General
   <system:String x:Key="welcome.start">Start</system:String>
   <system:String x:Key="welcome.template">Template</system:String>
 
-  <system:String x:Key="themeeditor.title">Theme Editor</system:String>
-  <system:String x:Key="themeeditor.save">Save</system:String>
-  <system:String x:Key="themeeditor.cancel">Cancel</system:String>
 </ResourceDictionary>
diff --git a/OpenUtau/ViewModels/ThemeEditorViewModel.cs b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
index dd0dc0fd2..9cbca6642 100644
--- a/OpenUtau/ViewModels/ThemeEditorViewModel.cs
+++ b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
@@ -59,6 +59,9 @@ public class ThemeEditorViewModel : ViewModelBase {
         [Reactive] public Color BlackKeyColorRight { get; set; }
         [Reactive] public Color BlackKeyNameColor { get; set; }
 
+        [Reactive] public Color MainColorA { get; set; }
+        [Reactive] public Color MainColorB { get; set; }
+
         public ThemeEditorViewModel(string customThemePath) {
             this.customThemePath = customThemePath;
 
@@ -221,6 +224,11 @@ public ThemeEditorViewModel(string customThemePath) {
 
             this.WhenAnyValue(vm => vm.BlackKeyNameColor)
                 .Subscribe(v => Application.Current!.Resources["BlackKeyNameColor"] = v);
+                
+            this.WhenAnyValue(vm => vm.MainColorA)
+                .Subscribe(v => {
+                    Application.Current!.Resources["BlackKeyNameColor"] = v;
+                });
         }
 
         public void Save() {
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml b/OpenUtau/Views/EasyThemeEditorWindow.axaml
new file mode 100644
index 000000000..37fb271fb
--- /dev/null
+++ b/OpenUtau/Views/EasyThemeEditorWindow.axaml
@@ -0,0 +1,33 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" MinWidth="325" Width="325" Height="500"
+        x:Class="OpenUtau.App.Views.EasyThemeEditorWindow" WindowStartupLocation="CenterOwner"
+        Icon="/Assets/open-utau.ico"
+        Title="{DynamicResource easythemeeditor.title}"
+        Closing="WindowClosing" Topmost="True">
+  <Grid RowDefinitions="*,auto" Margin="0,10,0,10">
+    <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
+      <StackPanel Spacing="5">
+        <Panel>
+          <TextBlock VerticalAlignment="Center" Text="IsDarkMode"/>
+          <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkMode}"/>
+        </Panel>
+        <Separator Margin="0"/>
+        <Panel>
+          <TextBlock VerticalAlignment="Center" Text="MainColorA"/>
+          <ColorPicker Color="{Binding MainColorA}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+        </Panel>
+        <Panel>
+          <TextBlock VerticalAlignment="Center" Text="MainColorB"/>
+          <ColorPicker Color="{Binding MainColorB}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+        </Panel>
+      </StackPanel>
+    </ScrollViewer>
+    <Grid Grid.Row="1" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*" Margin="10,0,10,0">
+      <Button Grid.Column="0" Content="{DynamicResource easythemeeditor.cancel}" HorizontalAlignment="Stretch" Click="OnCancel" />
+      <Button Grid.Column="2" Content="{DynamicResource easythemeeditor.save}" HorizontalAlignment="Stretch" Click="OnSave"/>
+    </Grid>
+  </Grid>
+</Window>
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs b/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs
new file mode 100644
index 000000000..5752e13ca
--- /dev/null
+++ b/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs
@@ -0,0 +1,47 @@
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Interactivity;
+using OpenUtau.App.ViewModels;
+using ReactiveUI;
+
+namespace OpenUtau.App.Views {
+    public partial class EasyThemeEditorWindow : Window{
+
+        private static EasyThemeEditorWindow? _instance;
+
+        public static bool IsOpen => _instance != null;
+
+        private EasyThemeEditorWindow(string customThemePath) {
+            InitializeComponent();
+            DataContext = new ThemeEditorViewModel(customThemePath);
+        }
+
+        void OnCancel(object? sender, RoutedEventArgs e) {
+            Close();
+        }
+
+        void OnSave(object? sender, RoutedEventArgs e) {
+            (DataContext as ThemeEditorViewModel)!.Save();
+            Close();
+        }
+
+        void WindowClosing(object? sender, WindowClosingEventArgs e) {
+            _instance = null;
+            MessageBus.Current.SendMessage(new ThemeEditorStateChangedEvent());
+            App.SetTheme();
+        }
+
+        public static void Show(string customThemePath) {
+            if (_instance == null) {
+                _instance = new EasyThemeEditorWindow(customThemePath);
+                _instance.Show();
+                MessageBus.Current.SendMessage(new ThemeEditorStateChangedEvent());
+            } else {
+                _instance.Activate();
+            }
+        }
+    }
+}
+
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index e116bbe34..9a748a9c1 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -216,9 +216,23 @@
         <!-- Appearance -->
         <StackPanel>
           <TextBlock Text="{DynamicResource prefs.appearance.theme}" Margin="0,10,0,0"/>
-          <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,auto,auto,auto">
+          <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,auto,auto,auto,auto">
             <ComboBox Grid.Column="0" IsEnabled="{Binding !IsThemeEditorOpen}" ItemsSource="{Binding ThemeItems}" SelectedItem="{Binding ThemeName}"/>
             <Button Grid.Column="1" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" MinWidth="18" MinHeight="18" 
+                Click="OpenEasyCustomThemeEditor" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.easyedit.title}">
+                <Grid Width="18" Height="18">
+                  <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+                      Classes="filled" Data="M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z" >
+                    <Path.RenderTransform>
+                      <TransformGroup>
+                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
+                        <TranslateTransform X="-2" Y="-2"/>
+                      </TransformGroup>
+                    </Path.RenderTransform>
+                  </Path>
+                </Grid>
+            </Button>
+            <Button Grid.Column="2" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" MinWidth="18" MinHeight="18" 
                 Click="OpenCustomThemeEditor" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.edit.title}">
                 <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
@@ -232,14 +246,14 @@
                   </Path>
                 </Grid>
             </Button>
-            <Button Grid.Column="2" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" Click="OnCustomThemeDelete"
+            <Button Grid.Column="3" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" Click="OnCustomThemeDelete"
                 MinWidth="18" MinHeight="18" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.delete.title}">
               <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
                     Data="M7.03 2.81c-.23 0-.38.17-.38.37v1.27h-2.65c-.19 0-.38.17-.38.37v.29c0 .21.19.37.38.37h.26v8.9c0 .21.19.37.38.37h8.7c.23 0 .38-.17.38-.42V5.68h.26c.23 0 .38-.17.38-.37v-.29c0-.21-.15-.42-.38-.42h-2.65V3.22c0-.21-.15-.42-.38-.42H7.05zm.76 1.04h2.42v.75h-2.38v-.75zm-2.49 1.79h7.4v8.23H5.29V6.28zm1.82 1.49a.38.38 0 0 0-.38.42v4.32c0 .21.19.42.38.42h.42a.38.38 0 0 0 .38-.42V7.77a.38.38 0 0 0-.38-.42h-.42zm3.37 0a.38.38 0 0 0-.38.42v4.32c0 .21.15.42.38.42h.38a.38.38 0 0 0 .38-.42V7.77a.38.38 0 0 0-.38-.42h-.38z" />
               </Grid>
             </Button>
-            <Button Grid.Column="3" IsEnabled="{Binding !IsThemeEditorOpen}" Click="OnCustomThemeCreate" MinWidth="18" MinHeight="18"
+            <Button Grid.Column="4" IsEnabled="{Binding !IsThemeEditorOpen}" Click="OnCustomThemeCreate" MinWidth="18" MinHeight="18"
                 Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.create.title}" >
               <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index ccb1841bd..5b65452ca 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -120,6 +120,10 @@ void DetectWinePath(object sender, RoutedEventArgs e) {
             ((PreferencesViewModel)DataContext!).SetWinePath(winePath);
         }
 
+        void OpenEasyCustomThemeEditor(object sender, RoutedEventArgs e) {
+            EasyThemeEditorWindow.Show(CustomTheme.Themes[viewModel!.ThemeName]);
+        }
+
         void OpenCustomThemeEditor(object sender, RoutedEventArgs e) {
             ThemeEditorWindow.Show(CustomTheme.Themes[viewModel!.ThemeName]);
         }

From 5dce950e67ec5d83f64da4e1d54e4938b3078725 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andyfushan@126.com>
Date: Thu, 14 May 2026 21:42:05 +0800
Subject: [PATCH 2/8] Added simple toggle between light and dark theme in Easy
 Theme Editor.

---
 OpenUtau/Colors/CustomTheme.axaml           |   5 +
 OpenUtau/Colors/CustomTheme.axaml.cs        |   7 +-
 OpenUtau/Controls/TrackHeader.axaml         |   3 +-
 OpenUtau/Controls/TrackHeader.axaml.cs      |  19 ---
 OpenUtau/Controls/TrackHeaderCanvas.cs      |  20 +--
 OpenUtau/ViewModels/ThemeEditorViewModel.cs | 105 ++++++++++++++-
 OpenUtau/ViewModels/TrackHeaderViewModel.cs | 138 ++++++++------------
 OpenUtau/ViewModels/TracksViewModel.cs      |  52 --------
 OpenUtau/Views/EasyThemeEditorWindow.axaml  |   2 +-
 9 files changed, 173 insertions(+), 178 deletions(-)

diff --git a/OpenUtau/Colors/CustomTheme.axaml b/OpenUtau/Colors/CustomTheme.axaml
index 7342a1b14..6479f8b79 100644
--- a/OpenUtau/Colors/CustomTheme.axaml
+++ b/OpenUtau/Colors/CustomTheme.axaml
@@ -45,4 +45,9 @@
   <Color x:Key="BlackKeyColorLeft">#FF71A3</Color>
   <Color x:Key="BlackKeyColorRight">#FF347C</Color>
   <Color x:Key="BlackKeyNameColor">#FFFFFF</Color>
+    
+  <!--Easy Color Themes-->
+  <system:Boolean x:Key="IsDarkModeEasy">False</system:Boolean>
+  <Color x:Key="MainColorA">#4EA6EA</Color>
+  <Color x:Key="MainColorB">#FF347C</Color>
 </ResourceDictionary>
diff --git a/OpenUtau/Colors/CustomTheme.axaml.cs b/OpenUtau/Colors/CustomTheme.axaml.cs
index d5cb9c4ba..ecb291d57 100644
--- a/OpenUtau/Colors/CustomTheme.axaml.cs
+++ b/OpenUtau/Colors/CustomTheme.axaml.cs
@@ -141,7 +141,7 @@ public class ThemeYaml {
 
         public string WhiteKeyColorLeft = "Transparent";
         public string WhiteKeyColorRight = "Transparent";
-        public string WhiteKeyNameColor = "#FF347c";
+        public string WhiteKeyNameColor = "#FF347C";
             
         public string CenterKeyColorLeft = "#FFDDE6";
         public string CenterKeyColorRight = "#FFCEDC";
@@ -150,6 +150,11 @@ public class ThemeYaml {
         public string BlackKeyColorLeft = "#FF71A3";
         public string BlackKeyColorRight = "#FF347C";
         public string BlackKeyNameColor = "#FFFFFF";
+
+        public string MainColorA = "#4EA6EA";
+        public string MainColorB = "#FF347C";
+        public bool IsDarkModeEasy = false;
+
     }
 }
 
diff --git a/OpenUtau/Controls/TrackHeader.axaml b/OpenUtau/Controls/TrackHeader.axaml
index 7a2eeb79b..b724ea1d2 100644
--- a/OpenUtau/Controls/TrackHeader.axaml
+++ b/OpenUtau/Controls/TrackHeader.axaml
@@ -76,8 +76,7 @@
       </ContextMenu.Styles>
     </ContextMenu>
   </UserControl.Resources>
-  <Border Margin="1,1,1,1" BorderThickness="1" BorderBrush="{Binding HeaderBorderBrush}"
-           CornerRadius="2" PointerPressed="HeaderPointerPressed">
+  <Border Margin="1,1,1,1" BorderThickness="1" BorderBrush="{DynamicResource NeutralAccentBrushSemi}" CornerRadius="2">
     <Grid ColumnDefinitions="auto,*,auto" Background="Transparent">
       <Panel Grid.Column="0" VerticalAlignment="Stretch">
         <Border BorderThickness="0,0,1,1" MaxHeight="101" VerticalAlignment="Top" CornerRadius="0,0,2,0"
diff --git a/OpenUtau/Controls/TrackHeader.axaml.cs b/OpenUtau/Controls/TrackHeader.axaml.cs
index 5c7559326..13a8ec35c 100644
--- a/OpenUtau/Controls/TrackHeader.axaml.cs
+++ b/OpenUtau/Controls/TrackHeader.axaml.cs
@@ -44,15 +44,12 @@ public int TrackNo {
         private double trackHeight;
         private Point offset;
         private int trackNo;
-        private readonly KeyModifiers cmdKey =
-            OS.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
 
         public TrackHeaderViewModel? ViewModel;
 
         private List<IDisposable> unbinds = new List<IDisposable>();
 
         private UTrack? track;
-        private TrackHeaderCanvas? canvas;
 
         public TrackHeader() {
             InitializeComponent();
@@ -69,7 +66,6 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
         internal void Bind(UTrack track, TrackHeaderCanvas canvas) {
             this.track = track;
-            this.canvas = canvas;
             unbinds.Add(this.Bind(TrackHeightProperty, canvas.GetObservable(TrackHeaderCanvas.TrackHeightProperty)));
             unbinds.Add(this.Bind(HeightProperty, canvas.GetObservable(TrackHeaderCanvas.TrackHeightProperty)));
             unbinds.Add(this.Bind(OffsetProperty, canvas.WhenAnyValue(x => x.TrackOffset, trackOffset => new Point(0, -trackOffset * TrackHeight))));
@@ -86,21 +82,6 @@ private void SetPosition() {
             }
         }
 
-        void HeaderPointerPressed(object? sender, PointerPressedEventArgs args) {
-            if (!args.GetCurrentPoint(this).Properties.IsLeftButtonPressed ||
-                track == null ||
-                canvas?.DataContext is not TracksViewModel tracksViewModel) {
-                return;
-            }
-            if (args.KeyModifiers == KeyModifiers.Shift) {
-                tracksViewModel.SelectTracksUntil(track);
-            } else if (args.KeyModifiers == cmdKey) {
-                tracksViewModel.ToggleSelectTrack(track);
-            } else {
-                tracksViewModel.SelectTrack(track);
-            }
-        }
-
         void TrackNameButtonClicked(object sender, RoutedEventArgs args) {
             ViewModel?.Rename();
             args.Handled = true;
diff --git a/OpenUtau/Controls/TrackHeaderCanvas.cs b/OpenUtau/Controls/TrackHeaderCanvas.cs
index a945f71ea..ca716e8fd 100644
--- a/OpenUtau/Controls/TrackHeaderCanvas.cs
+++ b/OpenUtau/Controls/TrackHeaderCanvas.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.Linq;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using OpenUtau.App.ViewModels;
+using OpenUtau.Core;
 using OpenUtau.Core.Ustx;
 using ReactiveUI;
 
@@ -98,21 +98,6 @@ public TrackHeaderCanvas() {
                         }
                     }
                 });
-            MessageBus.Current.Listen<TrackSelectionEvent>()
-                .Subscribe(e => {
-                    var selectedTracks = new HashSet<UTrack>(e.selectedTracks);
-                    foreach (var (track, header) in trackHeaders) {
-                        if (header.ViewModel != null) {
-                            header.ViewModel.IsSelected = selectedTracks.Contains(track);
-                        }
-                    }
-                });
-            MessageBus.Current.Listen<ThemeChangedEvent>()
-                .Subscribe(_ => {
-                    foreach (var (_, header) in trackHeaders) {
-                        header.ViewModel?.RefreshSelectionStyle();
-                    }
-                });
         }
 
         protected override void OnInitialized() {
@@ -168,9 +153,6 @@ private void Items_CollectionChanged(object? sender, NotifyCollectionChangedEven
 
         void Add(UTrack track) {
             var vm = new TrackHeaderViewModel(track);
-            if (DataContext is TracksViewModel tracksViewModel) {
-                vm.IsSelected = tracksViewModel.SelectedTracks.Contains(track);
-            }
             var header = new TrackHeader() {
                 DataContext = vm,
                 ViewModel = vm,
diff --git a/OpenUtau/ViewModels/ThemeEditorViewModel.cs b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
index 9cbca6642..b7eaa8764 100644
--- a/OpenUtau/ViewModels/ThemeEditorViewModel.cs
+++ b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
@@ -61,6 +61,7 @@ public class ThemeEditorViewModel : ViewModelBase {
 
         [Reactive] public Color MainColorA { get; set; }
         [Reactive] public Color MainColorB { get; set; }
+        [Reactive] public bool IsDarkModeEasy { get; set; }
 
         public ThemeEditorViewModel(string customThemePath) {
             this.customThemePath = customThemePath;
@@ -113,6 +114,10 @@ public ThemeEditorViewModel(string customThemePath) {
             BlackKeyColorRight = Color.Parse(themeYaml.BlackKeyColorRight);
             BlackKeyNameColor = Color.Parse(themeYaml.BlackKeyNameColor);
 
+            MainColorA = Color.Parse(themeYaml.MainColorA);
+            MainColorB = Color.Parse(themeYaml.MainColorB);
+            IsDarkModeEasy = themeYaml.IsDarkModeEasy;
+
             this.WhenAnyValue(vm => vm.IsDarkMode)
                 .Subscribe(v => {
                     Application.Current!.Resources["IsDarkMode"] = v; 
@@ -124,6 +129,13 @@ public ThemeEditorViewModel(string customThemePath) {
                     ThemeManager.LoadTheme();
                 });
 
+
+            this.WhenAnyValue(vm => vm.IsDarkModeEasy)
+                .Subscribe(v => {
+                    Application.Current!.Resources["IsDarkModeEasy"] = v;
+                    UpdateColorsByMain();
+                });
+
             this.WhenAnyValue(vm => vm.BackgroundColor)
                 .Subscribe(v => Application.Current!.Resources["BackgroundColor"] = v);
 
@@ -227,7 +239,7 @@ public ThemeEditorViewModel(string customThemePath) {
                 
             this.WhenAnyValue(vm => vm.MainColorA)
                 .Subscribe(v => {
-                    Application.Current!.Resources["BlackKeyNameColor"] = v;
+                    Application.Current!.Resources["MainColorA"] = v;
                 });
         }
 
@@ -273,11 +285,100 @@ public void Save() {
 
                 BlackKeyColorLeft = BlackKeyColorLeft.ToString(),
                 BlackKeyColorRight = BlackKeyColorRight.ToString(),
-                BlackKeyNameColor = BlackKeyNameColor.ToString()
+                BlackKeyNameColor = BlackKeyNameColor.ToString(),
+
+                MainColorA = MainColorA.ToString(),
+                MainColorB = MainColorB.ToString(),
+                IsDarkModeEasy = IsDarkModeEasy
             };
 
             File.WriteAllText(customThemePath, Yaml.DefaultSerializer.Serialize(themeYaml), Encoding.UTF8);
         }
 
+        private void UpdateColorsByMain() {
+            if (IsDarkModeEasy) {
+                BackgroundColor = Color.FromUInt32(0xFF303030);
+                BackgroundColorPointerOver = Color.FromUInt32(0xFF505050);
+                BackgroundColorPressed = Color.FromUInt32(0xFF707070);
+                BackgroundColorDisabled = Color.FromUInt32(0xFF404040);
+
+                ForegroundColor = Color.FromUInt32(0xFFE0E0E0);
+                ForegroundColorPointerOver = Color.FromUInt32(0xFFFCFCFC);
+                ForegroundColorPressed = Color.FromUInt32(0xFFFFFFFF);
+                ForegroundColorDisabled = Color.FromUInt32(0xFFA0A0A0);
+
+                BorderColor = Color.FromUInt32(0xFF707070);
+                BorderColorPointerOver = Color.FromUInt32(0xFFB0B0B0);
+
+                //SystemAccentColor =
+                //SystemAccentColorLight1 =
+                //SystemAccentColorDark1 =
+
+                NeutralAccentColor = Color.FromUInt32(0xFF808080);
+                NeutralAccentColorPointerOver = Color.FromUInt32(0xFFA0A0A0);
+                //AccentColor1 =
+                //AccentColor2 =
+                //AccentColor3 =
+
+                TickLineColor = Color.FromUInt32(0xFF707070);
+                BarNumberColor = Color.FromUInt32(0xFFD0D0D0);
+                FinalPitchColor = Color.FromUInt32(0xFFD0D0D0);
+                TrackBackgroundAltColor = Color.FromUInt32(0xFF404040);
+
+                //WhiteKeyColorLeft =
+                //WhiteKeyColorRight =
+                WhiteKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
+
+                //CenterKeyColorLeft = 
+                //CenterKeyColorRight = 
+                //CenterKeyNameColor = 
+
+                BlackKeyColorLeft = Color.FromUInt32(0x00000000);
+                BlackKeyColorRight = Color.FromUInt32(0x00000000);
+                BlackKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
+            } else {
+                BackgroundColor = Color.FromUInt32(0xFFFFFFFF);
+                BackgroundColorPointerOver = Color.FromUInt32(0xFFF0F0F0);
+                BackgroundColorPressed = Color.FromUInt32(0xFFE0E0E0);
+                BackgroundColorDisabled = Color.FromUInt32(0xFFD0D0D0);
+
+                ForegroundColor = Color.FromUInt32(0xFF000000);
+                ForegroundColorPointerOver = Color.FromUInt32(0xFF000000);
+                ForegroundColorPressed = Color.FromUInt32(0xFF202020);
+                ForegroundColorDisabled = Color.FromUInt32(0xFF808080);
+
+                BorderColor = Color.FromUInt32(0xFF707070);
+                BorderColorPointerOver = Color.FromUInt32(0xFFB0B0B0);
+
+                //SystemAccentColor =
+                //SystemAccentColorLight1 =
+                //SystemAccentColorDark1 =
+
+                NeutralAccentColor = Color.FromUInt32(0xFFA7A7A7);
+                NeutralAccentColorPointerOver = Color.FromUInt32(0xFF909090);
+                //AccentColor1 =
+                //AccentColor2 =
+                //AccentColor3 =
+
+                TickLineColor = Color.FromUInt32(0xFFB0B0B0);
+                BarNumberColor = Color.FromUInt32(0xFFB0B0B0);
+                FinalPitchColor = Color.FromUInt32(0xFFC0C0C0);
+                TrackBackgroundAltColor = Color.FromUInt32(0xFFF0F0F0);
+
+                WhiteKeyColorLeft = Color.FromUInt32(0x00000000);
+                WhiteKeyColorRight = Color.FromUInt32(0x00000000);
+                //WhiteKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
+
+                //CenterKeyColorLeft = 
+                //CenterKeyColorRight = 
+                //CenterKeyNameColor = 
+
+                //BlackKeyColorLeft = Color.FromUInt32(0x00000000);
+                //BlackKeyColorRight = Color.FromUInt32(0x00000000);
+                BlackKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
+            }
+            IsDarkMode = IsDarkModeEasy;
+        }
+
     }
 }
diff --git a/OpenUtau/ViewModels/TrackHeaderViewModel.cs b/OpenUtau/ViewModels/TrackHeaderViewModel.cs
index 34fb0d4b9..1c62570aa 100644
--- a/OpenUtau/ViewModels/TrackHeaderViewModel.cs
+++ b/OpenUtau/ViewModels/TrackHeaderViewModel.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -39,12 +40,10 @@ public class TrackHeaderViewModel : ViewModelBase, IActivatableViewModel {
         [Reactive] public bool Mute { get; set; }
         [Reactive] public bool Muted { get; set; }
         [Reactive] public bool Solo { get; set; }
-        [Reactive] public bool IsSelected { get; set; }
         [Reactive] public Bitmap? Avatar { get; set; }
-        [Reactive] public bool IsSingerVisible { get; set; }
-        [Reactive] public bool IsPhonemizerVisible { get; set; }
-        [Reactive] public bool IsRendererVisible { get; set; }
-        [Reactive] public IBrush HeaderBorderBrush { get; set; } = ThemeManager.NeutralAccentBrushSemi;
+        [Reactive] public bool IsSingerVisible  { get; set; }
+        [Reactive] public bool IsPhonemizerVisible  { get; set; }
+        [Reactive] public bool IsRendererVisible  { get; set; }
 
         public ViewModelActivator Activator { get; }
 
@@ -57,9 +56,6 @@ public TrackHeaderViewModel() {
             SelectRendererCommand = ReactiveCommand.Create<string>(_ => { });
             Activator = new ViewModelActivator();
             track = new UTrack(DocManager.Inst.Project);
-            this.WhenAnyValue(x => x.IsSelected)
-                .Subscribe(_ => RefreshSelectionStyle());
-            RefreshSelectionStyle();
         }
 
         public TrackHeaderViewModel(UTrack track) {
@@ -67,14 +63,36 @@ public TrackHeaderViewModel(UTrack track) {
             SelectSingerCommand = ReactiveCommand.Create<USinger>(singer => {
                 if (track.Singer != singer) {
                     DocManager.Inst.StartUndoGroup("command.track.singer");
-                    ApplySingerToTrack(track, singer);
+                    Log.Information($"Loading Singer: {singer.Name}");
+                    DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, track, singer));
+                    if (!string.IsNullOrEmpty(singer?.Id) &&
+                        Preferences.Default.SingerPhonemizers.TryGetValue(Singer.Id, out var phonemizerName) &&
+                        TryChangePhonemizer(phonemizerName)) {
+                    } else if (!string.IsNullOrEmpty(singer?.DefaultPhonemizer)) {
+                        TryChangePhonemizer(singer.DefaultPhonemizer);
+                    }
+                    if (singer == null || !singer.Found) {
+                        var settings = new URenderSettings();
+                        DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, track, settings));
+                    } else if (singer.SingerType != track.RendererSettings.Renderer?.SingerType) {
+                        var settings = new URenderSettings {
+                            renderer = Core.Render.Renderers.GetDefaultRenderer(singer.SingerType),
+                        };
+                        DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, track, settings));
+                    }
                     DocManager.Inst.ExecuteCmd(new VoiceColorRemappingNotification(track.TrackNo, true));
                     DocManager.Inst.EndUndoGroup();
-                    UpdateRecentSingers(singer);
+                    if (!string.IsNullOrEmpty(singer?.Id) && singer.Found) {
+                        Preferences.Default.RecentSingers.Remove(singer.Id);
+                        Preferences.Default.RecentSingers.Insert(0, singer.Id);
+                        if (Preferences.Default.RecentSingers.Count > 16) {
+                            Preferences.Default.RecentSingers.RemoveRange(
+                                16, Preferences.Default.RecentSingers.Count - 16);
+                        }
+                    }
                     Preferences.Save();
                     MessageBus.Current.SendMessage(new PianorollRefreshEvent("Part"));
                 }
-                MessageBus.Current.SendMessage(new TracksRefreshEvent());
                 this.RaisePropertyChanged(nameof(Singer));
                 this.RaisePropertyChanged(nameof(Renderer));
                 RefreshAvatar();
@@ -112,6 +130,14 @@ public TrackHeaderViewModel(UTrack track) {
             });
 
             Activator = new ViewModelActivator();
+            this.WhenActivated((CompositeDisposable disposables) => {
+                Disposable.Create(() => {
+                    MessageBus.Current.Listen<TracksRefreshEvent>()
+                        .Subscribe(_ => {
+                            ManuallyRaise();
+                        }).DisposeWith(disposables);
+                });
+            });
 
             TrackName = track.TrackName;
             TrackAccentColor = ThemeManager.GetTrackColor(track.TrackColor).AccentColor;
@@ -146,17 +172,8 @@ public TrackHeaderViewModel(UTrack track) {
                 .Subscribe(solo => {
                     track.Solo = solo;
                 });
-            this.WhenAnyValue(x => x.IsSelected)
-                .Subscribe(_ => RefreshSelectionStyle());
 
             RefreshAvatar();
-            RefreshSelectionStyle();
-        }
-
-        public void RefreshSelectionStyle() {
-            HeaderBorderBrush = IsSelected
-                ? TrackAccentColor
-                : ThemeManager.NeutralAccentBrushSemi;
         }
 
         public void ToggleSolo() {
@@ -217,57 +234,12 @@ public void JudgeMuted() {
             this.RaisePropertyChanged(nameof(Muted));
         }
 
-        private void ApplySingerToTrack(UTrack targetTrack, USinger? singer) {
-            if (singer is USinger selectedSinger) {
-                Log.Information($"Loading Singer: {selectedSinger.Name}");
-                DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, targetTrack, selectedSinger));
-                if (!string.IsNullOrEmpty(selectedSinger.Id) &&
-                    Preferences.Default.SingerPhonemizers.TryGetValue(selectedSinger.Id, out var phonemizerName) &&
-                    TryChangePhonemizer(targetTrack, phonemizerName)) {
-                } else if (!string.IsNullOrEmpty(selectedSinger.DefaultPhonemizer)) {
-                    TryChangePhonemizer(targetTrack, selectedSinger.DefaultPhonemizer);
-                }
-                if (!selectedSinger.Found || selectedSinger.SingerType != targetTrack.RendererSettings.Renderer?.SingerType) {
-                    var settings = new URenderSettings();
-                    if (selectedSinger.Found) {
-                        settings = new URenderSettings {
-                            renderer = Core.Render.Renderers.GetDefaultRenderer(selectedSinger.SingerType),
-                        };
-                    }
-                    DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, targetTrack, settings));
-                }
-            } else {
-                DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, targetTrack, USinger.CreateMissing(string.Empty)));
-                var settings = new URenderSettings();
-                DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, targetTrack, settings));
-            }
-        }
-
-        private void UpdateRecentSingers(USinger? singer) {
-            if (!string.IsNullOrEmpty(singer?.Id) && singer.Found) {
-                Preferences.Default.RecentSingers.Remove(singer.Id);
-                Preferences.Default.RecentSingers.Insert(0, singer.Id);
-                if (Preferences.Default.RecentSingers.Count > 16) {
-                    Preferences.Default.RecentSingers.RemoveRange(
-                        16, Preferences.Default.RecentSingers.Count - 16);
-                }
-            }
-        }
-
-        private SingerMenuItemViewModel CreateSingerMenuItem(USinger singer) {
-            return new SingerMenuItemViewModel() {
-                Header = singer.LocalizedName,
-                Command = SelectSingerCommand,
-                CommandParameter = singer,
-            };
-        }
-
-        private bool TryChangePhonemizer(UTrack targetTrack, string phonemizerName) {
+        private bool TryChangePhonemizer(string phonemizerName) {
             try {
                 var factory = PhonemizerFactory.Get(phonemizerName);
                 var phonemizer = factory?.Create();
                 if (phonemizer != null) {
-                    DocManager.Inst.ExecuteCmd(new TrackChangePhonemizerCommand(DocManager.Inst.Project, targetTrack, phonemizer));
+                    DocManager.Inst.ExecuteCmd(new TrackChangePhonemizerCommand(DocManager.Inst.Project, track, phonemizer));
                     return true;
                 }
             } catch (Exception e) {
@@ -282,21 +254,33 @@ public void RefreshSingers() {
                 items.AddRange(Preferences.Default.RecentSingers
                 .Select(id => SingerManager.Inst.Singers.Values.FirstOrDefault(singer => singer.Id == id))
                 .OfType<USinger>()
-                .Select(CreateSingerMenuItem));
-                items.Add(new MenuItemViewModel() {
+                .Select(singer => new SingerMenuItemViewModel() {
+                    Header = singer.LocalizedName,
+                    Command = SelectSingerCommand,
+                    CommandParameter = singer,
+                }));
+                items.Add(new SingerMenuItemViewModel() {
                     Header = ThemeManager.GetString("tracks.favorite") + " ...",
                     Items = Preferences.Default.FavoriteSingers
                         .Select(id => SingerManager.Inst.Singers.Values.FirstOrDefault(singer => singer.Id == id))
                         .OfType<USinger>()
                         .LocalizedOrderBy(singer => singer.LocalizedName)
-                        .Select(CreateSingerMenuItem).ToArray(),
+                        .Select(singer => new SingerMenuItemViewModel() {
+                            Header = singer.LocalizedName,
+                            Command = SelectSingerCommand,
+                            CommandParameter = singer,
+                        }).ToArray(),
                 });
                 var keys = SingerManager.Inst.SingerGroups.Keys.OrderBy(k => k);
                 foreach (var key in keys) {
-                    items.Add(new MenuItemViewModel() {
+                    items.Add(new SingerMenuItemViewModel() {
                         Header = $"{key} ...",
                         Items = SingerManager.Inst.SingerGroups[key]
-                            .Select(CreateSingerMenuItem).ToArray(),
+                            .Select(singer => new SingerMenuItemViewModel() {
+                                Header = singer.LocalizedName,
+                                Command = SelectSingerCommand,
+                                CommandParameter = singer,
+                            }).ToArray(),
                     });
                 }
             } else {
@@ -469,17 +453,8 @@ public void RefreshAvatar() {
         }
 
         public void ManuallyRaise() {
-            TrackName = track.TrackName;
-            TrackAccentColor = ThemeManager.GetTrackColor(track.TrackColor).AccentColor;
-            TrackColor = Preferences.Default.UseTrackColor
-                ? ThemeManager.GetTrackColor(track.TrackColor)
-                : ThemeManager.GetTrackColor("Blue");
-            RefreshSelectionStyle();
             this.RaisePropertyChanged(nameof(Singer));
             this.RaisePropertyChanged(nameof(TrackNo));
-            this.RaisePropertyChanged(nameof(TrackName));
-            this.RaisePropertyChanged(nameof(TrackAccentColor));
-            this.RaisePropertyChanged(nameof(TrackColor));
             this.RaisePropertyChanged(nameof(Phonemizer));
             this.RaisePropertyChanged(nameof(PhonemizerTag));
             this.RaisePropertyChanged(nameof(Renderer));
@@ -542,7 +517,6 @@ public async void SelectTrackColor() {
                 TrackColor = Preferences.Default.UseTrackColor
                 ? ThemeManager.GetTrackColor(track.TrackColor)
                 : ThemeManager.GetTrackColor("Blue");
-                RefreshSelectionStyle();
             }
         }
 
diff --git a/OpenUtau/ViewModels/TracksViewModel.cs b/OpenUtau/ViewModels/TracksViewModel.cs
index bfd26869b..7ecc60458 100644
--- a/OpenUtau/ViewModels/TracksViewModel.cs
+++ b/OpenUtau/ViewModels/TracksViewModel.cs
@@ -31,12 +31,6 @@ public TracksMuteEvent(int trackNo, bool allmute) {
             this.allmute = allmute;
         }
     }
-    public class TrackSelectionEvent {
-        public readonly UTrack[] selectedTracks;
-        public TrackSelectionEvent(UTrack[] selectedTracks) {
-            this.selectedTracks = selectedTracks;
-        }
-    }
     public class PartsSelectionEvent {
         public readonly UPart[] selectedParts;
         public readonly UPart[] tempSelectedParts;
@@ -100,7 +94,6 @@ public class TracksViewModel : ViewModelBase, ICmdSubscriber {
         private readonly ObservableAsPropertyHelper<double> smallChangeY;
 
         public readonly List<UPart> SelectedParts = new List<UPart>();
-        public readonly List<UTrack> SelectedTracks = new List<UTrack>();
         private readonly HashSet<UPart> TempSelectedParts = new HashSet<UPart>();
 
         public TracksViewModel() {
@@ -272,44 +265,6 @@ public void DeselectParts() {
                     SelectedParts.ToArray(), TempSelectedParts.ToArray()));
         }
 
-        public void DeselectTracks() {
-            SelectedTracks.Clear();
-            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
-        }
-
-        public void SelectTrack(UTrack track) {
-            if (SelectedTracks.Count == 1 && SelectedTracks[0] == track) {
-                return;
-            }
-            SelectedTracks.Clear();
-            SelectedTracks.Add(track);
-            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
-        }
-
-        public void ToggleSelectTrack(UTrack track) {
-            if (SelectedTracks.Contains(track)) {
-                SelectedTracks.Remove(track);
-            } else {
-                SelectedTracks.Add(track);
-            }
-            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
-        }
-
-        public void SelectTracksUntil(UTrack track) {
-            if (SelectedTracks.Count == 0) {
-                SelectTrack(track);
-                return;
-            }
-            int start = SelectedTracks.Min(selected => selected.TrackNo);
-            int end = track.TrackNo;
-            if (start > end) {
-                (start, end) = (end, start);
-            }
-            SelectedTracks.Clear();
-            SelectedTracks.AddRange(Project.tracks.Where(t => start <= t.TrackNo && t.TrackNo <= end));
-            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
-        }
-
         public void SelectPart(UPart part) {
             TempSelectedParts.Clear();
             SelectedParts.Add(part);
@@ -469,23 +424,19 @@ public void OnNext(UCommand cmd, bool isUndo) {
                 } else if (cmd is RemoveTrackCommand removeTrack) {
                     if (!isUndo) {
                         Tracks.Remove(removeTrack.track);
-                        SelectedTracks.Remove(removeTrack.track);
                     } else {
                         Tracks.Add(removeTrack.track);
                     }
                 }
                 Notify();
                 MessageBus.Current.SendMessage(new TracksRefreshEvent());
-                MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
             } else if (cmd is UNotification) {
                 if (cmd is LoadProjectNotification loadProjectNotif) {
                     Parts.Clear();
                     Parts.AddRange(loadProjectNotif.project.parts);
                     Tracks.Clear();
                     Tracks.AddRange(loadProjectNotif.project.tracks);
-                    SelectedTracks.Clear();
                     MessageBus.Current.SendMessage(new TracksRefreshEvent());
-                    MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
                 } else if (cmd is SetPlayPosTickNotification setPlayPosTick) {
                     SetPlayPos(setPlayPosTick.playPosTick, setPlayPosTick.waitingRendering);
                     if (!setPlayPosTick.pause || Preferences.Default.LockStartTime == 1) {
@@ -496,9 +447,6 @@ public void OnNext(UCommand cmd, bool isUndo) {
                         DeselectParts();
                         SelectPart(loadPartNotif.part);
                     }
-                    if (0 <= loadPartNotif.part.trackNo && loadPartNotif.part.trackNo < Project.tracks.Count) {
-                        SelectTrack(Project.tracks[loadPartNotif.part.trackNo]);
-                    }
                 }
                 Notify();
             }
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml b/OpenUtau/Views/EasyThemeEditorWindow.axaml
index 37fb271fb..e8560dacb 100644
--- a/OpenUtau/Views/EasyThemeEditorWindow.axaml
+++ b/OpenUtau/Views/EasyThemeEditorWindow.axaml
@@ -12,7 +12,7 @@
       <StackPanel Spacing="5">
         <Panel>
           <TextBlock VerticalAlignment="Center" Text="IsDarkMode"/>
-          <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkMode}"/>
+          <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkModeEasy}"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>

From 4fbe3c2664a50de75b594a85f5eed88f62a0cdd7 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andyfushan@126.com>
Date: Thu, 14 May 2026 22:22:05 +0800
Subject: [PATCH 3/8] Changed the icon of Easy Theme Editor to extinguish from
 the original Theme editor

---
 OpenUtau/Views/PreferencesDialog.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 9a748a9c1..8d7cbc6ac 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -222,7 +222,7 @@
                 Click="OpenEasyCustomThemeEditor" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.easyedit.title}">
                 <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
-                      Classes="filled" Data="M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z" >
+                      Classes="filled" Data="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c0.55,0,1-0.45,1-1c0-0.26-0.1-0.5-0.27-0.68c-0.17-0.18-0.27-0.42-0.27-0.68 c0-0.28,0.09-0.54,0.27-0.73c0.17-0.18,0.4-0.28,0.66-0.28H15c3.31,0,6-2.69,6-6C21,5.79,17.21,2,12,2z M6.5,13 C5.67,13,5,12.33,5,11.5S5.67,10,6.5,10S8,10.67,8,11.5S7.33,13,6.5,13z M9.5,9C8.67,9,8,8.33,8,7.5S8.67,6,9.5,6 S11,6.67,11,7.5S10.33,9,9.5,9z M14.5,9C13.67,9,13,8.33,13,7.5S13.67,6,14.5,6S16,6.67,16,7.5S15.33,9,14.5,9z M17.5,13 C16.67,13,16,12.33,16,11.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S18.33,13,17.5,13z" >
                     <Path.RenderTransform>
                       <TransformGroup>
                         <ScaleTransform ScaleX=".6" ScaleY=".6" />

From 3105003f07e07b0615e220200942206ca7f15ecc Mon Sep 17 00:00:00 2001
From: Fengming Zhang <andyfushan@126.com>
Date: Fri, 15 May 2026 12:02:05 +0800
Subject: [PATCH 4/8] update gitignore to avoid .csproj.lscache

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 80c9c10a6..ba86bc667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -340,3 +340,6 @@ appcast.*.xml
 *.tar.gz
 .vscode/
 Microsoft.AI.DirectML
+
+# VS Code extensions autogen
+*.csproj.lscache
\ No newline at end of file

From f97d42731f87de8bef4a8f72e4e85b46d5b82dc0 Mon Sep 17 00:00:00 2001
From: Fengming Zhang <andyfushan@126.com>
Date: Fri, 15 May 2026 12:09:41 +0800
Subject: [PATCH 5/8] Reverted incorrect changes

---
 OpenUtau/Controls/TrackHeader.axaml         |   3 +-
 OpenUtau/Controls/TrackHeader.axaml.cs      |  19 +++
 OpenUtau/Controls/TrackHeaderCanvas.cs      |  20 ++-
 OpenUtau/ViewModels/TrackHeaderViewModel.cs | 138 ++++++++++++--------
 OpenUtau/ViewModels/TracksViewModel.cs      |  52 ++++++++
 5 files changed, 174 insertions(+), 58 deletions(-)

diff --git a/OpenUtau/Controls/TrackHeader.axaml b/OpenUtau/Controls/TrackHeader.axaml
index b724ea1d2..7a2eeb79b 100644
--- a/OpenUtau/Controls/TrackHeader.axaml
+++ b/OpenUtau/Controls/TrackHeader.axaml
@@ -76,7 +76,8 @@
       </ContextMenu.Styles>
     </ContextMenu>
   </UserControl.Resources>
-  <Border Margin="1,1,1,1" BorderThickness="1" BorderBrush="{DynamicResource NeutralAccentBrushSemi}" CornerRadius="2">
+  <Border Margin="1,1,1,1" BorderThickness="1" BorderBrush="{Binding HeaderBorderBrush}"
+           CornerRadius="2" PointerPressed="HeaderPointerPressed">
     <Grid ColumnDefinitions="auto,*,auto" Background="Transparent">
       <Panel Grid.Column="0" VerticalAlignment="Stretch">
         <Border BorderThickness="0,0,1,1" MaxHeight="101" VerticalAlignment="Top" CornerRadius="0,0,2,0"
diff --git a/OpenUtau/Controls/TrackHeader.axaml.cs b/OpenUtau/Controls/TrackHeader.axaml.cs
index 13a8ec35c..5c7559326 100644
--- a/OpenUtau/Controls/TrackHeader.axaml.cs
+++ b/OpenUtau/Controls/TrackHeader.axaml.cs
@@ -44,12 +44,15 @@ public int TrackNo {
         private double trackHeight;
         private Point offset;
         private int trackNo;
+        private readonly KeyModifiers cmdKey =
+            OS.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
 
         public TrackHeaderViewModel? ViewModel;
 
         private List<IDisposable> unbinds = new List<IDisposable>();
 
         private UTrack? track;
+        private TrackHeaderCanvas? canvas;
 
         public TrackHeader() {
             InitializeComponent();
@@ -66,6 +69,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
         internal void Bind(UTrack track, TrackHeaderCanvas canvas) {
             this.track = track;
+            this.canvas = canvas;
             unbinds.Add(this.Bind(TrackHeightProperty, canvas.GetObservable(TrackHeaderCanvas.TrackHeightProperty)));
             unbinds.Add(this.Bind(HeightProperty, canvas.GetObservable(TrackHeaderCanvas.TrackHeightProperty)));
             unbinds.Add(this.Bind(OffsetProperty, canvas.WhenAnyValue(x => x.TrackOffset, trackOffset => new Point(0, -trackOffset * TrackHeight))));
@@ -82,6 +86,21 @@ private void SetPosition() {
             }
         }
 
+        void HeaderPointerPressed(object? sender, PointerPressedEventArgs args) {
+            if (!args.GetCurrentPoint(this).Properties.IsLeftButtonPressed ||
+                track == null ||
+                canvas?.DataContext is not TracksViewModel tracksViewModel) {
+                return;
+            }
+            if (args.KeyModifiers == KeyModifiers.Shift) {
+                tracksViewModel.SelectTracksUntil(track);
+            } else if (args.KeyModifiers == cmdKey) {
+                tracksViewModel.ToggleSelectTrack(track);
+            } else {
+                tracksViewModel.SelectTrack(track);
+            }
+        }
+
         void TrackNameButtonClicked(object sender, RoutedEventArgs args) {
             ViewModel?.Rename();
             args.Handled = true;
diff --git a/OpenUtau/Controls/TrackHeaderCanvas.cs b/OpenUtau/Controls/TrackHeaderCanvas.cs
index ca716e8fd..a945f71ea 100644
--- a/OpenUtau/Controls/TrackHeaderCanvas.cs
+++ b/OpenUtau/Controls/TrackHeaderCanvas.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Linq;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using OpenUtau.App.ViewModels;
-using OpenUtau.Core;
 using OpenUtau.Core.Ustx;
 using ReactiveUI;
 
@@ -98,6 +98,21 @@ public TrackHeaderCanvas() {
                         }
                     }
                 });
+            MessageBus.Current.Listen<TrackSelectionEvent>()
+                .Subscribe(e => {
+                    var selectedTracks = new HashSet<UTrack>(e.selectedTracks);
+                    foreach (var (track, header) in trackHeaders) {
+                        if (header.ViewModel != null) {
+                            header.ViewModel.IsSelected = selectedTracks.Contains(track);
+                        }
+                    }
+                });
+            MessageBus.Current.Listen<ThemeChangedEvent>()
+                .Subscribe(_ => {
+                    foreach (var (_, header) in trackHeaders) {
+                        header.ViewModel?.RefreshSelectionStyle();
+                    }
+                });
         }
 
         protected override void OnInitialized() {
@@ -153,6 +168,9 @@ private void Items_CollectionChanged(object? sender, NotifyCollectionChangedEven
 
         void Add(UTrack track) {
             var vm = new TrackHeaderViewModel(track);
+            if (DataContext is TracksViewModel tracksViewModel) {
+                vm.IsSelected = tracksViewModel.SelectedTracks.Contains(track);
+            }
             var header = new TrackHeader() {
                 DataContext = vm,
                 ViewModel = vm,
diff --git a/OpenUtau/ViewModels/TrackHeaderViewModel.cs b/OpenUtau/ViewModels/TrackHeaderViewModel.cs
index 1c62570aa..34fb0d4b9 100644
--- a/OpenUtau/ViewModels/TrackHeaderViewModel.cs
+++ b/OpenUtau/ViewModels/TrackHeaderViewModel.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Reactive;
-using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -40,10 +39,12 @@ public class TrackHeaderViewModel : ViewModelBase, IActivatableViewModel {
         [Reactive] public bool Mute { get; set; }
         [Reactive] public bool Muted { get; set; }
         [Reactive] public bool Solo { get; set; }
+        [Reactive] public bool IsSelected { get; set; }
         [Reactive] public Bitmap? Avatar { get; set; }
-        [Reactive] public bool IsSingerVisible  { get; set; }
-        [Reactive] public bool IsPhonemizerVisible  { get; set; }
-        [Reactive] public bool IsRendererVisible  { get; set; }
+        [Reactive] public bool IsSingerVisible { get; set; }
+        [Reactive] public bool IsPhonemizerVisible { get; set; }
+        [Reactive] public bool IsRendererVisible { get; set; }
+        [Reactive] public IBrush HeaderBorderBrush { get; set; } = ThemeManager.NeutralAccentBrushSemi;
 
         public ViewModelActivator Activator { get; }
 
@@ -56,6 +57,9 @@ public TrackHeaderViewModel() {
             SelectRendererCommand = ReactiveCommand.Create<string>(_ => { });
             Activator = new ViewModelActivator();
             track = new UTrack(DocManager.Inst.Project);
+            this.WhenAnyValue(x => x.IsSelected)
+                .Subscribe(_ => RefreshSelectionStyle());
+            RefreshSelectionStyle();
         }
 
         public TrackHeaderViewModel(UTrack track) {
@@ -63,36 +67,14 @@ public TrackHeaderViewModel(UTrack track) {
             SelectSingerCommand = ReactiveCommand.Create<USinger>(singer => {
                 if (track.Singer != singer) {
                     DocManager.Inst.StartUndoGroup("command.track.singer");
-                    Log.Information($"Loading Singer: {singer.Name}");
-                    DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, track, singer));
-                    if (!string.IsNullOrEmpty(singer?.Id) &&
-                        Preferences.Default.SingerPhonemizers.TryGetValue(Singer.Id, out var phonemizerName) &&
-                        TryChangePhonemizer(phonemizerName)) {
-                    } else if (!string.IsNullOrEmpty(singer?.DefaultPhonemizer)) {
-                        TryChangePhonemizer(singer.DefaultPhonemizer);
-                    }
-                    if (singer == null || !singer.Found) {
-                        var settings = new URenderSettings();
-                        DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, track, settings));
-                    } else if (singer.SingerType != track.RendererSettings.Renderer?.SingerType) {
-                        var settings = new URenderSettings {
-                            renderer = Core.Render.Renderers.GetDefaultRenderer(singer.SingerType),
-                        };
-                        DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, track, settings));
-                    }
+                    ApplySingerToTrack(track, singer);
                     DocManager.Inst.ExecuteCmd(new VoiceColorRemappingNotification(track.TrackNo, true));
                     DocManager.Inst.EndUndoGroup();
-                    if (!string.IsNullOrEmpty(singer?.Id) && singer.Found) {
-                        Preferences.Default.RecentSingers.Remove(singer.Id);
-                        Preferences.Default.RecentSingers.Insert(0, singer.Id);
-                        if (Preferences.Default.RecentSingers.Count > 16) {
-                            Preferences.Default.RecentSingers.RemoveRange(
-                                16, Preferences.Default.RecentSingers.Count - 16);
-                        }
-                    }
+                    UpdateRecentSingers(singer);
                     Preferences.Save();
                     MessageBus.Current.SendMessage(new PianorollRefreshEvent("Part"));
                 }
+                MessageBus.Current.SendMessage(new TracksRefreshEvent());
                 this.RaisePropertyChanged(nameof(Singer));
                 this.RaisePropertyChanged(nameof(Renderer));
                 RefreshAvatar();
@@ -130,14 +112,6 @@ public TrackHeaderViewModel(UTrack track) {
             });
 
             Activator = new ViewModelActivator();
-            this.WhenActivated((CompositeDisposable disposables) => {
-                Disposable.Create(() => {
-                    MessageBus.Current.Listen<TracksRefreshEvent>()
-                        .Subscribe(_ => {
-                            ManuallyRaise();
-                        }).DisposeWith(disposables);
-                });
-            });
 
             TrackName = track.TrackName;
             TrackAccentColor = ThemeManager.GetTrackColor(track.TrackColor).AccentColor;
@@ -172,8 +146,17 @@ public TrackHeaderViewModel(UTrack track) {
                 .Subscribe(solo => {
                     track.Solo = solo;
                 });
+            this.WhenAnyValue(x => x.IsSelected)
+                .Subscribe(_ => RefreshSelectionStyle());
 
             RefreshAvatar();
+            RefreshSelectionStyle();
+        }
+
+        public void RefreshSelectionStyle() {
+            HeaderBorderBrush = IsSelected
+                ? TrackAccentColor
+                : ThemeManager.NeutralAccentBrushSemi;
         }
 
         public void ToggleSolo() {
@@ -234,12 +217,57 @@ public void JudgeMuted() {
             this.RaisePropertyChanged(nameof(Muted));
         }
 
-        private bool TryChangePhonemizer(string phonemizerName) {
+        private void ApplySingerToTrack(UTrack targetTrack, USinger? singer) {
+            if (singer is USinger selectedSinger) {
+                Log.Information($"Loading Singer: {selectedSinger.Name}");
+                DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, targetTrack, selectedSinger));
+                if (!string.IsNullOrEmpty(selectedSinger.Id) &&
+                    Preferences.Default.SingerPhonemizers.TryGetValue(selectedSinger.Id, out var phonemizerName) &&
+                    TryChangePhonemizer(targetTrack, phonemizerName)) {
+                } else if (!string.IsNullOrEmpty(selectedSinger.DefaultPhonemizer)) {
+                    TryChangePhonemizer(targetTrack, selectedSinger.DefaultPhonemizer);
+                }
+                if (!selectedSinger.Found || selectedSinger.SingerType != targetTrack.RendererSettings.Renderer?.SingerType) {
+                    var settings = new URenderSettings();
+                    if (selectedSinger.Found) {
+                        settings = new URenderSettings {
+                            renderer = Core.Render.Renderers.GetDefaultRenderer(selectedSinger.SingerType),
+                        };
+                    }
+                    DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, targetTrack, settings));
+                }
+            } else {
+                DocManager.Inst.ExecuteCmd(new TrackChangeSingerCommand(DocManager.Inst.Project, targetTrack, USinger.CreateMissing(string.Empty)));
+                var settings = new URenderSettings();
+                DocManager.Inst.ExecuteCmd(new TrackChangeRenderSettingCommand(DocManager.Inst.Project, targetTrack, settings));
+            }
+        }
+
+        private void UpdateRecentSingers(USinger? singer) {
+            if (!string.IsNullOrEmpty(singer?.Id) && singer.Found) {
+                Preferences.Default.RecentSingers.Remove(singer.Id);
+                Preferences.Default.RecentSingers.Insert(0, singer.Id);
+                if (Preferences.Default.RecentSingers.Count > 16) {
+                    Preferences.Default.RecentSingers.RemoveRange(
+                        16, Preferences.Default.RecentSingers.Count - 16);
+                }
+            }
+        }
+
+        private SingerMenuItemViewModel CreateSingerMenuItem(USinger singer) {
+            return new SingerMenuItemViewModel() {
+                Header = singer.LocalizedName,
+                Command = SelectSingerCommand,
+                CommandParameter = singer,
+            };
+        }
+
+        private bool TryChangePhonemizer(UTrack targetTrack, string phonemizerName) {
             try {
                 var factory = PhonemizerFactory.Get(phonemizerName);
                 var phonemizer = factory?.Create();
                 if (phonemizer != null) {
-                    DocManager.Inst.ExecuteCmd(new TrackChangePhonemizerCommand(DocManager.Inst.Project, track, phonemizer));
+                    DocManager.Inst.ExecuteCmd(new TrackChangePhonemizerCommand(DocManager.Inst.Project, targetTrack, phonemizer));
                     return true;
                 }
             } catch (Exception e) {
@@ -254,33 +282,21 @@ public void RefreshSingers() {
                 items.AddRange(Preferences.Default.RecentSingers
                 .Select(id => SingerManager.Inst.Singers.Values.FirstOrDefault(singer => singer.Id == id))
                 .OfType<USinger>()
-                .Select(singer => new SingerMenuItemViewModel() {
-                    Header = singer.LocalizedName,
-                    Command = SelectSingerCommand,
-                    CommandParameter = singer,
-                }));
-                items.Add(new SingerMenuItemViewModel() {
+                .Select(CreateSingerMenuItem));
+                items.Add(new MenuItemViewModel() {
                     Header = ThemeManager.GetString("tracks.favorite") + " ...",
                     Items = Preferences.Default.FavoriteSingers
                         .Select(id => SingerManager.Inst.Singers.Values.FirstOrDefault(singer => singer.Id == id))
                         .OfType<USinger>()
                         .LocalizedOrderBy(singer => singer.LocalizedName)
-                        .Select(singer => new SingerMenuItemViewModel() {
-                            Header = singer.LocalizedName,
-                            Command = SelectSingerCommand,
-                            CommandParameter = singer,
-                        }).ToArray(),
+                        .Select(CreateSingerMenuItem).ToArray(),
                 });
                 var keys = SingerManager.Inst.SingerGroups.Keys.OrderBy(k => k);
                 foreach (var key in keys) {
-                    items.Add(new SingerMenuItemViewModel() {
+                    items.Add(new MenuItemViewModel() {
                         Header = $"{key} ...",
                         Items = SingerManager.Inst.SingerGroups[key]
-                            .Select(singer => new SingerMenuItemViewModel() {
-                                Header = singer.LocalizedName,
-                                Command = SelectSingerCommand,
-                                CommandParameter = singer,
-                            }).ToArray(),
+                            .Select(CreateSingerMenuItem).ToArray(),
                     });
                 }
             } else {
@@ -453,8 +469,17 @@ public void RefreshAvatar() {
         }
 
         public void ManuallyRaise() {
+            TrackName = track.TrackName;
+            TrackAccentColor = ThemeManager.GetTrackColor(track.TrackColor).AccentColor;
+            TrackColor = Preferences.Default.UseTrackColor
+                ? ThemeManager.GetTrackColor(track.TrackColor)
+                : ThemeManager.GetTrackColor("Blue");
+            RefreshSelectionStyle();
             this.RaisePropertyChanged(nameof(Singer));
             this.RaisePropertyChanged(nameof(TrackNo));
+            this.RaisePropertyChanged(nameof(TrackName));
+            this.RaisePropertyChanged(nameof(TrackAccentColor));
+            this.RaisePropertyChanged(nameof(TrackColor));
             this.RaisePropertyChanged(nameof(Phonemizer));
             this.RaisePropertyChanged(nameof(PhonemizerTag));
             this.RaisePropertyChanged(nameof(Renderer));
@@ -517,6 +542,7 @@ public async void SelectTrackColor() {
                 TrackColor = Preferences.Default.UseTrackColor
                 ? ThemeManager.GetTrackColor(track.TrackColor)
                 : ThemeManager.GetTrackColor("Blue");
+                RefreshSelectionStyle();
             }
         }
 
diff --git a/OpenUtau/ViewModels/TracksViewModel.cs b/OpenUtau/ViewModels/TracksViewModel.cs
index 7ecc60458..bfd26869b 100644
--- a/OpenUtau/ViewModels/TracksViewModel.cs
+++ b/OpenUtau/ViewModels/TracksViewModel.cs
@@ -31,6 +31,12 @@ public TracksMuteEvent(int trackNo, bool allmute) {
             this.allmute = allmute;
         }
     }
+    public class TrackSelectionEvent {
+        public readonly UTrack[] selectedTracks;
+        public TrackSelectionEvent(UTrack[] selectedTracks) {
+            this.selectedTracks = selectedTracks;
+        }
+    }
     public class PartsSelectionEvent {
         public readonly UPart[] selectedParts;
         public readonly UPart[] tempSelectedParts;
@@ -94,6 +100,7 @@ public class TracksViewModel : ViewModelBase, ICmdSubscriber {
         private readonly ObservableAsPropertyHelper<double> smallChangeY;
 
         public readonly List<UPart> SelectedParts = new List<UPart>();
+        public readonly List<UTrack> SelectedTracks = new List<UTrack>();
         private readonly HashSet<UPart> TempSelectedParts = new HashSet<UPart>();
 
         public TracksViewModel() {
@@ -265,6 +272,44 @@ public void DeselectParts() {
                     SelectedParts.ToArray(), TempSelectedParts.ToArray()));
         }
 
+        public void DeselectTracks() {
+            SelectedTracks.Clear();
+            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
+        }
+
+        public void SelectTrack(UTrack track) {
+            if (SelectedTracks.Count == 1 && SelectedTracks[0] == track) {
+                return;
+            }
+            SelectedTracks.Clear();
+            SelectedTracks.Add(track);
+            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
+        }
+
+        public void ToggleSelectTrack(UTrack track) {
+            if (SelectedTracks.Contains(track)) {
+                SelectedTracks.Remove(track);
+            } else {
+                SelectedTracks.Add(track);
+            }
+            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
+        }
+
+        public void SelectTracksUntil(UTrack track) {
+            if (SelectedTracks.Count == 0) {
+                SelectTrack(track);
+                return;
+            }
+            int start = SelectedTracks.Min(selected => selected.TrackNo);
+            int end = track.TrackNo;
+            if (start > end) {
+                (start, end) = (end, start);
+            }
+            SelectedTracks.Clear();
+            SelectedTracks.AddRange(Project.tracks.Where(t => start <= t.TrackNo && t.TrackNo <= end));
+            MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
+        }
+
         public void SelectPart(UPart part) {
             TempSelectedParts.Clear();
             SelectedParts.Add(part);
@@ -424,19 +469,23 @@ public void OnNext(UCommand cmd, bool isUndo) {
                 } else if (cmd is RemoveTrackCommand removeTrack) {
                     if (!isUndo) {
                         Tracks.Remove(removeTrack.track);
+                        SelectedTracks.Remove(removeTrack.track);
                     } else {
                         Tracks.Add(removeTrack.track);
                     }
                 }
                 Notify();
                 MessageBus.Current.SendMessage(new TracksRefreshEvent());
+                MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
             } else if (cmd is UNotification) {
                 if (cmd is LoadProjectNotification loadProjectNotif) {
                     Parts.Clear();
                     Parts.AddRange(loadProjectNotif.project.parts);
                     Tracks.Clear();
                     Tracks.AddRange(loadProjectNotif.project.tracks);
+                    SelectedTracks.Clear();
                     MessageBus.Current.SendMessage(new TracksRefreshEvent());
+                    MessageBus.Current.SendMessage(new TrackSelectionEvent(SelectedTracks.ToArray()));
                 } else if (cmd is SetPlayPosTickNotification setPlayPosTick) {
                     SetPlayPos(setPlayPosTick.playPosTick, setPlayPosTick.waitingRendering);
                     if (!setPlayPosTick.pause || Preferences.Default.LockStartTime == 1) {
@@ -447,6 +496,9 @@ public void OnNext(UCommand cmd, bool isUndo) {
                         DeselectParts();
                         SelectPart(loadPartNotif.part);
                     }
+                    if (0 <= loadPartNotif.part.trackNo && loadPartNotif.part.trackNo < Project.tracks.Count) {
+                        SelectTrack(Project.tracks[loadPartNotif.part.trackNo]);
+                    }
                 }
                 Notify();
             }

From fb77ee93d5d0a4684629b988258261942d4bf6fd Mon Sep 17 00:00:00 2001
From: Andy Zhang <andyfushan@126.com>
Date: Fri, 15 May 2026 20:51:45 +0800
Subject: [PATCH 6/8] Updated full easy theme editor color change functions.

---
 OpenUtau/Colors/LightTheme.axaml            |  2 +-
 OpenUtau/ViewModels/ThemeEditorViewModel.cs | 70 ++++++++++++++-------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/OpenUtau/Colors/LightTheme.axaml b/OpenUtau/Colors/LightTheme.axaml
index ff064d0d2..c8a6a0e90 100644
--- a/OpenUtau/Colors/LightTheme.axaml
+++ b/OpenUtau/Colors/LightTheme.axaml
@@ -38,7 +38,7 @@
   <!--Keyboard Background-->
   <Color x:Key="WhiteKeyColorLeft">Transparent</Color>
   <Color x:Key="WhiteKeyColorRight">Transparent</Color>
-  <Color x:Key="WhiteKeyNameColor">#FF347c</Color>
+  <Color x:Key="WhiteKeyNameColor">#FF347C</Color>
 
   <Color x:Key="CenterKeyColorLeft">#FFDDE6</Color>
   <Color x:Key="CenterKeyColorRight">#FFCEDC</Color>
diff --git a/OpenUtau/ViewModels/ThemeEditorViewModel.cs b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
index b7eaa8764..c8c08ce16 100644
--- a/OpenUtau/ViewModels/ThemeEditorViewModel.cs
+++ b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
@@ -240,6 +240,13 @@ public ThemeEditorViewModel(string customThemePath) {
             this.WhenAnyValue(vm => vm.MainColorA)
                 .Subscribe(v => {
                     Application.Current!.Resources["MainColorA"] = v;
+                    UpdateColorsByMain();
+                });
+
+            this.WhenAnyValue(vm => vm.MainColorB)
+                .Subscribe(v => {
+                    Application.Current!.Resources["MainColorB"] = v;
+                    UpdateColorsByMain();
                 });
         }
 
@@ -310,28 +317,28 @@ private void UpdateColorsByMain() {
                 BorderColor = Color.FromUInt32(0xFF707070);
                 BorderColorPointerOver = Color.FromUInt32(0xFFB0B0B0);
 
-                //SystemAccentColor =
-                //SystemAccentColorLight1 =
-                //SystemAccentColorDark1 =
+                SystemAccentColor = MainColorA;
+                SystemAccentColorLight1 = ColorShift(MainColorA, 32);
+                SystemAccentColorDark1 = ColorMultiply(MainColorA, 0.8f);
 
                 NeutralAccentColor = Color.FromUInt32(0xFF808080);
                 NeutralAccentColorPointerOver = Color.FromUInt32(0xFFA0A0A0);
-                //AccentColor1 =
-                //AccentColor2 =
-                //AccentColor3 =
+                AccentColor1 = MainColorA;
+                AccentColor2 = ColorShift(MainColorB, 32);
+                AccentColor3 = ColorMultiply(MainColorB, 0.8f);
 
                 TickLineColor = Color.FromUInt32(0xFF707070);
                 BarNumberColor = Color.FromUInt32(0xFFD0D0D0);
                 FinalPitchColor = Color.FromUInt32(0xFFD0D0D0);
                 TrackBackgroundAltColor = Color.FromUInt32(0xFF404040);
 
-                //WhiteKeyColorLeft =
-                //WhiteKeyColorRight =
+                WhiteKeyColorLeft = ColorMultiply(MainColorB, 0.9f);
+                WhiteKeyColorRight = MainColorB; 
                 WhiteKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
 
-                //CenterKeyColorLeft = 
-                //CenterKeyColorRight = 
-                //CenterKeyNameColor = 
+                CenterKeyColorLeft = ColorMultiply(ColorShift(MainColorB, 152), 0.9f);
+                CenterKeyColorRight = ColorShift(MainColorB, 152);
+                CenterKeyNameColor = MainColorB;
 
                 BlackKeyColorLeft = Color.FromUInt32(0x00000000);
                 BlackKeyColorRight = Color.FromUInt32(0x00000000);
@@ -350,15 +357,15 @@ private void UpdateColorsByMain() {
                 BorderColor = Color.FromUInt32(0xFF707070);
                 BorderColorPointerOver = Color.FromUInt32(0xFFB0B0B0);
 
-                //SystemAccentColor =
-                //SystemAccentColorLight1 =
-                //SystemAccentColorDark1 =
+                SystemAccentColor = MainColorA;
+                SystemAccentColorLight1 = ColorShift(MainColorA, 32);
+                SystemAccentColorDark1 = ColorMultiply(MainColorA, 0.8f);
 
                 NeutralAccentColor = Color.FromUInt32(0xFFA7A7A7);
                 NeutralAccentColorPointerOver = Color.FromUInt32(0xFF909090);
-                //AccentColor1 =
-                //AccentColor2 =
-                //AccentColor3 =
+                AccentColor1 = MainColorA;
+                AccentColor2 = ColorShift(MainColorB, 32);
+                AccentColor3 = ColorMultiply(MainColorB, 0.8f);
 
                 TickLineColor = Color.FromUInt32(0xFFB0B0B0);
                 BarNumberColor = Color.FromUInt32(0xFFB0B0B0);
@@ -367,18 +374,35 @@ private void UpdateColorsByMain() {
 
                 WhiteKeyColorLeft = Color.FromUInt32(0x00000000);
                 WhiteKeyColorRight = Color.FromUInt32(0x00000000);
-                //WhiteKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
+                WhiteKeyNameColor = MainColorB;
 
-                //CenterKeyColorLeft = 
-                //CenterKeyColorRight = 
-                //CenterKeyNameColor = 
+                CenterKeyColorLeft = ColorShift(MainColorB, 144);
+                CenterKeyColorRight = ColorShift(MainColorB, 152);
+                CenterKeyNameColor = MainColorB;
 
-                //BlackKeyColorLeft = Color.FromUInt32(0x00000000);
-                //BlackKeyColorRight = Color.FromUInt32(0x00000000);
+                BlackKeyColorLeft = ColorShift(MainColorB, 32);
+                BlackKeyColorRight = MainColorB;
                 BlackKeyNameColor = Color.FromUInt32(0xFFFFFFFF);
             }
             IsDarkMode = IsDarkModeEasy;
         }
 
+        public static Color ColorMultiply(Color color, float ratio) {
+            return Color.FromArgb(
+                color.A,
+                (byte)((color.R * ratio) > 255 ? 255 : color.R * ratio),
+                (byte)((color.G * ratio) > 255 ? 255 : color.G * ratio),
+                (byte)((color.B * ratio) > 255 ? 255 : color.B * ratio)
+            );
+        }
+        public static Color ColorShift(Color color, int delta) {
+            return Color.FromArgb(
+                color.A,
+                (byte)((color.R + delta) > 255 ? 255 : ((color.R + delta) < 0 ? 0 : color.R + delta)),
+                (byte)((color.G + delta) > 255 ? 255 : ((color.G + delta) < 0 ? 0 : color.G + delta)),
+                (byte)((color.B + delta) > 255 ? 255 : ((color.B + delta) < 0 ? 0 : color.B + delta))
+            );
+        }
+
     }
 }

From 74fb567c0fd88e22357aa27077c8edc6bd9cbb95 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andyfushan@126.com>
Date: Fri, 15 May 2026 22:01:19 +0800
Subject: [PATCH 7/8] 1. Updated the default window size of Easy theme editor.
 2. Moved the hard-coded names in Theme Editor and Easy Theme Editor into
 system strings.

---
 OpenUtau/Strings/Strings.axaml             | 43 +++++++++++++--
 OpenUtau/Views/EasyThemeEditorWindow.axaml |  8 +--
 OpenUtau/Views/ThemeEditorWindow.axaml     | 64 +++++++++++-----------
 3 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index bc47dabef..016c2d914 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -149,9 +149,12 @@ Do you want to continue by splitting at the nearest position after current playh
   <system:String x:Key="dialogs.transcribe.game.batchduration">Max Batch Duration (s)</system:String>
   <system:String x:Key="dialogs.transcribe.longchunk.message">One or more audio segments are very long and may consume large amount of memory when transcribing. This usually happens when the audio contains accompaniment. Still proceed?</system:String>
 
-  <system:String x:Key="easythemeeditor.title">Easy Theme Editor</system:String>
-  <system:String x:Key="easythemeeditor.save">Save</system:String>
   <system:String x:Key="easythemeeditor.cancel">Cancel</system:String>
+  <system:String x:Key="easythemeeditor.isdarkmode">Is Dark Mode</system:String>
+  <system:String x:Key="easythemeeditor.maincolora">Main Color A</system:String>
+  <system:String x:Key="easythemeeditor.maincolorb">Main Color B</system:String>
+  <system:String x:Key="easythemeeditor.save">Save</system:String>
+  <system:String x:Key="easythemeeditor.title">Easy Theme Editor</system:String>
 
   <system:String x:Key="errors.caption">Error</system:String>
   <system:String x:Key="errors.details">Error Details</system:String>
@@ -752,9 +755,41 @@ The voicebank may not work on another OS.</system:String>
   <system:String x:Key="singersetup.textfileencoding.prompt">Choose an encoding that make file contents look right.</system:String>
   <system:String x:Key="singersetup.title">Singer Setup</system:String>
 
-  <system:String x:Key="themeeditor.title">Theme Editor</system:String>
-  <system:String x:Key="themeeditor.save">Save</system:String>
+  <system:String x:Key="themeeditor.accentcolora">Accent Color 1</system:String>
+  <system:String x:Key="themeeditor.accentcolorb">Accent Color 2</system:String>
+  <system:String x:Key="themeeditor.accentcolorc">Accent Color 3</system:String>
+  <system:String x:Key="themeeditor.backgroundcolor">Background Color</system:String>
+  <system:String x:Key="themeeditor.backgroundcolordisabled">Background Color Disabled</system:String>
+  <system:String x:Key="themeeditor.backgroundcolorpointerover">Background Color Pointer Over</system:String>
+  <system:String x:Key="themeeditor.backgroundcolorpressed">Background Color Pressed</system:String>
+  <system:String x:Key="themeeditor.barnumbercolor">Bar Number Color</system:String>
+  <system:String x:Key="themeeditor.blackkeycolorleft">Black Key Color Left</system:String>
+  <system:String x:Key="themeeditor.blackkeycolorright">Black Key Color Right</system:String>
+  <system:String x:Key="themeeditor.blackkeynamecolor">Black Key Name Color</system:String>
+  <system:String x:Key="themeeditor.bordercolor">Border Color</system:String>
+  <system:String x:Key="themeeditor.bordercolorpointerover">Border Color Pointer Over</system:String>
   <system:String x:Key="themeeditor.cancel">Cancel</system:String>
+  <system:String x:Key="themeeditor.centerkeycolorleft">Center Key Color Left</system:String>
+  <system:String x:Key="themeeditor.centerkeycolorright">Center Key Color Right</system:String>
+  <system:String x:Key="themeeditor.centerkeynamecolor">Center Key Name Color</system:String>
+  <system:String x:Key="themeeditor.finalpitchcolor">Final Pitch Color</system:String>
+  <system:String x:Key="themeeditor.foregroundcolor">Foreground Color</system:String>
+  <system:String x:Key="themeeditor.foregroundcolordisabled">Foreground Color Disabled</system:String>
+  <system:String x:Key="themeeditor.foregroundcolorpointerover">Foreground Color Pointer Over</system:String>
+  <system:String x:Key="themeeditor.foregroundcolorpressed">Foreground Color Pressed</system:String>
+  <system:String x:Key="themeeditor.isdarkmode">Is Darkmode</system:String>
+  <system:String x:Key="themeeditor.neutralaccentcolor">Neutral Accent Color</system:String>
+  <system:String x:Key="themeeditor.neutralaccentcolorpointerover">Neutral Accent Color Pointer Over</system:String>
+  <system:String x:Key="themeeditor.save">Save</system:String>
+  <system:String x:Key="themeeditor.systemaccentcolor">System Accent Color</system:String>
+  <system:String x:Key="themeeditor.systemaccentcolordark">System Accent Color Light</system:String>
+  <system:String x:Key="themeeditor.systemaccentcolorlight">System Accent Color Dark</system:String>
+  <system:String x:Key="themeeditor.trackbackgroundaltcolor">Track Background Alt Color</system:String>
+  <system:String x:Key="themeeditor.ticklinecolor">Tick Line Color</system:String>
+  <system:String x:Key="themeeditor.title">Theme Editor</system:String>
+  <system:String x:Key="themeeditor.whitekeycolorleft">White Key Color Left</system:String>
+  <system:String x:Key="themeeditor.whitekeycolorright">White Key Color Right</system:String>
+  <system:String x:Key="themeeditor.whitekeynamecolor">White Key Name Color</system:String>
 
   <system:String x:Key="tip.aliasbox">Override Alias</system:String>
   <system:String x:Key="tip.exps">Numerical,Options Type
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml b/OpenUtau/Views/EasyThemeEditorWindow.axaml
index e8560dacb..7176dc949 100644
--- a/OpenUtau/Views/EasyThemeEditorWindow.axaml
+++ b/OpenUtau/Views/EasyThemeEditorWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" MinWidth="325" Width="325" Height="500"
+        mc:Ignorable="d" MinWidth="325" Width="325" Height="200"
         x:Class="OpenUtau.App.Views.EasyThemeEditorWindow" WindowStartupLocation="CenterOwner"
         Icon="/Assets/open-utau.ico"
         Title="{DynamicResource easythemeeditor.title}"
@@ -11,16 +11,16 @@
     <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
       <StackPanel Spacing="5">
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="IsDarkMode"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource isdarkmode.title}"/>
           <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkModeEasy}"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="MainColorA"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolora}"/>
           <ColorPicker Color="{Binding MainColorA}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="MainColorB"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolorb}"/>
           <ColorPicker Color="{Binding MainColorB}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
       </StackPanel>
diff --git a/OpenUtau/Views/ThemeEditorWindow.axaml b/OpenUtau/Views/ThemeEditorWindow.axaml
index 88544dfe4..9774cb9d9 100644
--- a/OpenUtau/Views/ThemeEditorWindow.axaml
+++ b/OpenUtau/Views/ThemeEditorWindow.axaml
@@ -11,140 +11,140 @@
     <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
       <StackPanel Spacing="5">
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="IsDarkMode"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.isdarkmode}"/>
           <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkMode}"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BackgroundColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolor}"/>
           <ColorPicker Color="{Binding BackgroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BackgroundColorPointerOver"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpointerover}"/>
           <ColorPicker Color="{Binding BackgroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BackgroundColorPressed"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpressed}"/>
           <ColorPicker Color="{Binding BackgroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BackgroundColorDisabled"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolordisabled}"/>
           <ColorPicker Color="{Binding BackgroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="ForegroundColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolor}"/>
           <ColorPicker Color="{Binding ForegroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="ForegroundColorPointerOver"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpointerover}"/>
           <ColorPicker Color="{Binding ForegroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="ForegroundColorPressed"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpressed}"/>
           <ColorPicker Color="{Binding ForegroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="ForegroundColorDisabled"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolordisabled}"/>
           <ColorPicker Color="{Binding ForegroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BorderColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolor}"/>
           <ColorPicker Color="{Binding BorderColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BorderColorPointerOver"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolorpointerover}"/>
           <ColorPicker Color="{Binding BorderColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="SystemAccentColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolor}"/>
           <ColorPicker Color="{Binding SystemAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="SystemAccentColorLight1"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolorlight}"/>
           <ColorPicker Color="{Binding SystemAccentColorLight1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="SystemAccentColorDark1"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolordark}"/>
           <ColorPicker Color="{Binding SystemAccentColorDark1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="NeutralAccentColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolor}"/>
           <ColorPicker Color="{Binding NeutralAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="NeutralAccentColorPointerOver"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolorpointerover}"/>
           <ColorPicker Color="{Binding NeutralAccentColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="AccentColor1"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolora}"/>
           <ColorPicker Color="{Binding AccentColor1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="AccentColor2"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorb}"/>
           <ColorPicker Color="{Binding AccentColor2}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="AccentColor3"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorc}"/>
           <ColorPicker Color="{Binding AccentColor3}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="TickLineColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.ticklinecolor}"/>
           <ColorPicker Color="{Binding TickLineColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BarNumberColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.barnumbercolor}"/>
           <ColorPicker Color="{Binding BarNumberColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="FinalPitchColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.finalpitchcolor}"/>
           <ColorPicker Color="{Binding FinalPitchColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="TrackBackgroundAltColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.trackbackgroundaltcolor}"/>
           <ColorPicker Color="{Binding TrackBackgroundAltColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="WhiteKeyColorLeft"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorleft}"/>
           <ColorPicker Color="{Binding WhiteKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="WhiteKeyColorRight"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorright}"/>
           <ColorPicker Color="{Binding WhiteKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="WhiteKeyNameColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeynamecolor}"/>
           <ColorPicker Color="{Binding WhiteKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="CenterKeyColorLeft"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorleft}"/>
           <ColorPicker Color="{Binding CenterKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="CenterKeyColorRight"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorright}"/>
           <ColorPicker Color="{Binding CenterKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="CenterKeyNameColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeynamecolor}"/>
           <ColorPicker Color="{Binding CenterKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Separator Margin="0"/>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BlackKeyColorLeft"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorleft}"/>
           <ColorPicker Color="{Binding BlackKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BlackKeyColorRight"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorright}"/>
           <ColorPicker Color="{Binding BlackKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
         <Panel>
-          <TextBlock VerticalAlignment="Center" Text="BlackKeyNameColor"/>
+          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeynamecolor}"/>
           <ColorPicker Color="{Binding BlackKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
         </Panel>
       </StackPanel>

From b7cb849fe9b57a5809e1c72a67caf10fa3c89717 Mon Sep 17 00:00:00 2001
From: Andy Zhang <andyfushan@126.com>
Date: Mon, 1 Jun 2026 21:29:17 +0800
Subject: [PATCH 8/8] Merged the two theme editor windows and added a toggle
 button between the two layouts.

---
 OpenUtau/Strings/Strings.axaml                |   5 +-
 OpenUtau/ViewModels/ThemeEditorViewModel.cs   |   5 +-
 OpenUtau/Views/EasyThemeEditorWindow.axaml    |  33 --
 OpenUtau/Views/EasyThemeEditorWindow.axaml.cs |  47 ---
 OpenUtau/Views/PreferencesDialog.axaml        |  20 +-
 OpenUtau/Views/PreferencesDialog.axaml.cs     |   4 -
 OpenUtau/Views/ThemeEditorWindow.axaml        | 335 ++++++++++--------
 OpenUtau/Views/ThemeEditorWindow.axaml.cs     |  32 ++
 8 files changed, 229 insertions(+), 252 deletions(-)
 delete mode 100644 OpenUtau/Views/EasyThemeEditorWindow.axaml
 delete mode 100644 OpenUtau/Views/EasyThemeEditorWindow.axaml.cs

diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 016c2d914..61f5e0239 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -149,12 +149,10 @@ Do you want to continue by splitting at the nearest position after current playh
   <system:String x:Key="dialogs.transcribe.game.batchduration">Max Batch Duration (s)</system:String>
   <system:String x:Key="dialogs.transcribe.longchunk.message">One or more audio segments are very long and may consume large amount of memory when transcribing. This usually happens when the audio contains accompaniment. Still proceed?</system:String>
 
-  <system:String x:Key="easythemeeditor.cancel">Cancel</system:String>
   <system:String x:Key="easythemeeditor.isdarkmode">Is Dark Mode</system:String>
   <system:String x:Key="easythemeeditor.maincolora">Main Color A</system:String>
   <system:String x:Key="easythemeeditor.maincolorb">Main Color B</system:String>
-  <system:String x:Key="easythemeeditor.save">Save</system:String>
-  <system:String x:Key="easythemeeditor.title">Easy Theme Editor</system:String>
+  <system:String x:Key="easythemeeditor.switch">Switch to Accurate Mode</system:String>
 
   <system:String x:Key="errors.caption">Error</system:String>
   <system:String x:Key="errors.details">Error Details</system:String>
@@ -781,6 +779,7 @@ The voicebank may not work on another OS.</system:String>
   <system:String x:Key="themeeditor.neutralaccentcolor">Neutral Accent Color</system:String>
   <system:String x:Key="themeeditor.neutralaccentcolorpointerover">Neutral Accent Color Pointer Over</system:String>
   <system:String x:Key="themeeditor.save">Save</system:String>
+  <system:String x:Key="themeeditor.switch">Switch to Easy Modemer</system:String>
   <system:String x:Key="themeeditor.systemaccentcolor">System Accent Color</system:String>
   <system:String x:Key="themeeditor.systemaccentcolordark">System Accent Color Light</system:String>
   <system:String x:Key="themeeditor.systemaccentcolorlight">System Accent Color Dark</system:String>
diff --git a/OpenUtau/ViewModels/ThemeEditorViewModel.cs b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
index c8c08ce16..41cb5d340 100644
--- a/OpenUtau/ViewModels/ThemeEditorViewModel.cs
+++ b/OpenUtau/ViewModels/ThemeEditorViewModel.cs
@@ -2,13 +2,14 @@
 using System.IO;
 using System.Text;
 using Avalonia;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
 using Avalonia.Styling;
+using OpenUtau.Colors;
 using OpenUtau.Core;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Serilog;
-using OpenUtau.Colors;
 
 namespace OpenUtau.App.ViewModels {
     public class ThemeEditorStateChangedEvent { }
@@ -63,6 +64,8 @@ public class ThemeEditorViewModel : ViewModelBase {
         [Reactive] public Color MainColorB { get; set; }
         [Reactive] public bool IsDarkModeEasy { get; set; }
 
+        [Reactive] public bool IsEasyMode { get; set; } = true;
+
         public ThemeEditorViewModel(string customThemePath) {
             this.customThemePath = customThemePath;
 
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml b/OpenUtau/Views/EasyThemeEditorWindow.axaml
deleted file mode 100644
index 7176dc949..000000000
--- a/OpenUtau/Views/EasyThemeEditorWindow.axaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" MinWidth="325" Width="325" Height="200"
-        x:Class="OpenUtau.App.Views.EasyThemeEditorWindow" WindowStartupLocation="CenterOwner"
-        Icon="/Assets/open-utau.ico"
-        Title="{DynamicResource easythemeeditor.title}"
-        Closing="WindowClosing" Topmost="True">
-  <Grid RowDefinitions="*,auto" Margin="0,10,0,10">
-    <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
-      <StackPanel Spacing="5">
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource isdarkmode.title}"/>
-          <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkModeEasy}"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolora}"/>
-          <ColorPicker Color="{Binding MainColorA}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolorb}"/>
-          <ColorPicker Color="{Binding MainColorB}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-      </StackPanel>
-    </ScrollViewer>
-    <Grid Grid.Row="1" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*" Margin="10,0,10,0">
-      <Button Grid.Column="0" Content="{DynamicResource easythemeeditor.cancel}" HorizontalAlignment="Stretch" Click="OnCancel" />
-      <Button Grid.Column="2" Content="{DynamicResource easythemeeditor.save}" HorizontalAlignment="Stretch" Click="OnSave"/>
-    </Grid>
-  </Grid>
-</Window>
diff --git a/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs b/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs
deleted file mode 100644
index 5752e13ca..000000000
--- a/OpenUtau/Views/EasyThemeEditorWindow.axaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Linq;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Interactivity;
-using OpenUtau.App.ViewModels;
-using ReactiveUI;
-
-namespace OpenUtau.App.Views {
-    public partial class EasyThemeEditorWindow : Window{
-
-        private static EasyThemeEditorWindow? _instance;
-
-        public static bool IsOpen => _instance != null;
-
-        private EasyThemeEditorWindow(string customThemePath) {
-            InitializeComponent();
-            DataContext = new ThemeEditorViewModel(customThemePath);
-        }
-
-        void OnCancel(object? sender, RoutedEventArgs e) {
-            Close();
-        }
-
-        void OnSave(object? sender, RoutedEventArgs e) {
-            (DataContext as ThemeEditorViewModel)!.Save();
-            Close();
-        }
-
-        void WindowClosing(object? sender, WindowClosingEventArgs e) {
-            _instance = null;
-            MessageBus.Current.SendMessage(new ThemeEditorStateChangedEvent());
-            App.SetTheme();
-        }
-
-        public static void Show(string customThemePath) {
-            if (_instance == null) {
-                _instance = new EasyThemeEditorWindow(customThemePath);
-                _instance.Show();
-                MessageBus.Current.SendMessage(new ThemeEditorStateChangedEvent());
-            } else {
-                _instance.Activate();
-            }
-        }
-    }
-}
-
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 8d7cbc6ac..e116bbe34 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -216,23 +216,9 @@
         <!-- Appearance -->
         <StackPanel>
           <TextBlock Text="{DynamicResource prefs.appearance.theme}" Margin="0,10,0,0"/>
-          <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,auto,auto,auto,auto">
+          <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,auto,auto,auto">
             <ComboBox Grid.Column="0" IsEnabled="{Binding !IsThemeEditorOpen}" ItemsSource="{Binding ThemeItems}" SelectedItem="{Binding ThemeName}"/>
             <Button Grid.Column="1" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" MinWidth="18" MinHeight="18" 
-                Click="OpenEasyCustomThemeEditor" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.easyedit.title}">
-                <Grid Width="18" Height="18">
-                  <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
-                      Classes="filled" Data="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c0.55,0,1-0.45,1-1c0-0.26-0.1-0.5-0.27-0.68c-0.17-0.18-0.27-0.42-0.27-0.68 c0-0.28,0.09-0.54,0.27-0.73c0.17-0.18,0.4-0.28,0.66-0.28H15c3.31,0,6-2.69,6-6C21,5.79,17.21,2,12,2z M6.5,13 C5.67,13,5,12.33,5,11.5S5.67,10,6.5,10S8,10.67,8,11.5S7.33,13,6.5,13z M9.5,9C8.67,9,8,8.33,8,7.5S8.67,6,9.5,6 S11,6.67,11,7.5S10.33,9,9.5,9z M14.5,9C13.67,9,13,8.33,13,7.5S13.67,6,14.5,6S16,6.67,16,7.5S15.33,9,14.5,9z M17.5,13 C16.67,13,16,12.33,16,11.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S18.33,13,17.5,13z" >
-                    <Path.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                        <TranslateTransform X="-2" Y="-2"/>
-                      </TransformGroup>
-                    </Path.RenderTransform>
-                  </Path>
-                </Grid>
-            </Button>
-            <Button Grid.Column="2" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" MinWidth="18" MinHeight="18" 
                 Click="OpenCustomThemeEditor" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.edit.title}">
                 <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
@@ -246,14 +232,14 @@
                   </Path>
                 </Grid>
             </Button>
-            <Button Grid.Column="3" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" Click="OnCustomThemeDelete"
+            <Button Grid.Column="2" IsEnabled="{Binding !IsThemeEditorOpen}" IsVisible="{Binding ThemeEditable}" Click="OnCustomThemeDelete"
                 MinWidth="18" MinHeight="18" Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.delete.title}">
               <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
                     Data="M7.03 2.81c-.23 0-.38.17-.38.37v1.27h-2.65c-.19 0-.38.17-.38.37v.29c0 .21.19.37.38.37h.26v8.9c0 .21.19.37.38.37h8.7c.23 0 .38-.17.38-.42V5.68h.26c.23 0 .38-.17.38-.37v-.29c0-.21-.15-.42-.38-.42h-2.65V3.22c0-.21-.15-.42-.38-.42H7.05zm.76 1.04h2.42v.75h-2.38v-.75zm-2.49 1.79h7.4v8.23H5.29V6.28zm1.82 1.49a.38.38 0 0 0-.38.42v4.32c0 .21.19.42.38.42h.42a.38.38 0 0 0 .38-.42V7.77a.38.38 0 0 0-.38-.42h-.42zm3.37 0a.38.38 0 0 0-.38.42v4.32c0 .21.15.42.38.42h.38a.38.38 0 0 0 .38-.42V7.77a.38.38 0 0 0-.38-.42h-.38z" />
               </Grid>
             </Button>
-            <Button Grid.Column="4" IsEnabled="{Binding !IsThemeEditorOpen}" Click="OnCustomThemeCreate" MinWidth="18" MinHeight="18"
+            <Button Grid.Column="3" IsEnabled="{Binding !IsThemeEditorOpen}" Click="OnCustomThemeCreate" MinWidth="18" MinHeight="18"
                 Margin="5,0,0,0" Padding="0" ToolTip.Tip="{DynamicResource prefs.appearance.customtheme.create.title}" >
               <Grid Width="18" Height="18">
                   <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index 5b65452ca..ccb1841bd 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -120,10 +120,6 @@ void DetectWinePath(object sender, RoutedEventArgs e) {
             ((PreferencesViewModel)DataContext!).SetWinePath(winePath);
         }
 
-        void OpenEasyCustomThemeEditor(object sender, RoutedEventArgs e) {
-            EasyThemeEditorWindow.Show(CustomTheme.Themes[viewModel!.ThemeName]);
-        }
-
         void OpenCustomThemeEditor(object sender, RoutedEventArgs e) {
             ThemeEditorWindow.Show(CustomTheme.Themes[viewModel!.ThemeName]);
         }
diff --git a/OpenUtau/Views/ThemeEditorWindow.axaml b/OpenUtau/Views/ThemeEditorWindow.axaml
index 9774cb9d9..b194919c3 100644
--- a/OpenUtau/Views/ThemeEditorWindow.axaml
+++ b/OpenUtau/Views/ThemeEditorWindow.axaml
@@ -1,157 +1,198 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="using:OpenUtau.App.Views"
+        xmlns:vm="using:OpenUtau.App.ViewModels"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" MinWidth="325" Width="325" Height="500"
         x:Class="OpenUtau.App.Views.ThemeEditorWindow" WindowStartupLocation="CenterOwner"
         Icon="/Assets/open-utau.ico"
         Title="{DynamicResource themeeditor.title}"
         Closing="WindowClosing" Topmost="True">
-  <Grid RowDefinitions="*,auto" Margin="0,10,0,10">
-    <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
-      <StackPanel Spacing="5">
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.isdarkmode}"/>
-          <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkMode}"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolor}"/>
-          <ColorPicker Color="{Binding BackgroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpointerover}"/>
-          <ColorPicker Color="{Binding BackgroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpressed}"/>
-          <ColorPicker Color="{Binding BackgroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolordisabled}"/>
-          <ColorPicker Color="{Binding BackgroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolor}"/>
-          <ColorPicker Color="{Binding ForegroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpointerover}"/>
-          <ColorPicker Color="{Binding ForegroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpressed}"/>
-          <ColorPicker Color="{Binding ForegroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolordisabled}"/>
-          <ColorPicker Color="{Binding ForegroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolor}"/>
-          <ColorPicker Color="{Binding BorderColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolorpointerover}"/>
-          <ColorPicker Color="{Binding BorderColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolor}"/>
-          <ColorPicker Color="{Binding SystemAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolorlight}"/>
-          <ColorPicker Color="{Binding SystemAccentColorLight1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolordark}"/>
-          <ColorPicker Color="{Binding SystemAccentColorDark1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolor}"/>
-          <ColorPicker Color="{Binding NeutralAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolorpointerover}"/>
-          <ColorPicker Color="{Binding NeutralAccentColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolora}"/>
-          <ColorPicker Color="{Binding AccentColor1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorb}"/>
-          <ColorPicker Color="{Binding AccentColor2}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorc}"/>
-          <ColorPicker Color="{Binding AccentColor3}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.ticklinecolor}"/>
-          <ColorPicker Color="{Binding TickLineColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.barnumbercolor}"/>
-          <ColorPicker Color="{Binding BarNumberColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.finalpitchcolor}"/>
-          <ColorPicker Color="{Binding FinalPitchColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.trackbackgroundaltcolor}"/>
-          <ColorPicker Color="{Binding TrackBackgroundAltColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorleft}"/>
-          <ColorPicker Color="{Binding WhiteKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorright}"/>
-          <ColorPicker Color="{Binding WhiteKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeynamecolor}"/>
-          <ColorPicker Color="{Binding WhiteKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorleft}"/>
-          <ColorPicker Color="{Binding CenterKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorright}"/>
-          <ColorPicker Color="{Binding CenterKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeynamecolor}"/>
-          <ColorPicker Color="{Binding CenterKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Separator Margin="0"/>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorleft}"/>
-          <ColorPicker Color="{Binding BlackKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorright}"/>
-          <ColorPicker Color="{Binding BlackKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-        <Panel>
-          <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeynamecolor}"/>
-          <ColorPicker Color="{Binding BlackKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
-        </Panel>
-      </StackPanel>
-    </ScrollViewer>
-    <Grid Grid.Row="1" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*" Margin="10,0,10,0">
-      <Button Grid.Column="0" Content="{DynamicResource themeeditor.cancel}" HorizontalAlignment="Stretch" Click="OnCancel" />
-      <Button Grid.Column="2" Content="{DynamicResource themeeditor.save}" HorizontalAlignment="Stretch" Click="OnSave"/>
-    </Grid>
-  </Grid>
+  <ContentControl x:Name="ContentControl"/>
+  <Window.Resources>
+    <DataTemplate x:Key="EasyMode" DataType="{x:Type vm:ThemeEditorViewModel}">
+      <Grid RowDefinitions="*,auto" Margin="0,10,0,10">
+        <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
+          <StackPanel Spacing="5">
+            <Panel>
+                <Button Content="{DynamicResource easythemeeditor.switch}" Click="SwitchToAccurateMode"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.isdarkmode}"/>
+              <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkModeEasy}"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolora}"/>
+              <ColorPicker Color="{Binding MainColorA}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource easythemeeditor.maincolorb}"/>
+              <ColorPicker Color="{Binding MainColorB}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+          </StackPanel>
+        </ScrollViewer>
+        <Grid Grid.Row="1" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*" Margin="10,0,10,0">
+          <Button Grid.Column="0" Content="{DynamicResource themeeditor.cancel}" HorizontalAlignment="Stretch" Click="OnCancel" />
+          <Button Grid.Column="2" Content="{DynamicResource themeeditor.save}" HorizontalAlignment="Stretch" Click="OnSave"/>
+        </Grid>
+      </Grid>
+    </DataTemplate>
+    <DataTemplate x:Key="AccurateMode" DataType="{x:Type vm:ThemeEditorViewModel}">
+      <Grid RowDefinitions="*,auto" Margin="0,10,0,10">
+        <ScrollViewer Grid.Row="0" Padding="10,0,10,0">
+          <StackPanel Spacing="5">
+            <Panel>
+                <Button Content="{DynamicResource themeeditor.switch}" Click="SwitchToEasyMode"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.isdarkmode}"/>
+              <ToggleSwitch HorizontalAlignment="Right" IsChecked="{Binding IsDarkMode}"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolor}"/>
+              <ColorPicker Color="{Binding BackgroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpointerover}"/>
+              <ColorPicker Color="{Binding BackgroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolorpressed}"/>
+              <ColorPicker Color="{Binding BackgroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.backgroundcolordisabled}"/>
+              <ColorPicker Color="{Binding BackgroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolor}"/>
+              <ColorPicker Color="{Binding ForegroundColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpointerover}"/>
+              <ColorPicker Color="{Binding ForegroundColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolorpressed}"/>
+              <ColorPicker Color="{Binding ForegroundColorPressed}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.foregroundcolordisabled}"/>
+              <ColorPicker Color="{Binding ForegroundColorDisabled}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolor}"/>
+              <ColorPicker Color="{Binding BorderColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.bordercolorpointerover}"/>
+              <ColorPicker Color="{Binding BorderColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolor}"/>
+              <ColorPicker Color="{Binding SystemAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolorlight}"/>
+              <ColorPicker Color="{Binding SystemAccentColorLight1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.systemaccentcolordark}"/>
+              <ColorPicker Color="{Binding SystemAccentColorDark1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolor}"/>
+              <ColorPicker Color="{Binding NeutralAccentColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.neutralaccentcolorpointerover}"/>
+              <ColorPicker Color="{Binding NeutralAccentColorPointerOver}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolora}"/>
+              <ColorPicker Color="{Binding AccentColor1}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorb}"/>
+              <ColorPicker Color="{Binding AccentColor2}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.accentcolorc}"/>
+              <ColorPicker Color="{Binding AccentColor3}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.ticklinecolor}"/>
+              <ColorPicker Color="{Binding TickLineColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.barnumbercolor}"/>
+              <ColorPicker Color="{Binding BarNumberColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.finalpitchcolor}"/>
+              <ColorPicker Color="{Binding FinalPitchColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.trackbackgroundaltcolor}"/>
+              <ColorPicker Color="{Binding TrackBackgroundAltColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorleft}"/>
+              <ColorPicker Color="{Binding WhiteKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeycolorright}"/>
+              <ColorPicker Color="{Binding WhiteKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.whitekeynamecolor}"/>
+              <ColorPicker Color="{Binding WhiteKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorleft}"/>
+              <ColorPicker Color="{Binding CenterKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeycolorright}"/>
+              <ColorPicker Color="{Binding CenterKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.centerkeynamecolor}"/>
+              <ColorPicker Color="{Binding CenterKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Separator Margin="0"/>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorleft}"/>
+              <ColorPicker Color="{Binding BlackKeyColorLeft}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeycolorright}"/>
+              <ColorPicker Color="{Binding BlackKeyColorRight}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+            <Panel>
+              <TextBlock VerticalAlignment="Center" Text="{DynamicResource themeeditor.blackkeynamecolor}"/>
+              <ColorPicker Color="{Binding BlackKeyNameColor}" ColorSpectrumShape="Ring" HorizontalAlignment="Right"/>
+            </Panel>
+          </StackPanel>
+        </ScrollViewer>
+        <Grid Grid.Row="1" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*" Margin="10,0,10,0">
+          <Button Grid.Column="0" Content="{DynamicResource themeeditor.cancel}" HorizontalAlignment="Stretch" Click="OnCancel" />
+          <Button Grid.Column="2" Content="{DynamicResource themeeditor.save}" HorizontalAlignment="Stretch" Click="OnSave"/>
+        </Grid>
+      </Grid>
+    </DataTemplate>
+  </Window.Resources>
 </Window>
+
diff --git a/OpenUtau/Views/ThemeEditorWindow.axaml.cs b/OpenUtau/Views/ThemeEditorWindow.axaml.cs
index f75a864c6..83ffadd04 100644
--- a/OpenUtau/Views/ThemeEditorWindow.axaml.cs
+++ b/OpenUtau/Views/ThemeEditorWindow.axaml.cs
@@ -3,6 +3,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml.Templates;
 using OpenUtau.App.ViewModels;
 using ReactiveUI;
 
@@ -16,6 +17,37 @@ public partial class ThemeEditorWindow : Window {
         private ThemeEditorWindow(string customThemePath) {
             InitializeComponent();
             DataContext = new ThemeEditorViewModel(customThemePath);
+            UpdateTemplate();
+            if (DataContext is ThemeEditorViewModel vm) {
+                vm.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(ThemeEditorViewModel.IsEasyMode)) {
+                        UpdateTemplate();
+                    }
+                };
+            }
+        }
+
+        private void UpdateTemplate() {
+            if (DataContext is ThemeEditorViewModel vm && ContentControl != null) {
+                var template = vm.IsEasyMode
+                    ? this.FindResource("EasyMode") as DataTemplate
+                    : this.FindResource("AccurateMode") as DataTemplate;
+                ContentControl.ContentTemplate = template;
+                ContentControl.Content = vm;
+            }
+        }
+
+        void SwitchToAccurateMode(object? sender, RoutedEventArgs e) {
+            if (DataContext is ThemeEditorViewModel vm) {
+                vm.IsEasyMode = false;
+            }
+        }
+
+        void SwitchToEasyMode(object? sender, RoutedEventArgs e) {
+            if (DataContext is ThemeEditorViewModel vm) {
+                vm.IsEasyMode = true;
+            }
         }
 
         void OnCancel(object? sender, RoutedEventArgs e) {