From e5aa76e51e7860ad3e51ff88381d0bff3d2a7cef Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sun, 3 May 2026 14:06:47 +0800
Subject: [PATCH 01/22] Add Keyboard Shortcut Remapper

---
 OpenUtau.Core/Util/Preferences.cs           | 119 +++-
 OpenUtau/Controls/PianoRoll.axaml           | 216 ++++--
 OpenUtau/Controls/PianoRoll.axaml.cs        | 739 +++++---------------
 OpenUtau/Strings/Strings.axaml              | 128 +++-
 OpenUtau/ViewModels/KeyTranslator.cs        |  65 ++
 OpenUtau/ViewModels/PianoRollViewModel.cs   |  17 +
 OpenUtau/ViewModels/PreferencesViewModel.cs | 146 ++++
 OpenUtau/Views/PreferencesDialog.axaml      | 106 ++-
 OpenUtau/Views/PreferencesDialog.axaml.cs   |  32 +
 9 files changed, 882 insertions(+), 686 deletions(-)
 create mode 100644 OpenUtau/ViewModels/KeyTranslator.cs

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index ef576bf9f..88c06a5d5 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -7,6 +7,7 @@
 using Newtonsoft.Json;
 using OpenUtau.Core.Render;
 using Serilog;
+using System.Collections.Generic;
 
 namespace OpenUtau.Core.Util {
 
@@ -16,7 +17,11 @@ public static class Preferences {
         static Preferences() {
             Load();
         }
-
+        public class ShortcutBinding {
+            public string ActionId { get; set; }
+            public string KeyName { get; set; } 
+            public string ModifiersName { get; set; }
+        }
         public static void Save() {
             try {
                 File.WriteAllText(PathManager.Inst.PrefsFilePath,
@@ -214,6 +219,118 @@ public class SerializablePreferences {
             public bool LockUnselectedNotesPitch = true;
             public bool LockUnselectedNotesVibrato = true;
             public bool LockUnselectedNotesExpressions = true;
+            [JsonProperty(ObjectCreationHandling = ObjectCreationHandling.Replace)]
+            public List<ShortcutBinding> Shortcuts { get; set; } = new List<ShortcutBinding> {
+                // Playback & Selection
+                new ShortcutBinding { ActionId = "PlayOrPause", KeyName = "Space", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "PlaySelection", KeyName = "Space", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ClearSelection", KeyName = "Escape", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "SelectAll", KeyName = "A", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "DeselectAll", KeyName = "D", ModifiersName = "Control" },
+
+                // UI & Windows
+                new ShortcutBinding { ActionId = "HideDetachedWindow", KeyName = "F4", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "FullScreen", KeyName = "F11", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "OpenPluginMenu", KeyName = "N", ModifiersName = "None" },
+
+                // Lyrics
+                new ShortcutBinding { ActionId = "EditLyrics", KeyName = "Enter", ModifiersName = "None" },
+
+                // Tools
+                new ShortcutBinding { ActionId = "ToolSelect1", KeyName = "D1", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToolSelect2Main", KeyName = "D2", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToolSelect2Alt", KeyName = "D2", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "ToolSelect3", KeyName = "D3", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToolSelect4Main", KeyName = "D4", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToolSelect4Overwrite", KeyName = "D4", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "ToolSelect4Line", KeyName = "D4", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "ToolSelect4LineOverwrite", KeyName = "D4", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "ToolSelect5", KeyName = "D5", ModifiersName = "None" },
+
+                // Expressions
+                new ShortcutBinding { ActionId = "ExpSelect1", KeyName = "D1", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect2", KeyName = "D2", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect3", KeyName = "D3", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect4", KeyName = "D4", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect5", KeyName = "D5", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect6", KeyName = "D6", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect7", KeyName = "D7", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect8", KeyName = "D8", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect9", KeyName = "D9", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ExpSelect10", KeyName = "D0", ModifiersName = "Alt" },
+
+                // Toggles
+                new ShortcutBinding { ActionId = "ToggleFinalPitch", KeyName = "R", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToggleTips", KeyName = "T", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToggleVibrato", KeyName = "U", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "TogglePitch", KeyName = "I", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "TogglePhoneme", KeyName = "O", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToggleExpressions", KeyName = "L", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToggleSnap", KeyName = "P", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "OpenSnapMenu", KeyName = "P", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ToggleNoteParams", KeyName = "OemPipe", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "TogglePlayTone", KeyName = "Y", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ToggleWaveform", KeyName = "W", ModifiersName = "None" },
+
+                // Transposition
+                new ShortcutBinding { ActionId = "TransposeUp", KeyName = "Up", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "TransposeOctaveUp", KeyName = "Up", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "TransposeDown", KeyName = "Down", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "TransposeOctaveDown", KeyName = "Down", ModifiersName = "Control" },
+
+                // Note Movement & Sizing
+                new ShortcutBinding { ActionId = "MoveCursorLeft", KeyName = "Left", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ResizeNotesLeft", KeyName = "Left", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "MoveNotesLeft", KeyName = "Left", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "ExtendSelectionLeft", KeyName = "Left", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "MoveCursorRight", KeyName = "Right", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ResizeNotesRight", KeyName = "Right", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "MoveNotesRight", KeyName = "Right", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "ExtendSelectionRight", KeyName = "Right", ModifiersName = "Shift" },
+
+                // Edit Operations
+                new ShortcutBinding { ActionId = "Undo", KeyName = "Z", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "Redo", KeyName = "Y", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "Copy", KeyName = "C", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "Cut", KeyName = "X", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "Paste", KeyName = "V", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "PastePlain", KeyName = "V", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "PasteParameters", KeyName = "V", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "InsertNote", KeyName = "Insert", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "DeleteNotes", KeyName = "Delete", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "MergeNotes", KeyName = "U", ModifiersName = "Control" },
+
+                // Playhead & Timeline Navigation
+                new ShortcutBinding { ActionId = "PlayheadHome", KeyName = "Home", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "SelectToStart", KeyName = "Home", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "PlayheadEnd", KeyName = "End", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "SelectToEnd", KeyName = "End", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "PlayheadLeft", KeyName = "OemOpenBrackets", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "PlayheadToSelectionStart", KeyName = "OemOpenBrackets", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "PlayheadToViewStart", KeyName = "OemOpenBrackets", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "PlayheadRight", KeyName = "OemCloseBrackets", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "PlayheadToSelectionEnd", KeyName = "OemCloseBrackets", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "PlayheadToViewEnd", KeyName = "OemCloseBrackets", ModifiersName = "Shift" },
+
+                // Scrolling & Zooming
+                new ShortcutBinding { ActionId = "ScrollLeft", KeyName = "A", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ScrollRight", KeyName = "D", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ScrollUp", KeyName = "W", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ScrollDown", KeyName = "S", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "ZoomIn", KeyName = "E", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "ZoomOut", KeyName = "Q", ModifiersName = "None" },
+
+                // Track & Project Operations
+                new ShortcutBinding { ActionId = "SaveProject", KeyName = "S", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "SoloTrack", KeyName = "S", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "MuteTrack", KeyName = "M", ModifiersName = "Shift" },
+                new ShortcutBinding { ActionId = "FocusSelection", KeyName = "F", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "SearchNote", KeyName = "F", ModifiersName = "Control" },
+
+                // Parts Navigation
+                new ShortcutBinding { ActionId = "MoveToNextPartUp", KeyName = "PageUp", ModifiersName = "None" },
+                new ShortcutBinding { ActionId = "MoveToNextPartDown", KeyName = "PageDown", ModifiersName = "None" }
+            };
             public bool VoicebankPublishUseIgnore = true;
             public string VoicebankPublishIgnores = @"#Adobe Audition
 *.pkf
diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index c599bb633..4f89820cc 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -214,17 +214,17 @@
             </Menu.Styles>
 
             <MenuItem Header="{DynamicResource menu.edit}">
-              <MenuItem Header="{Binding UndoText}" InputGesture="Ctrl+Z" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
-              <MenuItem Header="{Binding RedoText}" InputGesture="Ctrl+Y" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
+              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
+              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="Ctrl+X" Command="{Binding Cut}"/>
-              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="Ctrl+C" Command="{Binding Copy}"/>
-              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="Ctrl+V" Command="{Binding Paste}"/>
-              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="Ctrl+Shift+V" Command="{Binding PastePlain}"/>
-              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="Delete" Command="{Binding Delete}"/>
+              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding Hotkeys[Cut]}" Command="{Binding Cut}"/>
+              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding Hotkeys[Copy]}" Command="{Binding Copy}"/>
+              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding Hotkeys[Paste]}" Command="{Binding Paste}"/>
+              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding Hotkeys[PastePlain]}" Command="{Binding PastePlain}"/>
+              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding Hotkeys[DeleteNotes]}" Command="{Binding Delete}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="Ctrl+F" Click="OnMenuSearchNote"/>
-              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="Ctrl+A" Command="{Binding SelectAll}"/>
+              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding Hotkeys[SearchNote]}" Click="OnMenuSearchNote"/>
+              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding Hotkeys[SelectAll]}" Command="{Binding SelectAll}"/>
               <MenuItem Header="-" Height="1"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.singer}" Click="OnMenuSingers"/>
               <MenuItem Header="{DynamicResource menu.edit.lockunselectednotes}">
@@ -267,7 +267,7 @@
                   <CheckBox IsChecked="{Binding UseTrackColor}" />
                 </MenuItem.Icon>
               </MenuItem>
-              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="F11" Click="OnMenuFullScreen"/>
+              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[FullScreen]}" Click="OnMenuFullScreen"/>
               <MenuItem Header="{DynamicResource prefs.appearance.degree}">
                 <MenuItem Header="{DynamicResource prefs.appearance.degree.off}" Click="OnMenuDegreeStyle" Tag="0">
                   <MenuItem.Icon>
@@ -336,14 +336,19 @@
               <MenuItem Header="{DynamicResource pianoroll.menu.external}" ItemsSource="{Binding ExternalBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" Classes="MenuItemWithSubMenu"/>
             </MenuItem>
-            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" Click="OnMenuEditLyrics"/>
+            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding Hotkeys[EditLyrics]}" Click="OnMenuEditLyrics"/>
             <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
           </Menu>
         </Border>
         <Border Grid.Column="2">
           <StackPanel Orientation="Horizontal">
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowTips}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tips}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowTips}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.tips}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleTips], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="?" FontWeight="Bold"
                            Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
@@ -352,8 +357,13 @@
             <Border Width="12"/>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.CursorTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="1"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.selectionv2}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="1">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.selectionv2}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect1], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M10.07,14.27C10.57,14.03 11.16,14.25 11.4,14.75L13.7,19.74L15.5,18.89L13.19,13.91C12.95,13.41 13.17,12.81 13.67,12.58L13.95,12.5L16.25,12.05L8,5.12V15.9L9.82,14.43L10.07,14.27M13.64,21.97C13.14,22.21 12.54,22 12.31,21.5L10.13,16.76L7.62,18.78C7.45,18.92 7.24,19 7,19A1,1 0 0,1 6,18V3A1,1 0 0,1 7,2C7.24,2 7.47,2.09 7.64,2.23L7.65,2.22L19.14,11.86C19.57,12.22 19.62,12.85 19.27,13.27C19.12,13.45 18.91,13.57 18.7,13.61L15.54,14.23L17.74,18.96C18,19.46 17.76,20.05 17.26,20.28L13.64,21.97Z" >
                   <Path.RenderTransform>
@@ -367,8 +377,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.PenTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.penv2}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.penv2}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path 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>
@@ -382,8 +397,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.PenPlusTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2+"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.penplus}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="2+">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.penplus}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Alt], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M14.1,9L15,9.9L5.9,19H5V18.1L14.1,9M17.7,3C17.5,3 17.2,3.1 17,3.3L15.2,5.1L18.9,8.9L20.7,7C21.1,6.6 21.1,6 20.7,5.6L18.4,3.3C18.2,3.1 17.9,3 17.7,3M14.1,6.2L3,17.2V21H6.8L17.8,9.9L14.1,6.2M7,2V5H10V7H7V10H5V7H2V5H5V2H7Z" >
                   <Path.RenderTransform>
@@ -397,8 +417,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.EraserTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="3"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.eraser}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="3">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.eraser}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect3], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M16.24,3.56L21.19,8.5C21.97,9.29 21.97,10.55 21.19,11.34L12,20.53C10.44,22.09 7.91,22.09 6.34,20.53L2.81,17C2.03,16.21 2.03,14.95 2.81,14.16L13.41,3.56C14.2,2.78 15.46,2.78 16.24,3.56M4.22,15.58L7.76,19.11C8.54,19.9 9.8,19.9 10.59,19.11L14.12,15.58L9.17,10.63L4.22,15.58Z" >
                   <Path.RenderTransform>
@@ -412,8 +437,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.DrawPitchTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.drawpitch}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.drawpitch}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M9.75 20.85C11.53 20.15 11.14 18.22 10.24 17C9.35 15.75 8.12 14.89 6.88 14.06C6 13.5 5.19 12.8 4.54 12C4.26 11.67 3.69 11.06 4.27 10.94C4.86 10.82 5.88 11.4 6.4 11.62C7.31 12 8.21 12.44 9.05 12.96L10.06 11.26C8.5 10.23 6.5 9.32 4.64 9.05C3.58 8.89 2.46 9.11 2.1 10.26C1.78 11.25 2.29 12.25 2.87 13.03C4.24 14.86 6.37 15.74 7.96 17.32C8.3 17.65 8.71 18.04 8.91 18.5C9.12 18.94 9.07 18.97 8.6 18.97C7.36 18.97 5.81 18 4.8 17.36L3.79 19.06C5.32 20 7.88 21.47 9.75 20.85M20.84 5.25C21.06 5.03 21.06 4.67 20.84 4.46L19.54 3.16C19.33 2.95 18.97 2.95 18.76 3.16L17.74 4.18L19.82 6.26M11 10.92V13H13.08L19.23 6.85L17.15 4.77L11 10.92Z" >
                   <Path.RenderTransform>
@@ -427,8 +457,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.OverwritePitchTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4+"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.overwritepitch}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4+">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.overwritepitch}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Overwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M 19.540126 3.1598821 C 19.330126 2.9498825 18.969979 2.9502481 18.759981 3.1602475 L 17.740128 4.1801 L 19.820028 6.2599998 L 20.840246 5.2500134 C 21.060246 5.0300138 21.060246 4.6700018 20.840246 4.4600022 L 19.540126 3.1598821 Z  M 17.149995 4.7702332 L 11.000186 10.920042 L 11.000186 12.999942 L 13.080086 12.999942 L 19.229895 6.8501331 L 17.149995 4.7702332 Z  M 19.879589 13.222841 L 17.879714 13.222475 L 17.879714 16.222471 L 14.879718 16.222471 L 14.879718 18.222712 L 17.879714 18.222712 L 17.879714 21.222708 L 19.879955 21.222708 L 19.879955 18.222712 L 22.879951 18.222712 L 22.879585 16.222837 L 19.879589 16.222837 L 19.879589 13.222841 Z  M 10.059992 11.260237 C 8.4999952 10.230239 6.499898 9.3198861 4.6399018 9.0498865 C 3.5799038 8.8898869 2.4599531 9.1097532 2.0999539 10.259751 C 1.7799545 11.249749 2.2898688 12.249906 2.8698676 13.029906 C 4.2398648 14.859902 6.369998 15.739794 7.9599948 17.31979 C 8.2999942 17.64979 8.7100549 18.040057 8.9100545 18.500057 C 9.1200541 18.940055 9.0701879 18.969971 8.6001889 18.969971 C 7.3601913 18.969971 5.8099483 17.999985 4.7999503 17.359985 L 3.7899638 19.059861 C 5.3199608 19.999859 7.8801301 21.469991 9.7501265 20.849993 C 11.530123 20.149993 11.139771 18.220057 10.239773 17.000059 C 9.349774 15.750061 8.1202131 14.889988 6.8802155 14.05999 C 6.0002173 13.49999 5.1901443 12.79982 4.5401455 11.999822 C 4.2601461 11.669822 3.6901105 11.059774 4.2701093 10.939774 C 4.8601081 10.819776 5.880071 11.399798 6.40007 11.619798 C 7.3100682 11.999798 8.2100072 12.440113 9.0500056 12.960113 L 10.059992 11.260237 Z" >
                   <Path.RenderTransform>
@@ -442,8 +477,13 @@
             </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.DrawLinePitchTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4++"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.drawlinepitch}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4++">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.drawlinepitch}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Line], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="m 1.9654432,15.883124 a 0.74547489,0.74547489 0 0 0 -0.00284,1.052361 l 4.9071522,4.946703 a 0.74547489,0.74547489 0 0 0 1.0555507,0.0035 L 22.513776,7.3542255 a 0.74547489,0.74547489 0 0 0 0.0024,-1.053823 L 17.585453,1.3481852 a 0.74547489,0.74547489 0 0 0 -1.05524,-0.00189 L 13.795097,4.077798 a 0.74547489,0.74547489 0 0 0 -0.01235,0.00583 l -2.970023,2.9664092 a 0.74547489,0.74547489 0 0 0 -0.0019,0.00148 L 7.8078572,10.05092 a 0.74547489,0.74547489 0 0 0 -4.549e-4,7.9e-5 l -2.9880739,2.98446 a 0.74547489,0.74547489 0 0 0 5.6e-5,3.19e-4 0.74547489,0.74547489 0 0 0 -8.034e-4,2.32e-4 z  m 1.5792305,0.530266 1.8022733,-1.799373 1.4875429,1.472969 9.4e-5,9.4e-5 a 0.74547489,0.74547489 0 0 0 1.0491324,-1.059188 l -1.879e-4,-1.87e-4 -0.00182,-0.0019 -1.4792147,-1.465706 1.9335572,-1.930656 1.5071022,1.492572 A 0.74547489,0.74547489 0 0 0 10.89214,12.062682 l -1.5009923,-1.48671 1.9421273,-1.9392277 1.470447,1.4883567 0.0033,0 2.85e-4,2.87e-4 A 0.74547489,0.74547489 0 0 0 13.868294,9.0814325 L 13.868009,9.0811469 12.38859,7.5827533 14.310718,5.6635241 15.799339,7.1434007 A 0.74547489,0.74547489 0 0 0 16.85022,6.0859614 l -1.480921,-1.472178 1.687093,-1.6841938 3.878195,3.89507 L 7.4011867,20.301022 Z" >
                   <Path.RenderTransform>
@@ -457,8 +497,13 @@
             </ToggleButton>
               <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                             IsChecked="{Binding NotesViewModel.OverwriteLinePitchTool}"
-                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4+++"
-                            ToolTip.Tip="{DynamicResource pianoroll.tool.overwritelinepitch}">
+                            Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="4+++">
+                  <ToolTip.Tip>
+                    <StackPanel>
+                      <TextBlock Text="{DynamicResource pianoroll.tool.overwritelinepitch}"/>
+                      <TextBlock Text="{Binding Hotkeys[ToolSelect4LineOverwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                    </StackPanel>
+                  </ToolTip.Tip>
                   <Grid Width="18" Height="18">
                       <Path Classes="filled" Data="m 19.9854,15.8242 -1.9957,-0.0048 0.0066,2.9938 -2.9938,-0.0066 0.0044,1.9961 2.9938,0.0066 0.0066,2.9938 1.9961,0.0044 -0.0066,-2.9938 2.9938,0.0066 -0.0048,-1.9957 -2.9938,-0.0066 z  m -20.1824,0.2031 c -0.2894,0.2888 -0.2896,0.7584 -0.0004,1.0501 l 4.908,4.9474 c 0.2904,0.293 0.7624,0.2956 1.0533,0.0059 L 20.2879,7.5636 c 0.2902,-0.2891 0.2902,-0.7598 -0,-1.0516 l -4.9315,-4.9529 c -0.2908,-0.2923 -0.7625,-0.2943 -1.053,-0.0043 l -2.723,2.7194 c -0.0041,0.0019 -0.0082,0.0038 -0.0123,0.0058 L 8.6111,7.2333 c -0.0006,0.0005 -0.0013,0.001 -0.0019,0.0015 l -2.9897,2.9861 -0.0005,0.0001 -2.9749,2.9713 0.0001,0.0003 -0.0008,0.0002 z  m 1.5771,0.5327 1.7943,-1.7914 1.4877,1.4732 0.0001,0.0001 c 0.706,0.6815 1.7326,-0.355 1.0445,-1.0545 l -0.0002,-0.0002 -0.0018,-0.0019 -1.4794,-1.466 1.925,-1.9221 1.5073,1.4928 c 0.7061,0.6814 1.7325,-0.3552 1.0443,-1.0547 l -1.5012,-1.487 1.9335,-1.9306 1.4707,1.4885 0.0033,0 0.0003,0.0003 c 0.6955,0.63 1.6751,-0.3338 1.0563,-1.0393 l -0.0003,-0.0003 -1.4797,-1.4986 1.9136,-1.9107 1.4888,1.4801 c 0.7049,0.6818 1.7323,-0.3521 1.0462,-1.0528 L 13.1524,4.8127 14.832,3.136 18.7108,7.0316 5.2372,20.4482 Z" >
                           <Path.RenderTransform>
@@ -472,8 +517,13 @@
               </ToggleButton>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.KnifeTool}"
-                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="5"
-                          ToolTip.Tip="{DynamicResource pianoroll.tool.knife}">
+                          Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="5">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.tool.knife}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect5], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M7.22,11.91C6.89,12.24 6.71,12.65 6.66,13.08L12.17,15.44L20.66,6.96C21.44,6.17 21.44,4.91 20.66,4.13L19.24,2.71C18.46,1.93 17.2,1.93 16.41,2.71L7.22,11.91M5,16V21.75L10.81,16.53L5.81,14.53L5,16M17.12,4.83C17.5,4.44 18.15,4.44 18.54,4.83C18.93,5.23 18.93,5.86 18.54,6.25C18.15,6.64 17.5,6.64 17.12,6.25C16.73,5.86 16.73,5.23 17.12,4.83Z" >
                   <Path.RenderTransform>
@@ -486,8 +536,13 @@
               </Grid>
             </ToggleButton>
             <Border Width="12"/>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.PlayTone}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tone}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.PlayTone}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.tone}"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePlayTone], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M21,3V15.5A3.5,3.5 0 0,1 17.5,19A3.5,3.5 0 0,1 14,15.5A3.5,3.5 0 0,1 17.5,12C18.04,12 18.55,12.12 19,12.34V6.47L9,8.6V17.5A3.5,3.5 0 0,1 5.5,21A3.5,3.5 0 0,1 2,17.5A3.5,3.5 0 0,1 5.5,14C6.04,14 6.55,14.12 7,14.34V6L21,3Z" >
                   <Path.RenderTransform>
@@ -499,8 +554,13 @@
                 </Path>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowVibrato}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.vibrato}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowVibrato}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.vibrato}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleVibrato], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="stroked" Data="M-6.5 1 L-6 1.5 L-4.5 0 L-2 2.5 L0.5 0 L3 2.5 L6.5 -1 L6 -1.5 L4.5 0 L2 -2.5 L-0.5 0 L-3 -2.5 Z">
                   <Path.RenderTransform>
@@ -509,22 +569,37 @@
                 </Path>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPitch}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.pitch}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPitch}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.pitch}"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Ellipse Classes="stroked" Height="4" Width="4" Margin="2,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
                 <Ellipse Classes="stroked" Height="4" Width="4" Margin="0,5,2,0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
                 <Path Classes="stroked" Data="M 6.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 11.5 6.5"/>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowFinalPitch}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.finalpitch}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowFinalPitch}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.finalpitch}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleFinalPitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="stroked" Data="M 5.5 11.5 L 8 11.5 L 8.5 11 L 9.5 7 L 10 6.5 L 12.5 6.5"/>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowWaveform}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.waveform}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowWaveform}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.waveform}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleWaveform], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M22 12L20 13L19 14L18 13L17 16L16 13L15 21L14 13L13 15L12 13L11 17L10 13L9 22L8 13L7 19L6 13L5 14L4 13L2 12L4 11L5 10L6 11L7 5L8 11L9 2L10 11L11 7L12 11L13 9L14 11L15 3L16 11L17 8L18 11L19 10L20 11L22 12Z">
                   <Path.RenderTransform>
@@ -536,14 +611,24 @@
                 </Path>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPhoneme}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.phoneme}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowPhoneme}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.phoneme}"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePhoneme], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="stroked" Data="M 3 13 L 6 5.5 L 12 5.5 L 15 13"/>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.ShowExpressions}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.expressions}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.ShowExpressions}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.expressions}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleExpressions], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Ellipse Classes="stroked" Height="4" Width="4" Margin="4,4,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 <Ellipse Classes="stroked" Height="4" Width="4" Margin="0,6,4,0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
@@ -551,14 +636,24 @@
                 <Path Classes="stroked" Data="M 12 10 V 13.62"/>
               </Grid>
             </ToggleButton>
-            <ToggleButton Name="SnapToggle" Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.IsSnapOn}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.snap}">
+            <ToggleButton Name="SnapToggle" Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.IsSnapOn}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.snap}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleSnap], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Border Width="18" Height="18">
                 <Path Classes="stroked" Data="M 4.5 13.5 L 7.5 13.5 L 7.5 9.5 A 1,1 0 1 1 10.5,9.5 L 10.5 13.5 L 13.5 13.5 L 13.5 8.5 A 1,1 0 1 0 4.5,8.5 Z"/>
               </Border>
             </ToggleButton>
-            <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton"
-              ToolTip.Tip="{DynamicResource pianoroll.snapdiv}">
+            <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.snapdiv}"/>
+                  <TextBlock Text="{Binding Hotkeys[OpenSnapMenu], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
                          TextAlignment="Right" FontSize="10" FontFamily="monospace"
                          Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
@@ -581,8 +676,13 @@
         </Border>
         <Border Grid.Column="4">
           <StackPanel Orientation="Horizontal">
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.noteparams}">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}">
+              <ToolTip.Tip>
+                <StackPanel>
+                  <TextBlock Text="{DynamicResource pianoroll.toggle.noteparams}"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleNoteParams], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                </StackPanel>
+              </ToolTip.Tip>
               <Grid Width="18" Height="18">
                 <Path Classes="filled" Data="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z">
                   <Path.RenderTransform>
@@ -689,18 +789,6 @@
               </Path>
             </Grid>
           </ListBoxItem>
-          <!-- <ListBoxItem Classes="toolbox"> CurveLineTool
-             <Grid Width="18" Height="18">
-                <Path Classes="filled" Data="m 1.9654432,15.883124 a 0.74547489,0.74547489 0 0 0 -0.00284,1.052361 l 4.9071522,4.946703 a 0.74547489,0.74547489 0 0 0 1.0555507,0.0035 L 22.513776,7.3542255 a 0.74547489,0.74547489 0 0 0 0.0024,-1.053823 L 17.585453,1.3481852 a 0.74547489,0.74547489 0 0 0 -1.05524,-0.00189 L 13.795097,4.077798 a 0.74547489,0.74547489 0 0 0 -0.01235,0.00583 l -2.970023,2.9664092 a 0.74547489,0.74547489 0 0 0 -0.0019,0.00148 L 7.8078572,10.05092 a 0.74547489,0.74547489 0 0 0 -4.549e-4,7.9e-5 l -2.9880739,2.98446 a 0.74547489,0.74547489 0 0 0 5.6e-5,3.19e-4 0.74547489,0.74547489 0 0 0 -8.034e-4,2.32e-4 z  m 1.5792305,0.530266 1.8022733,-1.799373 1.4875429,1.472969 9.4e-5,9.4e-5 a 0.74547489,0.74547489 0 0 0 1.0491324,-1.059188 l -1.879e-4,-1.87e-4 -0.00182,-0.0019 -1.4792147,-1.465706 1.9335572,-1.930656 1.5071022,1.492572 A 0.74547489,0.74547489 0 0 0 10.89214,12.062682 l -1.5009923,-1.48671 1.9421273,-1.9392277 1.470447,1.4883567 0.0033,0 2.85e-4,2.87e-4 A 0.74547489,0.74547489 0 0 0 13.868294,9.0814325 L 13.868009,9.0811469 12.38859,7.5827533 14.310718,5.6635241 15.799339,7.1434007 A 0.74547489,0.74547489 0 0 0 16.85022,6.0859614 l -1.480921,-1.472178 1.687093,-1.6841938 3.878195,3.89507 L 7.4011867,20.301022 Z" >
-                  <Path.RenderTransform>
-                    <TransformGroup>
-                      <ScaleTransform ScaleX=".7" ScaleY=".7" />
-                      <TranslateTransform X="-2" Y="-2"/>
-                    </TransformGroup>
-                  </Path.RenderTransform>
-                </Path>
-              </Grid>
-          </ListBoxItem> -->
           <ListBoxItem Classes="toolbox"><!-- CurveEraserTool -->
             <Grid Width="18" Height="18">
               <Path Classes="filled" Data="M16.24,3.56L21.19,8.5C21.97,9.29 21.97,10.55 21.19,11.34L12,20.53C10.44,22.09 7.91,22.09 6.34,20.53L2.81,17C2.03,16.21 2.03,14.95 2.81,14.16L13.41,3.56C14.2,2.78 15.46,2.78 16.24,3.56M4.22,15.58L7.76,19.11C8.54,19.9 9.8,19.9 10.59,19.11L14.12,15.58L9.17,10.63L4.22,15.58Z" >
@@ -778,4 +866,4 @@
       <ProgressBar Grid.Row="6" Grid.ColumnSpan="4" Value="{Binding Progress}" IsVisible="{Binding PianoRollDetached}"/>
     </Grid>
   </Border>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index d1f17dec7..a87e55c51 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -46,6 +46,19 @@ public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
 
         private Window RootWindow => (Window) TopLevel.GetTopLevel(this)!;
 
+        private string? GetActionIdForShortcut(Key key, KeyModifiers modifiers) {
+            var normalizedModifiers = modifiers;
+            if (modifiers == cmdKey) {
+                normalizedModifiers = OS.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
+            }
+
+            // Search the user's saved preferences for a match
+            var binding = Preferences.Default.Shortcuts.FirstOrDefault(
+                s => s.KeyName == key.ToString() && s.ModifiersName == normalizedModifiers.ToString());
+            
+            return binding?.ActionId;
+        }
+
         public PianoRoll(PianoRollViewModel model) {
             InitializeComponent();
             DataContext = ViewModel = model;
@@ -1304,6 +1317,20 @@ void OnKeyDown(object? sender, KeyEventArgs args) {
             args.Handled = OnKeyExtendedHandler(args);
         }
 
+        // ==============================================================================
+        // Hey cadlaxa here, the old hardcoded keyboard shortcuts are now gone
+        // and instead you can add new shortcuts in a more data-driven way
+        // The code below will look up the action ID for the pressed key combination
+        // and then execute the corresponding case in the switch statement.
+        // ==============================================================================
+        // To add a new keyboard shortcut to the Piano Roll:
+        // 
+        // 1. Add a new `case "YourActionName":` inside the switch statement below.
+        // 2. Open `Preferences.cs` and add a default key binding to the `Shortcuts` list
+        //    (e.g., new ShortcutBinding { ActionId = "YourActionName", KeyName = "...", ModifiersName = "..." })
+        // 3. Open `Strings.axaml` (and other language files) and add the display name:
+        //    <system:String x:Key="shortcut.YourActionName">Shortcut Name</system:String>
+
         bool OnKeyExtendedHandler(KeyEventArgs args) {
             var notesVm = ViewModel.NotesViewModel;
             var playVm = ViewModel.PlaybackViewModel;
@@ -1334,574 +1361,158 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
             string mainPenIdx = Preferences.Default.PenPlusDefault ? "2+" : "2";
             string altPenIdx = Preferences.Default.PenPlusDefault ? "2" : "2+";
 
-            switch (args.Key) {
-                #region document keys
-                case Key.Space:
-                    if (isNone) {
-                        playVm.PlayOrPause();
-                        return true;
-                    }
-                    if (isAlt) {
-                        if (!notesVm.Selection.IsEmpty) {
-                            playVm.PlayOrPause(
-                                tick: notesVm.Part.position + notesVm.Selection.FirstOrDefault()!.position,
-                                endTick: notesVm.Part.position + notesVm.Selection.LastOrDefault()!.RightBound
-                            );
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.Escape:
-                    if (isNone) {
-                        // collapse/empty selection
-                        var numSelected = notesVm.Selection.Count;
-                        // if single or all notes then clear
-                        if (numSelected == 1 || numSelected == notesVm.Part.notes.Count) {
-                            notesVm.DeselectNotes();
-                        } else if (numSelected > 1) {
-                            // collapse selection
-                            notesVm.SelectNote(notesVm.Selection.Head!);
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.F4:
-                    if (isAlt) {
-                        if (RootWindow is PianoRollDetachedWindow) {
-                            RootWindow.Hide();
-                        }
-                        return true;
+            string? action = GetActionIdForShortcut(args.Key, args.KeyModifiers);
+
+            switch (action) {
+                // Playback & Selection
+                case "PlayOrPause": playVm.PlayOrPause(); return true;
+                case "PlaySelection":
+                    if (!notesVm.Selection.IsEmpty) {
+                        playVm.PlayOrPause(
+                            tick: notesVm.Part.position + notesVm.Selection.FirstOrDefault()!.position,
+                            endTick: notesVm.Part.position + notesVm.Selection.LastOrDefault()!.RightBound
+                        );
                     }
-                    break;
-                case Key.F11:
-                    OnMenuFullScreen(this, new RoutedEventArgs());
                     return true;
-                case Key.Enter:
-                    if (isNone) {
-                        if (notesVm.Selection.Count == 1) {
-                            var note = notesVm.Selection.First();
-                            LyricBox?.Show(ViewModel.NotesViewModel.Part!, new LyricBoxNote(note), note.lyric);
-                        } else if (notesVm.Selection.Count > 1) {
-                            EditLyrics();
-                        }
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region tool select keys
-                // TOOL SELECT
-                case Key.D1:
-                    if (isNone) {
-                        notesVm.SelectToolCommand?.Execute("1").Subscribe();
-                        return true;
-                    }
-                    if (isAlt) {
-                        expSelector1?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D2:
-                    if (isNone) {
-                        notesVm.SelectToolCommand?.Execute(mainPenIdx).Subscribe();
-                        return true;
-                    }
-                    if (isAlt) {
-                        expSelector2?.SelectExp();
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.SelectToolCommand?.Execute(altPenIdx).Subscribe();
-                        return true;
-                    }
-                    break;
-                case Key.D3:
-                    if (isNone) {
-                        notesVm.SelectToolCommand?.Execute("3").Subscribe();
-                        return true;
-                    }
-                    if (isAlt) {
-                        expSelector3?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D4:
-                    if (isNone) {
-                        notesVm.SelectToolCommand?.Execute("4").Subscribe();
-                        return true;
-                    }
-                    if (isAlt) {
-                        expSelector4?.SelectExp();
-                        return true;
-                    }
-                    if (isBoth) {
-                        notesVm.SelectToolCommand?.Execute("4+++").Subscribe();
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.SelectToolCommand?.Execute("4+").Subscribe();
-                        return true;
-                    }
-                    if (isShift) {
-                        notesVm.SelectToolCommand?.Execute("4++").Subscribe();
-                        return true;
-                    }
-                    break;
-                case Key.D5:
-                    if (isNone) {
-                        notesVm.SelectToolCommand?.Execute("5").Subscribe();
-                        return true;
-                    }
-                    if (isAlt) {
-                        expSelector5?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D6:
-                    if (isAlt) {
-                        expSelector6?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D7:
-                    if (isAlt) {
-                        expSelector7?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D8:
-                    if (isAlt) {
-                        expSelector8?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D9:
-                    if (isAlt) {
-                        expSelector9?.SelectExp();
-                        return true;
-                    }
-                    break;
-                case Key.D0:
-                    if (isAlt) {
-                        expSelector10?.SelectExp();
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region toggle show keyws
-                case Key.R:
-                    if (isNone) {
-                        notesVm.ShowFinalPitch = !notesVm.ShowFinalPitch;
-                        return true;
-                    }
-                    break;
-                case Key.T:
-                    if (isNone) {
-                        notesVm.ShowTips = !notesVm.ShowTips;
-                        return true;
-                    }
-                    break;
-                case Key.U:
-                    if (isNone) {
-                        notesVm.ShowVibrato = !notesVm.ShowVibrato;
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.MergeSelectedNotes();
-                        return true;
-                    }
-                    break;
-                case Key.I:
-                    if (isNone) {
-                        notesVm.ShowPitch = !notesVm.ShowPitch;
-                        return true;
-                    }
-                    break;
-                case Key.O:
-                    if (isNone) {
-                        notesVm.ShowPhoneme = !notesVm.ShowPhoneme;
-                        return true;
-                    }
-                    break;
-                case Key.L:
-                    if (isNone) {
-                        notesVm.ShowExpressions = !notesVm.ShowExpressions;
-                        return true;
-                    }
-                    break;
-                case Key.P:
-                    if (isNone) {
-                        notesVm.IsSnapOn = !notesVm.IsSnapOn;
-                        return true;
-                    }
-                    if (isAlt) {
-                        SnapDivMenu.Open();
-                        return true;
-                    }
-                    break;
-                case Key.OemPipe:
-                    if (isNone) {
-                        notesVm.ShowNoteParams = !notesVm.ShowNoteParams;
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region navigate keys
-                // NAVIGATE/EDIT/SELECT HANDLERS
-                case Key.Up:
-                    if (isNone) {
-                        notesVm.TransposeSelection(1);
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.TransposeSelection(12);
-                        return true;
-                    }
-                    break;
-                case Key.Down:
-                    if (isNone) {
-                        notesVm.TransposeSelection(-1);
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.TransposeSelection(-12);
-                        return true;
-                    }
-                    break;
-                case Key.Left:
-                    if (isNone) {
-                        notesVm.MoveCursor(-1);
-                        return true;
-                    }
-                    if (isAlt) {
-                        notesVm.ResizeSelectedNotes(-1 * deltaTicks);
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.MoveSelectedNotes(-1 * deltaTicks);
-                        return true;
-                    }
-                    if (isShift) {
-                        notesVm.ExtendSelection(-1);
-                        return true;
-                    }
-                    break;
-                case Key.Right:
-                    if (isNone) {
-                        notesVm.MoveCursor(1);
-                        return true;
-                    }
-                    if (isAlt) {
-                        notesVm.ResizeSelectedNotes(deltaTicks);
-                        return true;
-                    }
-                    if (isCtrl) {
-                        notesVm.MoveSelectedNotes(deltaTicks);
-                        return true;
-                    }
-                    if (isShift) {
-                        notesVm.ExtendSelection(1);
-                        return true;
-                    }
-                    break;
-                case Key.OemPlus:
-                    if (isNone) {
-                        notesVm.ResizeSelectedNotes(deltaTicks);
-                        return true;
-                    }
-                    break;
-                case Key.OemMinus:
-                    if (isNone) {
-                        notesVm.ResizeSelectedNotes(-1 * deltaTicks);
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region clipboard and edit keys
-                case Key.Z:
-                    if (isBoth) {
-                        ViewModel.Redo();
-                        return true;
-                    }
-                    if (isCtrl) {
-                        ViewModel.Undo();
-                        return true;
-                    }
-                    break;
-                case Key.Y:
-                    // toggle play tone
-                    if (isNone) {
-                        notesVm.PlayTone = !notesVm.PlayTone;
-                        return true;
-                    }
-                    if (isCtrl) {
-                        ViewModel.Redo();
-                        return true;
-                    }
-                    break;
-                case Key.C:
-                    if (isCtrl) {
-                        if (curveVm.IsSelected(notesVm.PrimaryKey)) {
-                            curveVm.Copy(notesVm.Part);
-                        } else {
-                            notesVm.CopyNotes();
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.X:
-                    if (isCtrl) {
-                        if (curveVm.IsSelected(notesVm.PrimaryKey)) {
-                            curveVm.Cut(notesVm.Part);
-                        } else {
-                            notesVm.CutNotes();
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.V:
-                    if (isBoth) {
-                        notesVm.PastePlainNotes();
-                        return true;
-                    }
-                    if (isCtrl) {
-                        if (DocManager.Inst.NotesClipboard != null && DocManager.Inst.NotesClipboard.Count > 0) {
-                            notesVm.PasteNotes();
-                        } else if (DocManager.Inst.CurvesClipboard != null) {
-                            var track = project.tracks[notesVm.Part.trackNo];
-                            if (track.TryGetExpDescriptor(project, notesVm.PrimaryKey, out var descriptor)) {
-                                curveVm.Paste(notesVm.Part, descriptor);
-                            }
-                        }
-                        return true;
-                    }
-                    if (isAlt) {
-                        notesVm.PasteSelectedParams(RootWindow);
-                        return true;
-                    }
-                    break;
-                case Key.N:
-                    if (isNone && PluginMenu.Parent is MenuItem batch) {
-                        batch.Open();
-                        PluginMenu.Open();
-                        return true;
-                    }
-                    break;
-                // INSERT + DELETE
-                case Key.Insert:
-                    if (isNone) {
-                        notesVm.InsertNote();
-                        return true;
-                    }
-                    break;
-                case Key.Delete:
-                case Key.Back:
-                    if (isNone) {
-                        notesVm.DeleteSelectedNotes();
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region play position and select keys
-                // PLAY POSITION + SELECTION
-                case Key.Home:
-                    if (isNone) {
-                        playVm.MovePlayPos(notesVm.Part.position);
-                        return true;
-                    }
-                    if (isShift) {
-                        var first = notesVm.Part.notes.FirstOrDefault();
-                        if (first != null) {
-                            notesVm.ExtendSelection(first);
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.End:
-                    if (isNone) {
-                        playVm.MovePlayPos(notesVm.Part.End);
-                        HScrollBar.Value = HScrollBar.Maximum;
-                        return true;
-                    }
-                    if (isShift) {
-                        var last = notesVm.Part.notes.LastOrDefault();
-                        if (last != null) {
-                            notesVm.ExtendSelection(last);
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.OemOpenBrackets:
-                    // move playhead left
-                    if (isNone) {
-                        playVm.MovePlayPos(playVm.PlayPosTick - snapUnit);
-                        return true;
-                    }
-                    // to selection start
-                    if (isCtrl) {
-                        if (!notesVm.Selection.IsEmpty) {
-                            playVm.MovePlayPos(notesVm.Part.position + notesVm.Selection.FirstOrDefault()!.position);
-                        }
-                        return true;
-                    }
-                    // to view start
-                    if (isShift) {
-                        playVm.MovePlayPos(notesVm.Part.position + (int)notesVm.TickOffset);
-                        return true;
-                    }
-                    break;
-                case Key.OemCloseBrackets:
-                    // move playhead right
-                    if (isNone) {
-                        playVm.MovePlayPos(playVm.PlayPosTick + snapUnit);
-                        return true;
-                    }
-                    // to selection end
-                    if (isCtrl) {
-                        if (!notesVm.Selection.IsEmpty) {
-                            playVm.MovePlayPos(notesVm.Part.position + notesVm.Selection.LastOrDefault()!.RightBound);
-                        }
-                        return true;
-                    }
-                    // to view end
-                    if (isShift) {
-                        playVm.MovePlayPos(notesVm.Part.position + (int)(notesVm.TickOffset + notesVm.Bounds.Width / notesVm.TickWidth));
-                        return true;
-                    }
-                    break;
-
-                #endregion
-                #region scroll and select keys
-                // SCROLL / SELECT
-                case Key.A:
-                    // scroll left
-                    if (isNone) {
-                        notesVm.TickOffset = Math.Max(0, notesVm.TickOffset - snapUnit);
-                        return true;
-                    }
-                    // select all
-                    if (isCtrl) {
-                        notesVm.SelectAllNotes();
-                        return true;
-                    }
-                    break;
-                case Key.D:
-                    // scroll right
-                    if (isNone) {
-                        notesVm.TickOffset = Math.Min(notesVm.TickOffset + snapUnit, notesVm.HScrollBarMax);
-                        return true;
-                    }
-                    // select none
-                    if (isCtrl) {
-                        notesVm.DeselectNotes();
-                        return true;
-                    }
-                    break;
-                case Key.W:
-                    // toggle show waveform
-                    if (isNone) {
-                        notesVm.ShowWaveform = !notesVm.ShowWaveform;
-                        return true;
-                    }
-                    // scroll up
-                    // NOTE set to alt to avoid conflict with showwaveform toggle
-                    if (isAlt) {
-                        notesVm.TrackOffset = Math.Max(notesVm.TrackOffset - 2, 0);
-                        return true;
-                    }
-                    break;
-                case Key.S:
-                    // scroll down
-                    if (isAlt) {
-                        notesVm.TrackOffset = Math.Min(notesVm.TrackOffset + 2, notesVm.VScrollBarMax);
-                        return true;
-                    }
-                    if (isCtrl) {
-                        _ = MainWindow?.Save();
-                        return true;
-                    }
-                    // solo
-                    if (isShift) {
-                        var track = project.tracks[notesVm.Part.trackNo];
-                        MessageBus.Current.SendMessage(new TracksSoloEvent(notesVm.Part.trackNo, !track.Solo, false));
-                        return true;
-                    }
-                    break;
-                case Key.M:
-                    // mute
-                    if (isShift) {
-                        MessageBus.Current.SendMessage(new TracksMuteEvent(notesVm.Part.trackNo, false));
-                        return true;
-                    }
-                    break;
-                case Key.F:
-                    // scroll selection into focus
-                    if (isNone) {
-                        var note = notesVm.Selection.FirstOrDefault();
-                        if (note != null) {
-                            DocManager.Inst.ExecuteCmd(new FocusNoteNotification(notesVm.Part, note));
-                        }
-                        return true;
-                    }
-                    if (isCtrl) {
-                        SearchNote();
-                        return true;
-                    }
-                    if (isAlt) {
-                        if (!notesVm.Selection.IsEmpty) {
-                            playVm.MovePlayPos(notesVm.Part.position + notesVm.Selection.FirstOrDefault()!.position);
-                        }
-                        return true;
-                    }
-                    break;
-                case Key.E:
-                    // zoom in
-                    if (isNone) {
-                        double x = 0;
-                        double y = 0;
-                        if (!notesVm.Selection.IsEmpty) {
-                            x = (notesVm.Selection.Head!.position - notesVm.TickOffset) / notesVm.ViewportTicks;
-                            y = (ViewConstants.MaxTone - 1 - notesVm.Selection.Head.tone - notesVm.TrackOffset) / notesVm.ViewportTracks;
-                        } else if (notesVm.TickOffset != 0) {
-                            x = 0.5;
-                            y = 0.5;
-                        }
-                        notesVm.OnXZoomed(new Point(x, y), 0.1);
-                        return true;
-                    }
-                    break;
-                case Key.Q:
-                    // zoom out
-                    if (isNone) {
-                        double x = 0;
-                        double y = 0;
-                        if (!notesVm.Selection.IsEmpty) {
-                            x = (notesVm.Selection.Head!.position - notesVm.TickOffset) / notesVm.ViewportTicks;
-                            y = (ViewConstants.MaxTone - 1 - notesVm.Selection.Head.tone - notesVm.TrackOffset) / notesVm.ViewportTracks;
-                        } else if (notesVm.TickOffset != 0) {
-                            x = 0.5;
-                            y = 0.5;
-                        }
-                        notesVm.OnXZoomed(new Point(x, y), -0.1);
-                        return true;
-                    }
-                    break;
-                #endregion
-                #region move to the next track part
-                case Key.PageUp: {
-                        if (isNone) {
-                            MoveToNextPart(false);
-                            return true;
-                        }
+                case "ClearSelection":
+                    var numSelected = notesVm.Selection.Count;
+                    if (numSelected == 1 || numSelected == notesVm.Part.notes.Count) notesVm.DeselectNotes();
+                    else if (numSelected > 1) notesVm.SelectNote(notesVm.Selection.Head!);
+                    return true;
+                case "SelectAll": notesVm.SelectAllNotes(); return true;
+                case "DeselectAll": notesVm.DeselectNotes(); return true;
+
+                // UI & Windows
+                case "HideDetachedWindow": if (RootWindow is PianoRollDetachedWindow) RootWindow.Hide(); return true;
+                case "FullScreen": OnMenuFullScreen(this, new RoutedEventArgs()); return true;
+                case "OpenPluginMenu": if (PluginMenu.Parent is MenuItem batch) { batch.Open(); PluginMenu.Open(); } return true;
+
+                // Lyrics
+                case "EditLyrics":
+                    if (notesVm.Selection.Count == 1) {
+                        var note = notesVm.Selection.First();
+                        LyricBox?.Show(ViewModel.NotesViewModel.Part!, new LyricBoxNote(note), note.lyric);
+                    } else if (notesVm.Selection.Count > 1) {
+                        EditLyrics();
                     }
-                    break;
-                    case Key.PageDown: {
-                        if (isNone) {
-                            MoveToNextPart(true);
-                            return true;
-                        }
+                    return true;
+
+                // Tools
+                case "ToolSelect1": notesVm.SelectToolCommand?.Execute("1").Subscribe(); return true;
+                case "ToolSelect2Main": notesVm.SelectToolCommand?.Execute(mainPenIdx).Subscribe(); return true;
+                case "ToolSelect2Alt": notesVm.SelectToolCommand?.Execute(altPenIdx).Subscribe(); return true;
+                case "ToolSelect3": notesVm.SelectToolCommand?.Execute("3").Subscribe(); return true;
+                case "ToolSelect4Main": notesVm.SelectToolCommand?.Execute("4").Subscribe(); return true;
+                case "ToolSelect4Overwrite": notesVm.SelectToolCommand?.Execute("4+").Subscribe(); return true;
+                case "ToolSelect4Line": notesVm.SelectToolCommand?.Execute("4++").Subscribe(); return true;
+                case "ToolSelect4LineOverwrite": notesVm.SelectToolCommand?.Execute("4+++").Subscribe(); return true;
+                case "ToolSelect5": notesVm.SelectToolCommand?.Execute("5").Subscribe(); return true;
+
+                // Expressions
+                case "ExpSelect1": expSelector1?.SelectExp(); return true;
+                case "ExpSelect2": expSelector2?.SelectExp(); return true;
+                case "ExpSelect3": expSelector3?.SelectExp(); return true;
+                case "ExpSelect4": expSelector4?.SelectExp(); return true;
+                case "ExpSelect5": expSelector5?.SelectExp(); return true;
+                case "ExpSelect6": expSelector6?.SelectExp(); return true;
+                case "ExpSelect7": expSelector7?.SelectExp(); return true;
+                case "ExpSelect8": expSelector8?.SelectExp(); return true;
+                case "ExpSelect9": expSelector9?.SelectExp(); return true;
+                case "ExpSelect10": expSelector10?.SelectExp(); return true;
+
+                // Toggles
+                case "ToggleFinalPitch": notesVm.ShowFinalPitch = !notesVm.ShowFinalPitch; return true;
+                case "ToggleTips": notesVm.ShowTips = !notesVm.ShowTips; return true;
+                case "ToggleVibrato": notesVm.ShowVibrato = !notesVm.ShowVibrato; return true;
+                case "TogglePitch": notesVm.ShowPitch = !notesVm.ShowPitch; return true;
+                case "TogglePhoneme": notesVm.ShowPhoneme = !notesVm.ShowPhoneme; return true;
+                case "ToggleExpressions": notesVm.ShowExpressions = !notesVm.ShowExpressions; return true;
+                case "ToggleSnap": notesVm.IsSnapOn = !notesVm.IsSnapOn; return true;
+                case "OpenSnapMenu": SnapDivMenu.Open(); return true;
+                case "ToggleNoteParams": notesVm.ShowNoteParams = !notesVm.ShowNoteParams; return true;
+                case "TogglePlayTone": notesVm.PlayTone = !notesVm.PlayTone; return true;
+                case "ToggleWaveform": notesVm.ShowWaveform = !notesVm.ShowWaveform; return true;
+
+                // Transposition
+                case "TransposeUp": notesVm.TransposeSelection(1); return true;
+                case "TransposeOctaveUp": notesVm.TransposeSelection(12); return true;
+                case "TransposeDown": notesVm.TransposeSelection(-1); return true;
+                case "TransposeOctaveDown": notesVm.TransposeSelection(-12); return true;
+
+                // Note Movement & Sizing
+                case "MoveCursorLeft": notesVm.MoveCursor(-1); return true;
+                case "ResizeNotesLeft": notesVm.ResizeSelectedNotes(-1 * deltaTicks); return true;
+                case "MoveNotesLeft": notesVm.MoveSelectedNotes(-1 * deltaTicks); return true;
+                case "ExtendSelectionLeft": notesVm.ExtendSelection(-1); return true;
+                case "MoveCursorRight": notesVm.MoveCursor(1); return true;
+                case "ResizeNotesRight": notesVm.ResizeSelectedNotes(deltaTicks); return true;
+                case "MoveNotesRight": notesVm.MoveSelectedNotes(deltaTicks); return true;
+                case "ExtendSelectionRight": notesVm.ExtendSelection(1); return true;
+
+                // Edit Operations
+                case "Undo": ViewModel.Undo(); return true;
+                case "Redo": ViewModel.Redo(); return true;
+                case "Copy":
+                    if (curveVm.IsSelected(notesVm.PrimaryKey)) curveVm.Copy(notesVm.Part);
+                    else notesVm.CopyNotes();
+                    return true;
+                case "Cut":
+                    if (curveVm.IsSelected(notesVm.PrimaryKey)) curveVm.Cut(notesVm.Part);
+                    else notesVm.CutNotes();
+                    return true;
+                case "Paste":
+                    if (DocManager.Inst.NotesClipboard != null && DocManager.Inst.NotesClipboard.Count > 0) notesVm.PasteNotes();
+                    else if (DocManager.Inst.CurvesClipboard != null && project.tracks[notesVm.Part.trackNo].TryGetExpDescriptor(project, notesVm.PrimaryKey, out var descriptor)) {
+                        curveVm.Paste(notesVm.Part, descriptor);
                     }
-                    break;
-                #endregion
+                    return true;
+                case "PastePlain": notesVm.PastePlainNotes(); return true;
+                case "PasteParameters": notesVm.PasteSelectedParams(RootWindow); return true;
+                case "InsertNote": notesVm.InsertNote(); return true;
+                case "DeleteNotes": notesVm.DeleteSelectedNotes(); return true;
+                case "MergeNotes": notesVm.MergeSelectedNotes(); return true;
+
+                // Playhead & Timeline Navigation
+                case "PlayheadHome": playVm.MovePlayPos(notesVm.Part.position); return true;
+                case "SelectToStart": if (notesVm.Part.notes.FirstOrDefault() is UNote first) notesVm.ExtendSelection(first); return true;
+                case "PlayheadEnd": playVm.MovePlayPos(notesVm.Part.End); HScrollBar.Value = HScrollBar.Maximum; return true;
+                case "SelectToEnd": if (notesVm.Part.notes.LastOrDefault() is UNote last) notesVm.ExtendSelection(last); return true;
+                
+                case "PlayheadLeft": playVm.MovePlayPos(playVm.PlayPosTick - snapUnit); return true;
+                case "PlayheadToSelectionStart": if (!notesVm.Selection.IsEmpty) playVm.MovePlayPos(notesVm.Part.position + notesVm.Selection.FirstOrDefault()!.position); return true;
+                case "PlayheadToViewStart": playVm.MovePlayPos(notesVm.Part.position + (int)notesVm.TickOffset); return true;
+                
+                case "PlayheadRight": playVm.MovePlayPos(playVm.PlayPosTick + snapUnit); return true;
+                case "PlayheadToSelectionEnd": if (!notesVm.Selection.IsEmpty) playVm.MovePlayPos(notesVm.Part.position + notesVm.Selection.LastOrDefault()!.RightBound); return true;
+                case "PlayheadToViewEnd": playVm.MovePlayPos(notesVm.Part.position + (int)(notesVm.TickOffset + notesVm.Bounds.Width / notesVm.TickWidth)); return true;
+
+                // Scrolling & Zooming
+                case "ScrollLeft": notesVm.TickOffset = Math.Max(0, notesVm.TickOffset - snapUnit); return true;
+                case "ScrollRight": notesVm.TickOffset = Math.Min(notesVm.TickOffset + snapUnit, notesVm.HScrollBarMax); return true;
+                case "ScrollUp": notesVm.TrackOffset = Math.Max(notesVm.TrackOffset - 2, 0); return true;
+                case "ScrollDown": notesVm.TrackOffset = Math.Min(notesVm.TrackOffset + 2, notesVm.VScrollBarMax); return true;
+                case "ZoomIn":
+                case "ZoomOut":
+                    double x = 0, y = 0;
+                    if (!notesVm.Selection.IsEmpty) {
+                        x = (notesVm.Selection.Head!.position - notesVm.TickOffset) / notesVm.ViewportTicks;
+                        y = (ViewConstants.MaxTone - 1 - notesVm.Selection.Head.tone - notesVm.TrackOffset) / notesVm.ViewportTracks;
+                    } else if (notesVm.TickOffset != 0) { x = 0.5; y = 0.5; }
+                    notesVm.OnXZoomed(new Point(x, y), action == "ZoomIn" ? 0.1 : -0.1);
+                    return true;
+
+                // Track & Project Operations
+                case "SaveProject": _ = MainWindow?.Save(); return true;
+                case "SoloTrack": MessageBus.Current.SendMessage(new TracksSoloEvent(notesVm.Part.trackNo, !project.tracks[notesVm.Part.trackNo].Solo, false)); return true;
+                case "MuteTrack": MessageBus.Current.SendMessage(new TracksMuteEvent(notesVm.Part.trackNo, false)); return true;
+                case "FocusSelection": 
+                    if (notesVm.Selection.FirstOrDefault() is UNote focusNote) DocManager.Inst.ExecuteCmd(new FocusNoteNotification(notesVm.Part, focusNote)); 
+                    return true;
+                case "SearchNote": SearchNote(); return true;
+
+                // Parts Navigation
+                case "MoveToNextPartUp": MoveToNextPart(false); return true;
+                case "MoveToNextPartDown": MoveToNextPart(true); return true;
             }
             return false;
         }
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index d6787a479..b24ac620e 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -495,37 +495,37 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="pianoroll.menu.searchnote.prev">Prev</system:String>
   <system:String x:Key="pianoroll.menu.searchnote.searchalias">Search Alias</system:String>
   <system:String x:Key="pianoroll.snapdiv">Snap Division</system:String>
-  <system:String x:Key="pianoroll.toggle.finalpitch">View Final Pitch to Render (R)</system:String>
-  <system:String x:Key="pianoroll.toggle.noteparams">View Note Parameters (\)</system:String>
-  <system:String x:Key="pianoroll.toggle.phoneme">View Phonemes (O)</system:String>
-  <system:String x:Key="pianoroll.toggle.pitch">View Pitch Bend (I)</system:String>
-  <system:String x:Key="pianoroll.toggle.snap">Toggle Snap (P)</system:String>
+  <system:String x:Key="pianoroll.toggle.finalpitch">View Final Pitch to Render</system:String>
+  <system:String x:Key="pianoroll.toggle.noteparams">View Note Parameters</system:String>
+  <system:String x:Key="pianoroll.toggle.phoneme">View Phonemes</system:String>
+  <system:String x:Key="pianoroll.toggle.pitch">View Pitch Bend</system:String>
+  <system:String x:Key="pianoroll.toggle.snap">Toggle Snap</system:String>
   <system:String x:Key="pianoroll.toggle.snap.auto">Auto</system:String>
   <system:String x:Key="pianoroll.toggle.snap.autotriplet">Auto (triplet)</system:String>
-  <system:String x:Key="pianoroll.toggle.tips">View Tips (T)</system:String>
-  <system:String x:Key="pianoroll.toggle.tone">Toggle Note Tone (Y)</system:String>
-  <system:String x:Key="pianoroll.toggle.vibrato">View Vibrato (U)</system:String>
-  <system:String x:Key="pianoroll.toggle.waveform">View Waveform (W)</system:String>
-  <system:String x:Key="pianoroll.toggle.expressions">View Expressions (L)</system:String>
-  <system:String x:Key="pianoroll.tool.drawlinepitch">Line Draw Pitch Tool (Shift + 4)
+  <system:String x:Key="pianoroll.toggle.tips">View Tips</system:String>
+  <system:String x:Key="pianoroll.toggle.tone">Toggle Note Tone</system:String>
+  <system:String x:Key="pianoroll.toggle.vibrato">View Vibrato</system:String>
+  <system:String x:Key="pianoroll.toggle.waveform">View Waveform</system:String>
+  <system:String x:Key="pianoroll.toggle.expressions">View Expressions</system:String>
+  <system:String x:Key="pianoroll.tool.drawlinepitch">Line Draw Pitch Tool
     Left click to draw (draw straight line)
     Right click to reset
     Hold Ctrl to select
     Hold Alt to smoothen</system:String>
-  <system:String x:Key="pianoroll.tool.drawpitch">Draw Pitch Tool (4)
+  <system:String x:Key="pianoroll.tool.drawpitch">Draw Pitch Tool
     Left click to draw
     Right click to reset
     Hold Ctrl to select
     Hold Alt to smoothen</system:String>
-  <system:String x:Key="pianoroll.tool.eraser">Eraser Tool (3)</system:String>
-  <system:String x:Key="pianoroll.tool.knife">Knife Tool (5)</system:String>
-  <system:String x:Key="pianoroll.tool.overwritepitch">Overwrite Pitch Tool (Ctrl + 4)
+  <system:String x:Key="pianoroll.tool.eraser">Eraser Tool</system:String>
+  <system:String x:Key="pianoroll.tool.knife">Knife Tool</system:String>
+  <system:String x:Key="pianoroll.tool.overwritepitch">Overwrite Pitch Tool
     Left click to draw (overwrites vibrato or mod+)
     Right click to reset
     Hold Ctrl to select
     Hold Alt to smoothen</system:String>
   <system:String x:Key="pianoroll.tool.overwritelinepitch">
-    Line Draw Pitch Tool (Ctrl + Shift + 4)
+    Line Draw Pitch Tool
     Left click to draw 
     (draw straight line overwrites the vibrato or mod+)
     Hold Ctrl to draw sine curve
@@ -535,14 +535,14 @@ Warning: this option removes custom presets.</system:String>
     Hold Ctrl to select
     Hold Alt to smoothen
   </system:String>
-  <system:String x:Key="pianoroll.tool.penplus">Pen Plus Tool (Ctrl + 2)
+  <system:String x:Key="pianoroll.tool.penplus">Pen Plus Tool
     Left click to draw
     Right click to delete
     Hold Ctrl to select</system:String>
-  <system:String x:Key="pianoroll.tool.penv2">Pen Tool (2)
+  <system:String x:Key="pianoroll.tool.penv2">Pen Tool
     Left click to draw
     Hold Ctrl to select</system:String>
-  <system:String x:Key="pianoroll.tool.selectionv2">Selection Tool (1)</system:String>
+  <system:String x:Key="pianoroll.tool.selectionv2">Selection Tool</system:String>
 
   <system:String x:Key="prefs.advanced">Advanced</system:String>
   <system:String x:Key="prefs.advanced.beta">Beta</system:String>
@@ -554,6 +554,96 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="prefs.advanced.stable">Stable</system:String>
   <system:String x:Key="prefs.advanced.vlabelerpath">vLabeler Path</system:String>
   <system:String x:Key="prefs.advanced.winepath">Wine Path (set to enable wine for compatibility)</system:String>
+  
+  <system:String x:Key="prefs.shortcuts">Keyboard Shortcuts</system:String>
+  <system:String x:Key="prefs.shortcuts.listening">Press keys...</system:String>
+  <system:String x:Key="shortcut.PlayOrPause">Play / Pause</system:String>
+  <system:String x:Key="shortcut.PlaySelection">Play Selection</system:String>
+  <system:String x:Key="shortcut.ClearSelection">Clear Selection</system:String>
+  <system:String x:Key="shortcut.SelectAll">Select All</system:String>
+  <system:String x:Key="shortcut.DeselectAll">Deselect All</system:String>
+  <system:String x:Key="shortcut.HideDetachedWindow">Hide Detached Window</system:String>
+  <system:String x:Key="shortcut.FullScreen">Toggle Full Screen</system:String>
+  <system:String x:Key="shortcut.OpenPluginMenu">Open Plugin Menu</system:String>
+  <system:String x:Key="shortcut.EditLyrics">Edit Lyrics</system:String>
+  <system:String x:Key="shortcut.ToolSelect1">Selection Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect2Main">Pen Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect2Alt">Pen Tool (Alt)</system:String>
+  <system:String x:Key="shortcut.ToolSelect3">Eraser Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect4Main">Draw Pitch Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect4Overwrite">Overwrite Pitch Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect4Line">Draw Line Pitch Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect4LineOverwrite">Overwrite Line Pitch Tool</system:String>
+  <system:String x:Key="shortcut.ToolSelect5">Knife Tool</system:String>
+  <system:String x:Key="shortcut.ExpSelect1">Select Expression 1</system:String>
+  <system:String x:Key="shortcut.ExpSelect2">Select Expression 2</system:String>
+  <system:String x:Key="shortcut.ExpSelect3">Select Expression 3</system:String>
+  <system:String x:Key="shortcut.ExpSelect4">Select Expression 4</system:String>
+  <system:String x:Key="shortcut.ExpSelect5">Select Expression 5</system:String>
+  <system:String x:Key="shortcut.ExpSelect6">Select Expression 6</system:String>
+  <system:String x:Key="shortcut.ExpSelect7">Select Expression 7</system:String>
+  <system:String x:Key="shortcut.ExpSelect8">Select Expression 8</system:String>
+  <system:String x:Key="shortcut.ExpSelect9">Select Expression 9</system:String>
+  <system:String x:Key="shortcut.ExpSelect10">Select Expression 10</system:String>
+  <system:String x:Key="shortcut.ToggleFinalPitch">Toggle Final Pitch View</system:String>
+  <system:String x:Key="shortcut.ToggleTips">Toggle Tips View</system:String>
+  <system:String x:Key="shortcut.ToggleVibrato">Toggle Vibrato View</system:String>
+  <system:String x:Key="shortcut.TogglePitch">Toggle Pitch View</system:String>
+  <system:String x:Key="shortcut.TogglePhoneme">Toggle Phoneme View</system:String>
+  <system:String x:Key="shortcut.ToggleExpressions">Toggle Expressions View</system:String>
+  <system:String x:Key="shortcut.ToggleSnap">Toggle Snap</system:String>
+  <system:String x:Key="shortcut.OpenSnapMenu">Open Snap Menu</system:String>
+  <system:String x:Key="shortcut.ToggleNoteParams">Toggle Note Parameters View</system:String>
+  <system:String x:Key="shortcut.TogglePlayTone">Toggle Play Tone</system:String>
+  <system:String x:Key="shortcut.ToggleWaveform">Toggle Waveform View</system:String>
+  <system:String x:Key="shortcut.TransposeUp">Transpose Up</system:String>
+  <system:String x:Key="shortcut.TransposeOctaveUp">Transpose Octave Up</system:String>
+  <system:String x:Key="shortcut.TransposeDown">Transpose Down</system:String>
+  <system:String x:Key="shortcut.TransposeOctaveDown">Transpose Octave Down</system:String>
+  <system:String x:Key="shortcut.MoveCursorLeft">Move Cursor Left</system:String>
+  <system:String x:Key="shortcut.ResizeNotesLeft">Resize Notes Left</system:String>
+  <system:String x:Key="shortcut.MoveNotesLeft">Move Notes Left</system:String>
+  <system:String x:Key="shortcut.ExtendSelectionLeft">Extend Selection Left</system:String>
+  <system:String x:Key="shortcut.MoveCursorRight">Move Cursor Right</system:String>
+  <system:String x:Key="shortcut.ResizeNotesRight">Resize Notes Right</system:String>
+  <system:String x:Key="shortcut.MoveNotesRight">Move Notes Right</system:String>
+  <system:String x:Key="shortcut.ExtendSelectionRight">Extend Selection Right</system:String>
+  <system:String x:Key="shortcut.Undo">Undo</system:String>
+  <system:String x:Key="shortcut.Redo">Redo</system:String>
+  <system:String x:Key="shortcut.Copy">Copy</system:String>
+  <system:String x:Key="shortcut.Cut">Cut</system:String>
+  <system:String x:Key="shortcut.Paste">Paste</system:String>
+  <system:String x:Key="shortcut.PastePlain">Paste as Plain Notes</system:String>
+  <system:String x:Key="shortcut.PasteParameters">Paste Parameters</system:String>
+  <system:String x:Key="shortcut.InsertNote">Insert Note</system:String>
+  <system:String x:Key="shortcut.DeleteNotes">Delete Notes</system:String>
+  <system:String x:Key="shortcut.MergeNotes">Merge Selected Notes</system:String>
+  <system:String x:Key="shortcut.PlayheadHome">Move Playhead to Start</system:String>
+  <system:String x:Key="shortcut.SelectToStart">Extend Selection to Start</system:String>
+  <system:String x:Key="shortcut.PlayheadEnd">Move Playhead to End</system:String>
+  <system:String x:Key="shortcut.SelectToEnd">Extend Selection to End</system:String>
+  <system:String x:Key="shortcut.PlayheadLeft">Move Playhead Left</system:String>
+  <system:String x:Key="shortcut.PlayheadToSelectionStart">Move Playhead to Selection Start</system:String>
+  <system:String x:Key="shortcut.PlayheadToViewStart">Move Playhead to View Start</system:String>
+  <system:String x:Key="shortcut.PlayheadRight">Move Playhead Right</system:String>
+  <system:String x:Key="shortcut.PlayheadToSelectionEnd">Move Playhead to Selection End</system:String>
+  <system:String x:Key="shortcut.PlayheadToViewEnd">Move Playhead to View End</system:String>
+  <system:String x:Key="shortcut.ScrollLeft">Scroll Left</system:String>
+  <system:String x:Key="shortcut.ScrollRight">Scroll Right</system:String>
+  <system:String x:Key="shortcut.ScrollUp">Scroll Up</system:String>
+  <system:String x:Key="shortcut.ScrollDown">Scroll Down</system:String>
+  <system:String x:Key="shortcut.ZoomIn">Zoom In</system:String>
+  <system:String x:Key="shortcut.ZoomOut">Zoom Out</system:String>
+  <system:String x:Key="shortcut.SaveProject">Save Project</system:String>
+  <system:String x:Key="shortcut.SoloTrack">Solo Track</system:String>
+  <system:String x:Key="shortcut.MuteTrack">Mute Track</system:String>
+  <system:String x:Key="shortcut.FocusSelection">Focus Selection</system:String>
+  <system:String x:Key="shortcut.SearchNote">Search Note</system:String>
+  <system:String x:Key="shortcut.MoveToNextPartUp">Move to Next Part (Up)</system:String>
+  <system:String x:Key="shortcut.MoveToNextPartDown">Move to Next Part (Down)</system:String>
+  <system:String x:Key="prefs.shortcut.tooltip">Left click to change. Right click to reset.</system:String>
+  <system:String x:Key="prefs.shortcuts.duplicate">The shortcut '{0}' is already assigned to '{1}'.</system:String>
+
   <system:String x:Key="prefs.appearance">Appearance</system:String>
   <system:String x:Key="prefs.appearance.degree">Scale degree display style</system:String>
   <system:String x:Key="prefs.appearance.degree.numbered">Numbered (1 2 3 4 5 6 7)</system:String>
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
new file mode 100644
index 000000000..c9c318dad
--- /dev/null
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -0,0 +1,65 @@
+using System.Runtime.InteropServices;
+
+namespace OpenUtau.App.ViewModels {
+    public static class KeyTranslator {
+        private static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
+        /// <summary>
+        /// Converts ugly internal Avalonia key names into human-readable strings.
+        /// Accounts for macOS and Linux naming conventions.
+        /// </summary>
+        public static string GetFriendlyName(string keyName) {
+            return keyName switch {
+                // Modifiers
+                "Windows" or "LWin" or "RWin" => IsMac ? "Cmd" : "Win",
+                "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "Opt" : "Alt",
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => "Ctrl",
+                "Shift" or "LeftShift" or "RightShift" => "Shift",
+                
+                // Navigation & Editing
+                "Escape" => "Esc",
+                "Return" => "Enter",
+                "Back" => IsMac ? "Delete" : "Backspace",
+                "Delete" => IsMac ? "Forward Del" : "Del",
+                "Insert" => "Ins",
+                "PageUp" => "PgUp",
+                "PageDown" => "PgDn",
+                "Capital" => "Caps Lock",
+                "Scroll" => "Scroll Lock",
+                "NumLock" => "Num Lock",
+                "Snapshot" => "Print Screen",
+
+                // Numpad
+                "Divide" => "(Num /)",
+                "Multiply" => "(Num *)",
+                "Subtract" => "(Num -)",
+                "Add" => "(Num +)",
+                "Decimal" => "(Num .)",
+                "NumPad0" => "Num 0", "NumPad1" => "Num 1", "NumPad2" => "Num 2",
+                "NumPad3" => "Num 3", "NumPad4" => "Num 4", "NumPad5" => "Num 5",
+                "NumPad6" => "Num 6", "NumPad7" => "Num 7", "NumPad8" => "Num 8",
+                "NumPad9" => "Num 9",
+
+                // Digits
+                "D1" => "1", "D2" => "2", "D3" => "3", "D4" => "4", "D5" => "5",
+                "D6" => "6", "D7" => "7", "D8" => "8", "D9" => "9", "D0" => "0",
+
+                // OEM Symbols
+                "OemTilde" => "~",
+                "OemMinus" => "-",
+                "OemPlus" => "=",
+                "OemOpenBrackets" => "[",
+                "OemCloseBrackets" => "]",
+                "OemPipe" => "\\",
+                "OemSemicolon" => ";",
+                "OemQuotes" => "'",
+                "OemComma" => ",",
+                "OemPeriod" => ".",
+                "OemQuestion" => "/",
+                "OemBackslash" => "\\",
+
+                _ => keyName
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 94c5749bb..0f111b859 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -47,6 +47,7 @@ public class PianoRollViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public NotesViewModel NotesViewModel { get; set; }
         [Reactive] public PlaybackViewModel? PlaybackViewModel { get; set; }
         [Reactive] public CurveViewModel CurveViewModel { get; set; }
+        [Reactive] public Dictionary<string, string> Hotkeys { get; set; } = new Dictionary<string, string>();
 
         public double Width => Preferences.Default.PianorollWindowSize.Width;
         public double Height => Preferences.Default.PianorollWindowSize.Height;
@@ -104,7 +105,23 @@ public class PianoRollViewModel : ViewModelBase, ICmdSubscriber {
 
         private ReactiveCommand<Classic.Plugin, Unit> legacyPluginCommand;
 
+        public void ReloadShortcuts() {
+            var newHotkeys = new Dictionary<string, string>();
+            
+            foreach (var sc in Preferences.Default.Shortcuts) {
+                string mods = sc.ModifiersName
+                    .Replace("None", "")
+                    .Replace(", ", "+");
+                
+                string key = KeyTranslator.GetFriendlyName(sc.KeyName); 
+                newHotkeys[sc.ActionId] = string.IsNullOrEmpty(mods) ? key : $"{mods}+{key}";
+            }
+            
+            Hotkeys = newHotkeys;
+        }
+
         public PianoRollViewModel() {
+            ReloadShortcuts();
             NotesViewModel = new NotesViewModel();
             CurveViewModel = new CurveViewModel();
 
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 958f0fe8f..e64dbf8be 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -13,6 +13,9 @@
 using ReactiveUI.Fody.Helpers;
 using OpenUtau.Core.Render;
 using Serilog;
+using Avalonia.Input;
+using System.Collections.ObjectModel;
+using System.Reactive;
 
 namespace OpenUtau.App.ViewModels {
     public class LyricsHelperOption {
@@ -24,7 +27,29 @@ public override string ToString() {
             return klass.Name;
         }
     }
+    public class ShortcutsRefreshEvent { }
+    public class ShortcutItemViewModel : ViewModelBase {
+        public string ActionName { get; set; } = string.Empty;
+        public string ActionId { get; set; } = string.Empty;
+        
+        [Reactive] public Key Key { get; set; }
+        [Reactive] public KeyModifiers Modifiers { get; set; }
+        [Reactive] public bool IsListening { get; set; }
 
+        public string DisplayString {
+            get {
+                if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening") ?? "Press keys...";
+                
+                string mods = Modifiers == KeyModifiers.None ? "" : $"{Modifiers} + ";
+                string friendlyKey = KeyTranslator.GetFriendlyName(Key.ToString());
+                return $"{mods}{friendlyKey}";
+            }
+        }
+
+        public void RefreshDisplay() {
+            this.RaisePropertyChanged(nameof(DisplayString));
+        }
+    }
     public class PreferencesViewModel : ViewModelBase {
         // General
         private CultureInfo? language;
@@ -127,7 +152,128 @@ public int SafeMaxThreadCount {
         [Reactive] public bool RememberVsqx { get; set; }
         public string WinePath => Preferences.Default.WinePath;
 
+        // Shortcuts
+        [Reactive] public ShortcutItemViewModel? ActiveShortcut { get; set; }
+        public void ListenForShortcut(ShortcutItemViewModel item) {
+            // Cancel any existing listening item
+            if (ActiveShortcut != null) {
+                ActiveShortcut.IsListening = false;
+                ActiveShortcut.RefreshDisplay();
+            }
+
+            ActiveShortcut = item;
+            ActiveShortcut.IsListening = true;
+            ActiveShortcut.RefreshDisplay();
+        }
+
+        private void SaveShortcuts() {
+            Preferences.Default.Shortcuts.Clear();
+            // ALWAYS save from the master list, not the filtered search list!
+            foreach (var sc in allShortcuts) { 
+                Preferences.Default.Shortcuts.Add(new Preferences.ShortcutBinding {
+                    ActionId = sc.ActionId,
+                    KeyName = sc.Key.ToString(),
+                    ModifiersName = sc.Modifiers.ToString()
+                });
+            }
+            Preferences.Save();
+            MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
+        }
+
+        public void AssignShortcut(Key key, KeyModifiers modifiers) {
+            if (ActiveShortcut == null) return;
+            if (key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftShift || key == Key.RightShift || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LWin || key == Key.RWin) {
+                return;
+            }
+
+            var duplicate = allShortcuts.FirstOrDefault(s => s != ActiveShortcut && s.Key == key && s.Modifiers == modifiers);
+            
+            if (duplicate != null) {
+                ActiveShortcut.IsListening = false;
+                ActiveShortcut.RefreshDisplay();
+                ActiveShortcut = null;
+                string formatString = ThemeManager.GetString("prefs.shortcuts.duplicate") ?? "The shortcut '{0}' is already assigned to '{1}'.";
+                string message = string.Format(formatString, duplicate.DisplayString, duplicate.ActionName);
+                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(message));
+                return; 
+            }
+            ActiveShortcut.Key = key;
+            ActiveShortcut.Modifiers = modifiers;
+            ActiveShortcut.IsListening = false;
+            ActiveShortcut.RefreshDisplay();
+            ActiveShortcut = null;
+            SaveShortcuts();
+        }
+
+        public void ResetShortcut(ShortcutItemViewModel item) {
+            var defaults = new Preferences.SerializablePreferences().Shortcuts;
+            var defaultBinding = defaults.FirstOrDefault(s => s.ActionId == item.ActionId);
+            
+            if (defaultBinding != null && 
+                Enum.TryParse<Key>(defaultBinding.KeyName, out var defKey) && 
+                Enum.TryParse<KeyModifiers>(defaultBinding.ModifiersName, out var defMods)) {
+                
+                item.Key = defKey;
+                item.Modifiers = defMods;
+                item.IsListening = false;
+                item.RefreshDisplay();
+                SaveShortcuts();
+            }
+        }
+
+        public void ResetAllShortcuts() {
+            var defaults = new Preferences.SerializablePreferences().Shortcuts;
+            foreach (var item in allShortcuts) {
+                var defaultBinding = defaults.FirstOrDefault(s => s.ActionId == item.ActionId);
+                if (defaultBinding != null && 
+                    Enum.TryParse<Key>(defaultBinding.KeyName, out var defKey) && 
+                    Enum.TryParse<KeyModifiers>(defaultBinding.ModifiersName, out var defMods)) {
+                    
+                    item.Key = defKey;
+                    item.Modifiers = defMods;
+                    item.IsListening = false;
+                    item.RefreshDisplay();
+                }
+            }
+            SaveShortcuts();
+        }
+        private List<ShortcutItemViewModel> allShortcuts = new List<ShortcutItemViewModel>();
+        public ObservableCollection<ShortcutItemViewModel> FilteredShortcuts { get; } = new ObservableCollection<ShortcutItemViewModel>();
+        [Reactive] public string ShortcutSearchText { get; set; } = string.Empty;
+        public ReactiveCommand<ShortcutItemViewModel, Unit> ListenForShortcutCommand { get; }
+
         public PreferencesViewModel() {
+            ListenForShortcutCommand = ReactiveCommand.Create<ShortcutItemViewModel>(ListenForShortcut);
+
+            if (Preferences.Default.Shortcuts != null) {
+                foreach (var binding in Preferences.Default.Shortcuts) {
+                    
+                    // 3. Ensure the strings aren't null before parsing
+                    if (!string.IsNullOrEmpty(binding.KeyName) && 
+                        Enum.TryParse<Key>(binding.KeyName, out var parsedKey) &&
+                        Enum.TryParse<KeyModifiers>(binding.ModifiersName, out var parsedMods)) {
+                        
+                        allShortcuts.Add(new ShortcutItemViewModel {
+                            ActionId = binding.ActionId,
+                            ActionName = ThemeManager.GetString($"shortcut.{binding.ActionId}") ?? binding.ActionId,
+                            Key = parsedKey,
+                            Modifiers = parsedMods
+                        });
+                    }
+                }
+            }
+            this.WhenAnyValue(vm => vm.ShortcutSearchText)
+                .Subscribe(text => {
+                    FilteredShortcuts.Clear();
+                    var lowerText = text?.ToLowerInvariant() ?? string.Empty;
+                    foreach (var sc in allShortcuts) {
+                        if (string.IsNullOrEmpty(lowerText) || 
+                            sc.ActionName.ToLowerInvariant().Contains(lowerText) || 
+                            sc.DisplayString.ToLowerInvariant().Contains(lowerText)) {
+                            FilteredShortcuts.Add(sc);
+                        }
+                    }
+                });
             var audioOutput = PlaybackManager.Inst.AudioOutput;
             if (audioOutput != null) {
                 AudioOutputDevices = audioOutput.GetOutputDevices();
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 55428064b..000a78289 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -52,6 +52,7 @@
         </Style>
       </ListBox.Styles>
       <ListBoxItem Content="{DynamicResource prefs.general}"/>
+      <ListBoxItem Content="{DynamicResource prefs.shortcuts}"/>
       <ListBoxItem Content="{DynamicResource prefs.playback}"/>
       <ListBoxItem Content="{DynamicResource prefs.paths}"/>
       <ListBoxItem Content="{DynamicResource prefs.editing}"/>
@@ -66,7 +67,7 @@
           SelectedIndex="{Binding ElementName=DrawerList, Path=SelectedIndex}">
         <!-- General -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.appearance.lang}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.appearance.lang}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding Languages}" SelectedItem="{Binding Language}">
             <ComboBox.ItemTemplate>
               <DataTemplate>
@@ -74,7 +75,7 @@
               </DataTemplate>
             </ComboBox.ItemTemplate>
           </ComboBox>
-          <TextBlock Text="{DynamicResource prefs.appearance.sortorder}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.appearance.sortorder}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding SortingOrders}" SelectedItem="{Binding SortingOrder}">
             <ComboBox.ItemTemplate>
               <DataTemplate>
@@ -83,37 +84,66 @@
             </ComboBox.ItemTemplate>
           </ComboBox>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.advanced.beta}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.advanced.beta}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding Beta}"/>
           </Grid>
           <TextBlock Classes="restart"/>
         </StackPanel>
+
+        <!-- Shortcuts -->
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
+          <StackPanel Margin="0,10,0,0">
+            <TextBlock Text="{DynamicResource prefs.shortcuts}" Margin="0,10,0,10" FontWeight="Bold"/>
+            
+            <Grid ColumnDefinitions="*, Auto" Margin="5,0,5,10">
+              <TextBox Grid.Column="0" Text="{Binding ShortcutSearchText}" Watermark="Search by name or key..." />
+              <Button Grid.Column="1" Margin="10,0,0,0" Content="{DynamicResource pianoroll.menu.reset}" Command="{Binding ResetAllShortcuts}" />
+            </Grid>
+
+            <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
+              <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                  <Grid ColumnDefinitions="*, Auto" Margin="5">
+                    <TextBlock Text="{Binding ActionName}" VerticalAlignment="Center"/>
+                    
+                    <Button Grid.Column="1" Content="{Binding DisplayString}" 
+                            x:CompileBindings="False"
+                            Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
+                            CommandParameter="{Binding}"
+                            PointerReleased="OnShortcutRightClick"
+                            ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
+                  </Grid>
+                </DataTemplate>
+              </ItemsControl.ItemTemplate>
+            </ItemsControl>
+          </StackPanel>
+        </ScrollViewer>
         
         <!-- Playback -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.playback.device}"/>
+          <TextBlock Text="{DynamicResource prefs.playback.device}" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding AudioOutputDevices}" SelectedItem="{Binding AudioOutputDevice}"/>
           <Button Content="{DynamicResource prefs.playback.test}" HorizontalAlignment="Stretch" Command="{Binding TestAudioOutputDevice}"/>
-          <TextBlock Text="{DynamicResource prefs.playback.backend}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.playback.backend}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox SelectedIndex="{Binding PreferPortAudio}">
             <ComboBoxItem Content="{DynamicResource prefs.playback.backend.auto}"/>
             <ComboBoxItem Content="{DynamicResource prefs.playback.backend.mini}"/>
           </ComboBox>
           <TextBlock Classes="restart"/>
-          <TextBlock Text="{DynamicResource prefs.playback.lockstarttime}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.playback.lockstarttime}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox SelectedIndex="{Binding LockStartTime}">
             <ComboBoxItem Content="{DynamicResource prefs.playback.lockstarttime.off}"/>
             <ComboBoxItem Content="{DynamicResource prefs.playback.lockstarttime.on}"/>
             <ComboBoxItem Content="{DynamicResource prefs.playback.lockstarttime.onlycursor}"/>
           </ComboBox>
-          <TextBlock Text="{DynamicResource prefs.playback.autoscroll}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.playback.autoscroll}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox  SelectedIndex="{Binding PlaybackAutoScroll}">
             <ComboBoxItem Content="{DynamicResource prefs.off}"/>
             <ComboBoxItem Content="{DynamicResource prefs.playback.autoscrollmode.stationarycursor}"/>
             <ComboBoxItem Content="{DynamicResource prefs.playback.autoscrollmode.pagescroll}"/>
           </ComboBox>
           <Grid ColumnDefinitions="Auto,8,20,8,*" Margin="0,10,0,0">
-            <TextBlock Grid.Column="0" Text="{DynamicResource prefs.playback.cursorposition}"/>
+            <TextBlock Grid.Column="0" Text="{DynamicResource prefs.playback.cursorposition}" FontWeight="Bold"/>
             <TextBlock Grid.Column="2">
               <TextBlock.Text>
                 <MultiBinding StringFormat="{}{0:#0.0}">
@@ -128,12 +158,12 @@
 
         <!-- Paths -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.paths.singer}"/>
+          <TextBlock Text="{DynamicResource prefs.paths.singer}" FontWeight="Bold"/>
           <Grid ColumnDefinitions="*,10,Auto" Margin="4,0,0,10" HorizontalAlignment="Stretch">
             <TextBlock TextWrapping="Wrap" FontSize="11" Text="{Binding SingerPath}"/>
             <Button Content="{DynamicResource prefs.paths.open}" Grid.Column="2" Click="OpenSingersFolder"/>
           </Grid>
-          <TextBlock Text="{DynamicResource prefs.paths.addlsinger}"/>
+          <TextBlock Text="{DynamicResource prefs.paths.addlsinger}" FontWeight="Bold"/>
           <Grid ColumnDefinitions="*,10,Auto" Margin="4,0,0,0" HorizontalAlignment="Stretch">
             <TextBlock TextWrapping="Wrap" FontSize="11" Text="{Binding AdditionalSingersPath}"/>
             <Button Content="{DynamicResource prefs.paths.open}" Grid.Column="2" Click="OpenAddlSingersFolder"/>
@@ -147,25 +177,25 @@
                     HorizontalAlignment="Stretch" Click="ReloadSingers"/>
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.paths.addlsinger.install}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.paths.addlsinger.install}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding InstallToAdditionalSingersPath}"/>
           </Grid>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.paths.loaddeepfolders}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.paths.loaddeepfolders}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding LoadDeepFolders}"/>
           </Grid>
         </StackPanel>
 
         <!-- Editing -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.advanced.lyricshelper}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.advanced.lyricshelper}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding LyricsHelpers}" SelectedItem="{Binding LyricsHelper}"/>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.advanced.lyricshelper.brackets}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.advanced.lyricshelper.brackets}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding LyricsHelperBrackets}"/>
           </Grid>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.penplus}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.penplus}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding PenPlusDefault}"/>
           </Grid>
         </StackPanel>
@@ -173,7 +203,7 @@
         <!-- Rendering -->
         <StackPanel>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.rendering.prerender}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.rendering.prerender}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding PreRender}"/>
           </Grid>
           <Grid ColumnDefinitions="Auto,8,16,8,*">
@@ -192,17 +222,17 @@
                       Foreground="Red" Margin="0,0,0,4" IsVisible="{Binding HighThreads}" FontSize="11"/>
           <TextBlock Classes="restart"/>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.rendering.skipmuted}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.rendering.skipmuted}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding SkipRenderingMutedTracks}"/>
           </Grid>
           <Grid>
-            <TextBlock Text="{DynamicResource prefs.cache.clearonquit}" HorizontalAlignment="Left" />
+            <TextBlock Text="{DynamicResource prefs.cache.clearonquit}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding ClearCacheOnQuit}" />
           </Grid>
-          <TextBlock Text="{DynamicResource prefs.rendering.onnxrunner}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.rendering.onnxrunner}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding OnnxRunnerOptions}" SelectedItem="{Binding OnnxRunner}"/>
           <StackPanel IsVisible="{Binding ShowOnnxGpu}">
-            <TextBlock Text="{DynamicResource prefs.rendering.onnxgpu}" Margin="0,10,0,0"/>
+            <TextBlock Text="{DynamicResource prefs.rendering.onnxgpu}" Margin="0,10,0,0" FontWeight="Bold"/>
             <ComboBox ItemsSource="{Binding OnnxGpuOptions}" SelectedItem="{Binding OnnxGpu}"/>
             <TextBlock Classes="restart"/>
           </StackPanel>
@@ -210,7 +240,7 @@
 
         <!-- Appearance -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.appearance.theme}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.appearance.theme}" Margin="0,10,0,0" FontWeight="Bold"/>
           <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" 
@@ -242,41 +272,41 @@
               </Grid>
             </Button>
           </Grid>
-          <TextBlock Text="{DynamicResource prefs.appearance.degree}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.appearance.degree}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox SelectedIndex="{Binding DegreeStyle}">
             <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.off}"/>
             <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.solfege}"/>
             <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.numbered}"/>
           </ComboBox>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.appearance.trackcolor}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.appearance.trackcolor}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding UseTrackColor}"/>
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.appearance.showportrait}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.appearance.showportrait}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding ShowPortrait}"/>
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.appearance.showicon}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.appearance.showicon}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding ShowIcon}"/>
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.appearance.showghostnotes}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{DynamicResource prefs.appearance.showghostnotes}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding ShowGhostNotes}"/>
           </Grid>
         </StackPanel>
 
         <!-- UTAU -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.rendering.defaultrenderer}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.rendering.defaultrenderer}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox ItemsSource="{Binding DefaultRendererOptions}" SelectedItem="{Binding DefaultRenderer}"/>
-          <TextBlock Text="{DynamicResource prefs.otoeditor.select}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.otoeditor.select}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox SelectedIndex="{Binding OtoEditor}">
             <ComboBoxItem Content="OpenUtau"/>
             <ComboBoxItem Content="vLabeler"/>
             <ComboBoxItem Content="setParam"/>
           </ComboBox>
-          <TextBlock Text="{DynamicResource prefs.advanced.vlabelerpath}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.advanced.vlabelerpath}" Margin="0,10,0,0" FontWeight="Bold"/>
           <TextBlock HorizontalAlignment="Stretch" Margin="4"
                       TextWrapping="Wrap" FontSize="11" Text="{Binding VLabelerPath}"/>
           <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
@@ -285,7 +315,7 @@
             <Button Grid.Column="2" Content="{DynamicResource prefs.paths.select}"
                     HorizontalAlignment="Stretch" Click="SelectVLabelerPath"/>
           </Grid>
-          <TextBlock Text="{DynamicResource prefs.otoeditor.setparampath}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.otoeditor.setparampath}" Margin="0,10,0,0" FontWeight="Bold"/>
           <TextBlock HorizontalAlignment="Stretch" Margin="4"
                       TextWrapping="Wrap" FontSize="11" Text="{Binding SetParamPath}"/>
           <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
@@ -298,14 +328,14 @@
 
         <!-- DiffSinger -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.rendering.diffsingersteps}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.rendering.diffsingersteps}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox HorizontalAlignment="Stretch"  ItemsSource="{Binding DiffSingerStepsOptions}" SelectedItem="{Binding DiffSingerSteps}"/>
-          <TextBlock Text="{DynamicResource prefs.rendering.diffsingerstepsvariance}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.rendering.diffsingerstepsvariance}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox HorizontalAlignment="Stretch"  ItemsSource="{Binding DiffSingerStepsVarianceOptions}" SelectedItem="{Binding DiffSingerStepsVariance}"/>
-          <TextBlock Text="{DynamicResource prefs.rendering.diffsingerstepspitch}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.rendering.diffsingerstepspitch}" Margin="0,10,0,0" FontWeight="Bold"/>
           <ComboBox HorizontalAlignment="Stretch"  ItemsSource="{Binding DiffSingerStepsPitchOptions}" SelectedItem="{Binding DiffSingerStepsPitch}"/>
           <Grid ColumnDefinitions="Auto,8,40,8,*" Margin="0,10,0,0">
-              <TextBlock Grid.Column="0" Text="{DynamicResource prefs.rendering.diffsingerdepth}"/>
+              <TextBlock Grid.Column="0" Text="{DynamicResource prefs.rendering.diffsingerdepth}" FontWeight="Bold"/>
               <TextBlock Grid.Column="2">
                   <TextBlock.Text>
                       <MultiBinding StringFormat="{}{0:#0}%">
@@ -317,18 +347,18 @@
                       TickPlacement="BottomRight" TickFrequency="1" IsSnapToTickEnabled="true"/>
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.cache.diffsingertensorcache}" HorizontalAlignment="Left" />
+            <TextBlock Text="{DynamicResource prefs.cache.diffsingertensorcache}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding DiffSingerTensorCache}" />
           </Grid>
           <Grid Margin="0,5,0,0">
-            <TextBlock Text="{DynamicResource prefs.appearance.diffsingerlangcodehide}" HorizontalAlignment="Left" />
+            <TextBlock Text="{DynamicResource prefs.appearance.diffsingerlangcodehide}" HorizontalAlignment="Left" FontWeight="Bold"/>
             <ToggleSwitch IsChecked="{Binding DiffSingerLangCodeHide}" />
           </Grid>
         </StackPanel>
 
         <!-- Advanced -->
         <StackPanel>
-          <TextBlock Text="{DynamicResource prefs.advanced.rememberfiletypes}" Margin="0,10,0,0"/>
+          <TextBlock Text="{DynamicResource prefs.advanced.rememberfiletypes}" Margin="0,10,0,0" FontWeight="Bold"/>
           <Grid ColumnDefinitions="Auto,Auto" RowDefinitions="25,25,25" VerticalAlignment="Center" Margin="4">
             <CheckBox IsChecked="{Binding RememberMid}" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center"/>
             <TextBlock Text=" .mid" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center"/>
@@ -338,7 +368,7 @@
             <TextBlock Text=" .vsqx" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center"/>
           </Grid>
           <TextBlock Text="{DynamicResource prefs.advanced.winepath}" 
-                      IsVisible="{OnPlatform Windows=False, Default=True}" Margin="0,10,0,0"/>
+                      IsVisible="{OnPlatform Windows=False, Default=True}" Margin="0,10,0,0" FontWeight="Bold"/>
           <TextBlock HorizontalAlignment="Stretch" Margin="4"
                       TextWrapping="Wrap" FontSize="11" Text="{Binding WinePath}"
                       IsVisible="{OnPlatform Windows=False, Default=True}" />
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index ccb1841bd..7ab1282d4 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -8,6 +8,7 @@
 using OpenUtau.App.ViewModels;
 using OpenUtau.Colors;
 using OpenUtau.Core;
+using Avalonia.Input;
 
 namespace OpenUtau.App.Views {
     public partial class PreferencesDialog : Window {
@@ -17,6 +18,37 @@ public PreferencesDialog() {
             InitializeComponent();
         }
 
+        protected override void OnKeyDown(KeyEventArgs e) {
+            if (DataContext is PreferencesViewModel vm && vm.ActiveShortcut != null) {
+                // If they hit escape without modifiers, cancel listening
+                if (e.Key == Key.Escape && e.KeyModifiers == KeyModifiers.None) {
+                    vm.ActiveShortcut.IsListening = false;
+                    vm.ActiveShortcut.RefreshDisplay();
+                    vm.ActiveShortcut = null;
+                    e.Handled = true;
+                    return;
+                }
+
+                vm.AssignShortcut(e.Key, e.KeyModifiers);
+                e.Handled = true;
+                return;
+            }
+
+            base.OnKeyDown(e);
+        }
+
+        public void OnShortcutRightClick(object sender, PointerReleasedEventArgs e) {
+            if (e.InitialPressMouseButton == MouseButton.Right && 
+                sender is Button btn && 
+                btn.DataContext is ShortcutItemViewModel item) {
+                
+                if (DataContext is PreferencesViewModel vm) {
+                    vm.ResetShortcut(item);
+                    e.Handled = true;
+                }
+            }
+        }
+
         void OpenSingersFolder(object sender, RoutedEventArgs e) {
             try {
                 Directory.CreateDirectory(viewModel!.SingerPath);

From 13766a84eef8f3dc5ba01a5449d630d44e5d9d4e Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sun, 3 May 2026 14:11:44 +0800
Subject: [PATCH 02/22] left out string

---
 OpenUtau/Strings/Strings.axaml         | 1 +
 OpenUtau/Views/PreferencesDialog.axaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index b24ac620e..58eae322d 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -642,6 +642,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="shortcut.MoveToNextPartUp">Move to Next Part (Up)</system:String>
   <system:String x:Key="shortcut.MoveToNextPartDown">Move to Next Part (Down)</system:String>
   <system:String x:Key="prefs.shortcut.tooltip">Left click to change. Right click to reset.</system:String>
+  <system:String x:Key="prefs.shortcut.search.watermark">Search by name or key...</system:String>
   <system:String x:Key="prefs.shortcuts.duplicate">The shortcut '{0}' is already assigned to '{1}'.</system:String>
 
   <system:String x:Key="prefs.appearance">Appearance</system:String>
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 000a78289..0a58458fc 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -96,7 +96,7 @@
             <TextBlock Text="{DynamicResource prefs.shortcuts}" Margin="0,10,0,10" FontWeight="Bold"/>
             
             <Grid ColumnDefinitions="*, Auto" Margin="5,0,5,10">
-              <TextBox Grid.Column="0" Text="{Binding ShortcutSearchText}" Watermark="Search by name or key..." />
+              <TextBox Grid.Column="0" Text="{Binding ShortcutSearchText}" Watermark="{DynamicResource prefs.shortcut.search.watermark}" />
               <Button Grid.Column="1" Margin="10,0,0,0" Content="{DynamicResource pianoroll.menu.reset}" Command="{Binding ResetAllShortcuts}" />
             </Grid>
 

From a14684c98c030ba771ea6002245af5d766fb02ff Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sun, 3 May 2026 14:56:11 +0800
Subject: [PATCH 03/22] translate more oem symbols

---
 OpenUtau/ViewModels/KeyTranslator.cs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index c9c318dad..c9566cfe8 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -45,18 +45,17 @@ public static string GetFriendlyName(string keyName) {
                 "D6" => "6", "D7" => "7", "D8" => "8", "D9" => "9", "D0" => "0",
 
                 // OEM Symbols
-                "OemTilde" => "~",
-                "OemMinus" => "-",
-                "OemPlus" => "=",
-                "OemOpenBrackets" => "[",
-                "OemCloseBrackets" => "]",
-                "OemPipe" => "\\",
-                "OemSemicolon" => ";",
-                "OemQuotes" => "'",
-                "OemComma" => ",",
-                "OemPeriod" => ".",
-                "OemQuestion" => "/",
-                "OemBackslash" => "\\",
+                "OemTilde" or "Oem8" or "Oem3" => "~",
+                "OemMinus" or "OemMinusSign" => "-",
+                "OemPlus" or "OemPlusSign" => "=",
+                "OemOpenBrackets" or "Oem4" => "[",
+                "OemCloseBrackets" or "Oem6" => "]",
+                "OemPipe" or "Oem5" or "OemBackslash" => "\\",
+                "OemSemicolon" or "Oem1" => ";",
+                "OemQuotes" or "Oem7" => "'",
+                "OemComma" or "OemCommaSign" => ",",
+                "OemPeriod" or "OemPeriodSign" => ".",
+                "OemQuestion" or "Oem2" => "/",
 
                 _ => keyName
             };

From 78d18cd9727d9b141bacdda5b077e9967f11d868 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sun, 3 May 2026 15:18:01 +0800
Subject: [PATCH 04/22] fix oem key mismatch for other platforms

---
 OpenUtau/Controls/PianoRoll.axaml.cs | 20 ++++++++++----------
 OpenUtau/ViewModels/KeyTranslator.cs | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index a87e55c51..8ad26ec83 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -46,17 +46,17 @@ public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
 
         private Window RootWindow => (Window) TopLevel.GetTopLevel(this)!;
 
-        private string? GetActionIdForShortcut(Key key, KeyModifiers modifiers) {
-            var normalizedModifiers = modifiers;
-            if (modifiers == cmdKey) {
-                normalizedModifiers = OS.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
+        string? GetActionIdForShortcut(Key pressedKey, KeyModifiers pressedMods) {
+            foreach (var sc in Preferences.Default.Shortcuts) {
+                if (Enum.TryParse(sc.KeyName, out Key parsedKey) && 
+                    Enum.TryParse(sc.ModifiersName, out KeyModifiers parsedMods)) {
+                    
+                    if (KeyTranslator.IsKeyMatch(parsedKey, pressedKey) && parsedMods == pressedMods) {
+                        return sc.ActionId;
+                    }
+                }
             }
-
-            // Search the user's saved preferences for a match
-            var binding = Preferences.Default.Shortcuts.FirstOrDefault(
-                s => s.KeyName == key.ToString() && s.ModifiersName == normalizedModifiers.ToString());
-            
-            return binding?.ActionId;
+            return null;
         }
 
         public PianoRoll(PianoRollViewModel model) {
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index c9566cfe8..9c2193537 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Avalonia.Input; // <-- Added to use the Key enum
 
 namespace OpenUtau.App.ViewModels {
     public static class KeyTranslator {
@@ -60,5 +61,26 @@ public static string GetFriendlyName(string keyName) {
                 _ => keyName
             };
         }
+
+        /// <summary>
+        /// Fuzzy matcher for cross-platform keyboard quirks.
+        /// If the exact enum doesn't match, it checks known hardware equivalents.
+        /// </summary>
+        public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
+            if (savedKey == pressedKey) return true;
+
+            return savedKey switch {
+                Key.OemPipe => pressedKey == Key.Oem5 || pressedKey == Key.OemBackslash,
+                Key.OemOpenBrackets => pressedKey == Key.Oem4,
+                Key.OemCloseBrackets => pressedKey == Key.Oem6,
+                Key.OemQuotes => pressedKey == Key.Oem7,
+                Key.OemSemicolon => pressedKey == Key.Oem1,
+                Key.OemTilde => pressedKey == Key.Oem3 || pressedKey == Key.Oem8,
+                Key.OemMinus => pressedKey == Key.Subtract,
+                Key.OemPlus => pressedKey == Key.Add,
+                Key.OemQuestion => pressedKey == Key.Oem2,
+                _ => false
+            };
+        }
     }
 }
\ No newline at end of file

From 797e5e8cd29e0f2656fc0b5d53e69544ede752d2 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sun, 3 May 2026 15:38:10 +0800
Subject: [PATCH 05/22] more fixes

---
 OpenUtau/Controls/PianoRoll.axaml.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 8ad26ec83..538cd30e6 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -1389,6 +1389,10 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
 
                 // Lyrics
                 case "EditLyrics":
+                    if (LyricBox != null && LyricBox.IsVisible) {
+                        return false; 
+                    }
+
                     if (notesVm.Selection.Count == 1) {
                         var note = notesVm.Selection.First();
                         LyricBox?.Show(ViewModel.NotesViewModel.Part!, new LyricBoxNote(note), note.lyric);

From 8c1346b7fddb96f3da775dca4b83b061d33d1781 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Tue, 5 May 2026 11:00:26 +0800
Subject: [PATCH 06/22] load external batch edits and legacy plugins to the
 shortcut list

---
 OpenUtau/Controls/PianoRoll.axaml.cs        |  23 ++++
 OpenUtau/Strings/Strings.axaml              |   1 +
 OpenUtau/ViewModels/KeyTranslator.cs        |   2 +-
 OpenUtau/ViewModels/PreferencesViewModel.cs | 139 +++++++++++++++++---
 4 files changed, 146 insertions(+), 19 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 538cd30e6..74a0fda32 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -1518,6 +1518,29 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 case "MoveToNextPartUp": MoveToNextPart(false); return true;
                 case "MoveToNextPartDown": MoveToNextPart(true); return true;
             }
+            // External and batch note edits
+            if (!string.IsNullOrEmpty(action)) {
+                var allDynamicMenus = ViewModel.NoteBatchEdits
+                    .Concat(ViewModel.LyricBatchEdits)
+                    .Concat(ViewModel.ResetBatchEdits)
+                    .Concat(ViewModel.ExternalBatchEdits);
+
+                foreach (var menu in allDynamicMenus) {
+                    if (menu.CommandParameter is BatchEdit edit && edit.Name == action) {
+                        menu.Command?.Execute(edit);
+                        return true;
+                    }
+                }
+            }
+            // Legacy plugins
+            if (!string.IsNullOrEmpty(action)) {
+                foreach (var menu in ViewModel.LegacyPlugins) {
+                    if (menu.Header?.ToString() == action) {
+                        menu.Command?.Execute(menu.CommandParameter);
+                        return true;
+                    }
+                }
+            }
             return false;
         }
 
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 58eae322d..6238b4e76 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -481,6 +481,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="pianoroll.menu.notes.reset.vibratos">Reset vibratos</system:String>
   <system:String x:Key="pianoroll.menu.part">Part</system:String>
   <system:String x:Key="pianoroll.menu.part.legacypluginexp">Legacy Plugin (Experimental)</system:String>
+  <system:String x:Key="pianoroll.menu.part.legacypluginexp.shortcuts">(legacy)</system:String>
   <system:String x:Key="pianoroll.menu.part.singer">Singer and Oto settings</system:String>
   <system:String x:Key="pianoroll.menu.plugin.openfolder">Open folder</system:String>
   <system:String x:Key="pianoroll.menu.plugin.reload">Reload</system:String>
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 9c2193537..e2a87b6be 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,5 +1,5 @@
 using System.Runtime.InteropServices;
-using Avalonia.Input; // <-- Added to use the Key enum
+using Avalonia.Input;
 
 namespace OpenUtau.App.ViewModels {
     public static class KeyTranslator {
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index e64dbf8be..0832de466 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -16,6 +16,7 @@
 using Avalonia.Input;
 using System.Collections.ObjectModel;
 using System.Reactive;
+using OpenUtau.Core.Editing;
 
 namespace OpenUtau.App.ViewModels {
     public class LyricsHelperOption {
@@ -168,7 +169,6 @@ public void ListenForShortcut(ShortcutItemViewModel item) {
 
         private void SaveShortcuts() {
             Preferences.Default.Shortcuts.Clear();
-            // ALWAYS save from the master list, not the filtered search list!
             foreach (var sc in allShortcuts) { 
                 Preferences.Default.Shortcuts.Add(new Preferences.ShortcutBinding {
                     ActionId = sc.ActionId,
@@ -215,10 +215,13 @@ public void ResetShortcut(ShortcutItemViewModel item) {
                 
                 item.Key = defKey;
                 item.Modifiers = defMods;
-                item.IsListening = false;
-                item.RefreshDisplay();
-                SaveShortcuts();
+            } else {
+                item.Key = Key.None;
+                item.Modifiers = KeyModifiers.None;
             }
+            item.IsListening = false;
+            item.RefreshDisplay();
+            SaveShortcuts();
         }
 
         public void ResetAllShortcuts() {
@@ -231,9 +234,12 @@ public void ResetAllShortcuts() {
                     
                     item.Key = defKey;
                     item.Modifiers = defMods;
-                    item.IsListening = false;
-                    item.RefreshDisplay();
+                } else {
+                    item.Key = Key.None;
+                    item.Modifiers = KeyModifiers.None;
                 }
+                item.IsListening = false;
+                item.RefreshDisplay();
             }
             SaveShortcuts();
         }
@@ -248,32 +254,129 @@ public PreferencesViewModel() {
             if (Preferences.Default.Shortcuts != null) {
                 foreach (var binding in Preferences.Default.Shortcuts) {
                     
-                    // 3. Ensure the strings aren't null before parsing
                     if (!string.IsNullOrEmpty(binding.KeyName) && 
                         Enum.TryParse<Key>(binding.KeyName, out var parsedKey) &&
                         Enum.TryParse<KeyModifiers>(binding.ModifiersName, out var parsedMods)) {
                         
+                        string displayName = ThemeManager.GetString($"shortcut.{binding.ActionId}") ?? binding.ActionId;
+                        if (displayName.StartsWith("shortcut.")) {
+                            displayName = displayName.Substring(9);
+                        }
+
                         allShortcuts.Add(new ShortcutItemViewModel {
                             ActionId = binding.ActionId,
-                            ActionName = ThemeManager.GetString($"shortcut.{binding.ActionId}") ?? binding.ActionId,
+                            ActionName = displayName,
                             Key = parsedKey,
                             Modifiers = parsedMods
                         });
                     }
                 }
             }
-            this.WhenAnyValue(vm => vm.ShortcutSearchText)
-                .Subscribe(text => {
-                    FilteredShortcuts.Clear();
-                    var lowerText = text?.ToLowerInvariant() ?? string.Empty;
-                    foreach (var sc in allShortcuts) {
-                        if (string.IsNullOrEmpty(lowerText) || 
-                            sc.ActionName.ToLowerInvariant().Contains(lowerText) || 
-                            sc.DisplayString.ToLowerInvariant().Contains(lowerText)) {
-                            FilteredShortcuts.Add(sc);
+            
+            // external batch edits
+            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
+                try {
+                    if (Activator.CreateInstance(type) is BatchEdit edit) {
+                        
+                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
+                        Key savedKey = Key.None;
+                        KeyModifiers savedMods = KeyModifiers.None;
+                        
+                        if (savedSc != null) {
+                            Enum.TryParse(savedSc.KeyName, out savedKey);
+                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
+                        }
+
+                        string pluginName = edit.Name;
+                        if (allShortcuts.Any(s => s.ActionId == pluginName)) {
+                            continue; 
+                        }
+                        
+                        string lookupKey = "shortcut." + pluginName;
+                        string displayName = ThemeManager.GetString(lookupKey);
+                        
+                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                            displayName = pluginName;
+                        }
+                        if (displayName.StartsWith("shortcut.")) {
+                            displayName = displayName.Substring(9);
                         }
+
+                        allShortcuts.Add(new ShortcutItemViewModel {
+                            ActionId = pluginName, 
+                            ActionName = displayName,
+                            Key = savedKey,
+                            Modifiers = savedMods
+                        });
                     }
-                });
+                } catch { 
+                }
+            }
+            
+            // legacy plugins
+            if (DocManager.Inst.Plugins != null) {
+                foreach (var plugin in DocManager.Inst.Plugins) {
+                    try {
+                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == plugin.Name);
+                        
+                        Key savedKey = Key.None;
+                        KeyModifiers savedMods = KeyModifiers.None;
+                        
+                        if (savedSc != null) {
+                            Enum.TryParse(savedSc.KeyName, out savedKey);
+                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
+                        }
+
+                        string pluginName = plugin.Name;
+                        string lookupKey = "shortcut." + pluginName;
+                        string displayName = ThemeManager.GetString(lookupKey);
+                        
+                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                            displayName = pluginName;
+                        }
+
+                        if (displayName.StartsWith("shortcut.")) {
+                            displayName = displayName.Substring(9);
+                        }
+
+                        string legacyTag = ThemeManager.GetString("pianoroll.menu.part.legacypluginexp.shortcuts");
+                        if (string.IsNullOrEmpty(legacyTag) || legacyTag == "pianoroll.menu.part.legacypluginexp.shortcuts") {
+                            legacyTag = "(legacy)";
+                        }
+
+                        var existingItem = allShortcuts.FirstOrDefault(s => s.ActionId == pluginName);
+                        if (existingItem != null) {
+                            if (!existingItem.ActionName.EndsWith(legacyTag)) {
+                                existingItem.ActionName = $"{existingItem.ActionName} {legacyTag}";
+                            }
+                            continue;
+                        }
+
+                        allShortcuts.Add(new ShortcutItemViewModel {
+                            ActionId = pluginName, 
+                            ActionName = $"{displayName} {legacyTag}",
+                            Key = savedKey,
+                            Modifiers = savedMods
+                        });
+                    } catch {
+                        
+                    }
+                }
+            }
+
+            this.WhenAnyValue(vm => vm.ShortcutSearchText)
+            .Subscribe(text => {
+                FilteredShortcuts.Clear();
+                var lowerText = text?.ToLowerInvariant() ?? string.Empty;
+                foreach (var sc in allShortcuts) {
+                    if (string.IsNullOrEmpty(lowerText) || 
+                        sc.ActionName.ToLowerInvariant().Contains(lowerText) || 
+                        sc.DisplayString.ToLowerInvariant().Contains(lowerText)) {
+                        FilteredShortcuts.Add(sc);
+                    }
+                }
+            });
+
             var audioOutput = PlaybackManager.Inst.AudioOutput;
             if (audioOutput != null) {
                 AudioOutputDevices = audioOutput.GetOutputDevices();

From e5c63958b2c14f5ae55076e0e70732132913565c Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Tue, 5 May 2026 20:06:38 +0800
Subject: [PATCH 07/22] include built-in batch note, lyrics, reset functions
 and add dynamic input gesture to the menu

---
 OpenUtau.Core/Util/Preferences.cs           |  72 +++++++++++-
 OpenUtau/Controls/PianoRoll.axaml           |   5 +
 OpenUtau/Controls/PianoRoll.axaml.cs        | 123 ++++++++++++++++----
 OpenUtau/ViewModels/PianoRollViewModel.cs   |  29 ++---
 OpenUtau/ViewModels/PreferencesViewModel.cs |  29 ++++-
 5 files changed, 219 insertions(+), 39 deletions(-)

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index 88c06a5d5..433bf09bc 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -274,9 +274,9 @@ public class SerializablePreferences {
 
                 // Transposition
                 new ShortcutBinding { ActionId = "TransposeUp", KeyName = "Up", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "TransposeOctaveUp", KeyName = "Up", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.octaveup", KeyName = "Up", ModifiersName = "Control" },
                 new ShortcutBinding { ActionId = "TransposeDown", KeyName = "Down", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "TransposeOctaveDown", KeyName = "Down", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.octavedown", KeyName = "Down", ModifiersName = "Control" },
 
                 // Note Movement & Sizing
                 new ShortcutBinding { ActionId = "MoveCursorLeft", KeyName = "Left", ModifiersName = "None" },
@@ -329,7 +329,73 @@ public class SerializablePreferences {
 
                 // Parts Navigation
                 new ShortcutBinding { ActionId = "MoveToNextPartUp", KeyName = "PageUp", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "MoveToNextPartDown", KeyName = "PageDown", ModifiersName = "None" }
+                new ShortcutBinding { ActionId = "MoveToNextPartDown", KeyName = "PageDown", ModifiersName = "None" },
+                
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.loadrenderedpitch", KeyName = "R", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.refreshrealcurves", KeyName = "R", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.bakepitch", KeyName = "K", ModifiersName = "Alt" },
+
+                // Tails and Overlap
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.addtaildash", KeyName = "OemMinus", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.addtailrest", KeyName = "R", ModifiersName = "Alt, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.removetaildash", KeyName = "OemMinus", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.removetailrest", KeyName = "R", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.fixoverlap", KeyName = "F", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.autolegato", KeyName = "A", ModifiersName = "Alt" },
+
+                // Common notes
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.commonnotecopy", KeyName = "C", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.commonnotepaste", KeyName = "P", ModifiersName = "Control, Shift" },
+
+                // Timings
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.randomizetiming", KeyName = "T", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.randomizeoffset", KeyName = "T", ModifiersName = "Control, Alt" },
+
+                // Lang
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.romajitohiragana", KeyName = "J", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.hiraganatoromaji", KeyName = "J", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.javcvtocv", KeyName = "K", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.hanzitopinyin", KeyName = "H", ModifiersName = "Control, Alt" },
+
+                // Suffixes and Phonetic Hints
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removetonesuffix", KeyName = "S", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removelettersuffix", KeyName = "S", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.movesuffixtovoicecolor", KeyName = "C", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removephonetichint", KeyName = "P", ModifiersName = "Control, Alt" },
+
+                // Dash and Slur
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.dashtoplus", KeyName = "OemPlus", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.dashtoplustilda", KeyName = "OemPlus", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.insertslur", KeyName = "I", ModifiersName = "Alt" },
+
+                // Reset
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.all", KeyName = "Delete", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.allparameters", KeyName = "I", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.exps", KeyName = "E", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.clear.vibratos", KeyName = "V", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.vibratos", KeyName = "U", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.pitchbends", KeyName = "B", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.phonemetimings", KeyName = "T", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.aliases", KeyName = "A", ModifiersName = "Control, Alt" },
+
+                // other toggles
+                new ShortcutBinding { ActionId = "Lock Pitch Points", KeyName = "L", ModifiersName = "Control, Shift" },
+                new ShortcutBinding { ActionId = "Lock Vibrato", KeyName = "U", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "Lock Expressions", KeyName = "E", ModifiersName = "Control, Alt" },
+                new ShortcutBinding { ActionId = "Show Portrait", KeyName = "P", ModifiersName = "Alt, Shift" },
+                new ShortcutBinding { ActionId = "Show Icon", KeyName = "I", ModifiersName = "Alt, Shift" },
+                new ShortcutBinding { ActionId = "Show Ghost Notes", KeyName = "G", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Use Track Color", KeyName = "C", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Detach Piano Roll", KeyName = "D", ModifiersName = "Alt, Shift" },
+                new ShortcutBinding { ActionId = "Hide Piano Roll", KeyName = "H", ModifiersName = "Alt, Shift" },
+                new ShortcutBinding { ActionId = "lyricsreplace.replace", KeyName = "H", ModifiersName = "Control" },
+                new ShortcutBinding { ActionId = "Quantize Notes", KeyName = "Q", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Randomize Tuning", KeyName = "R", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Lengthen Crossfade", KeyName = "L", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Add Breath", KeyName = "B", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Edit Note Defaults", KeyName = "N", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Open Singers Window", KeyName = "O", ModifiersName = "Alt" },
+                new ShortcutBinding { ActionId = "Open Expressions", KeyName = "E", ModifiersName = "Alt" },
             };
             public bool VoicebankPublishUseIgnore = true;
             public string VoicebankPublishIgnores = @"#Adobe Audition
diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index 4f89820cc..560394034 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -330,6 +330,11 @@
             </MenuItem>
 
             <MenuItem Header="{DynamicResource pianoroll.menu.batch}">
+              <MenuItem.Styles>
+                  <Style Selector="MenuItem">
+                      <Setter Property="InputGesture" Value="{Binding InputGesture}"/>
+                  </Style>
+              </MenuItem.Styles>
               <MenuItem Header="{DynamicResource pianoroll.menu.notes}" ItemsSource="{Binding NoteBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.reset}" ItemsSource="{Binding ResetBatchEdits}" Classes="MenuItemWithSubMenu"/>
diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 74a0fda32..bdbd701f3 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -30,6 +30,16 @@ interface IValueTip {
     }
 
     public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
+        private Avalonia.Input.KeyGesture? GetGesture(string actionId) {
+            var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
+            if (sc != null && 
+                Enum.TryParse<Avalonia.Input.Key>(sc.KeyName, out var k) && 
+                Enum.TryParse<Avalonia.Input.KeyModifiers>(sc.ModifiersName, out var m) && 
+                k != Avalonia.Input.Key.None) {
+                return new Avalonia.Input.KeyGesture(k, m);
+            }
+            return null;
+        }
         public MainWindow? MainWindow { get; set; }
         public PianoRollViewModel ViewModel;
 
@@ -124,11 +134,24 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new BakePitch(),
                 new RandomizeTiming(),
                 new RandomizePhonemeOffset()
-            }.Select(edit => new MenuItemViewModel() {
-                Header = ThemeManager.GetString(edit.Name),
-                Command = noteBatchEditCommand,
-                CommandParameter = edit,
+            }.Select(edit => {
+                Avalonia.Input.KeyGesture? menuGesture = null;
+                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
+                if (savedSc != null && 
+                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
+                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
+                    parsedKey != Avalonia.Input.Key.None) {
+                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
+                }
+
+                return new MenuItemViewModel() {
+                    Header = ThemeManager.GetString(edit.Name),
+                    InputGesture = menuGesture,
+                    Command = noteBatchEditCommand,
+                    CommandParameter = edit,
+                };
             }));
+
             ViewModel.LyricBatchEdits.AddRange(new List<BatchEdit>() {
                 new RomajiToHiragana(),
                 new HiraganaToRomaji(),
@@ -141,11 +164,24 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new DashToPlus(),
                 new DashToPlusTilda(),
                 new InsertSlur(),
-            }.Select(edit => new MenuItemViewModel() {
-                Header = ThemeManager.GetString(edit.Name),
-                Command = noteBatchEditCommand,
-                CommandParameter = edit,
+            }.Select(edit => {
+                Avalonia.Input.KeyGesture? menuGesture = null;
+                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
+                if (savedSc != null && 
+                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
+                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
+                    parsedKey != Avalonia.Input.Key.None) {
+                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
+                }
+
+                return new MenuItemViewModel() {
+                    Header = ThemeManager.GetString(edit.Name),
+                    InputGesture = menuGesture,
+                    Command = noteBatchEditCommand,
+                    CommandParameter = edit,
+                };
             }));
+
             ViewModel.ResetBatchEdits.AddRange(new List<BatchEdit>() {
                 new ResetAll(),
                 new ResetPitchBends(),
@@ -154,20 +190,45 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new ResetVibratos(),
                 new ClearTimings(),
                 new ResetAliases(),
-            }.Select(edit => new MenuItemViewModel() {
-                Header = ThemeManager.GetString(edit.Name),
-                Command = noteBatchEditCommand,
-                CommandParameter = edit,
+            }.Select(edit => {
+                Avalonia.Input.KeyGesture? menuGesture = null;
+                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
+                if (savedSc != null && 
+                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
+                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
+                    parsedKey != Avalonia.Input.Key.None) {
+                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
+                }
+
+                return new MenuItemViewModel() {
+                    Header = ThemeManager.GetString(edit.Name),
+                    InputGesture = menuGesture,
+                    Command = noteBatchEditCommand,
+                    CommandParameter = edit,
+                };
             }));
             try {
                 ViewModel.ExternalBatchEdits.AddRange(
                     DocManager.Inst.ExternalBatchEditTypes
                         .Select(type => Activator.CreateInstance(type) as BatchEdit)
                         .Where(edit => edit != null)
-                        .Select(edit => new MenuItemViewModel() {
-                            Header = ThemeManager.GetString(edit!.Name),
-                            Command = noteBatchEditCommand,
-                            CommandParameter = edit,
+                        .Select(edit => {
+                            Avalonia.Input.KeyGesture? menuGesture = null;
+                            var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit!.Name);
+                            
+                            if (savedSc != null && 
+                                Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
+                                Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
+                                parsedKey != Avalonia.Input.Key.None) {
+                                menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
+                            }
+
+                            return new MenuItemViewModel() {
+                                Header = ThemeManager.GetString(edit!.Name),
+                                InputGesture = menuGesture,
+                                Command = noteBatchEditCommand,
+                                CommandParameter = edit,
+                            };
                         })
                 );
             } catch (Exception e) {
@@ -178,30 +239,35 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
 
             ViewModel.NoteBatchEdits.Insert(6, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.addbreath"),
+                InputGesture = GetGesture("Add Breath"),
                 Command = ReactiveCommand.Create(() => {
                     AddBreathNote();
                 })
             });
             ViewModel.NoteBatchEdits.Insert(9, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.quantize"),
+                InputGesture = GetGesture("Quantize Notes"),
                 Command = ReactiveCommand.Create(() => {
                     QuantizeNotes();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.randomizetuning"),
+                InputGesture = GetGesture("Randomize Tuning"),
                 Command = ReactiveCommand.Create(() => {
                     RandomizeTuning();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.lengthencrossfade"),
+                InputGesture = GetGesture("Lengthen Crossfade"),
                 Command = ReactiveCommand.Create(() => {
                     LengthenCrossfade();
                 })
             });
             ViewModel.LyricBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("lyricsreplace.replace"),
+                InputGesture = GetGesture("lyricsreplace.replace"),
                 Command = ReactiveCommand.Create(() => {
                     ReplaceLyrics();
                 })
@@ -1439,9 +1505,9 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
 
                 // Transposition
                 case "TransposeUp": notesVm.TransposeSelection(1); return true;
-                case "TransposeOctaveUp": notesVm.TransposeSelection(12); return true;
+                case "pianoroll.menu.notes.octaveup": notesVm.TransposeSelection(12); return true;
                 case "TransposeDown": notesVm.TransposeSelection(-1); return true;
-                case "TransposeOctaveDown": notesVm.TransposeSelection(-12); return true;
+                case "pianoroll.menu.notes.octavedown": notesVm.TransposeSelection(-12); return true;
 
                 // Note Movement & Sizing
                 case "MoveCursorLeft": notesVm.MoveCursor(-1); return true;
@@ -1514,9 +1580,24 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     return true;
                 case "SearchNote": SearchNote(); return true;
 
-                // Parts Navigation
-                case "MoveToNextPartUp": MoveToNextPart(false); return true;
-                case "MoveToNextPartDown": MoveToNextPart(true); return true;
+                // others
+                case "Quantize Notes": QuantizeNotes(); return true;
+                case "lyricsreplace.replace": ReplaceLyrics(); return true;
+                case "Randomize Tuning": RandomizeTuning(); return true;
+                case "Lengthen Crossfade": LengthenCrossfade(); return true;
+                case "Add Breath": AddBreathNote(); return true; 
+                case "Edit Note Defaults": EditNoteDefaults(); return true;
+                case "Open Singers Window": OnMenuSingers(this, new RoutedEventArgs()); return true;
+                case "Open Expressions": OnExpButtonClick(this, new RoutedEventArgs()); return true;
+                case "Lock Pitch Points": OnMenuLockPitchPoints(this, new RoutedEventArgs()); return true;
+                case "Lock Vibrato": OnMenuLockVibrato(this, new RoutedEventArgs()); return true;
+                case "Lock Expressions": OnMenuLockExpressions(this, new RoutedEventArgs()); return true;
+                case "Show Portrait": OnMenuShowPortrait(this, new RoutedEventArgs()); return true;
+                case "Show Icon": OnMenuShowIcon(this, new RoutedEventArgs()); return true;
+                case "Show Ghost Notes": OnMenuShowGhostNotes(this, new RoutedEventArgs()); return true;
+                case "Use Track Color": OnMenuUseTrackColor(this, new RoutedEventArgs()); return true;
+                case "Detach Piano Roll": OnMenuDetachPianoRoll(this, new RoutedEventArgs()); return true;
+                case "Hide Piano Roll": OnMenuHidePianoRoll(this, new RoutedEventArgs()); return true;
             }
             // External and batch note edits
             if (!string.IsNullOrEmpty(action)) {
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 0f111b859..868359bd0 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -230,32 +230,35 @@ private void SetUndoState() {
 
         private void LoadLegacyPlugins() {
             LegacyPlugins.Clear();
+            
+            Avalonia.Input.KeyGesture? GetGesture(string actionId) {
+                var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
+                if (sc != null && Enum.TryParse<Key>(sc.KeyName, out var k) && Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var m) && k != Key.None) {
+                    return new Avalonia.Input.KeyGesture(k, m);
+                }
+                return null;
+            }
+
             LegacyPlugins.AddRange(DocManager.Inst.Plugins.Select(plugin => new MenuItemViewModel() {
                 Header = plugin.Name,
+                InputGesture = GetGesture(plugin.Name),
                 Command = legacyPluginCommand,
                 CommandParameter = plugin,
             }));
 
             LegacyPluginShortcuts.Clear();
             foreach (MenuItemViewModel menu in LegacyPlugins) {
-                if (menu.CommandParameter is Classic.Plugin plugin) {
-                    if (Enum.TryParse(plugin.Shortcut, out Key key) && !LegacyPluginShortcuts.ContainsKey(key)) {
-                        LegacyPluginShortcuts.Add(key, menu);
-                    }
+                if (menu.InputGesture != null && !LegacyPluginShortcuts.ContainsKey(menu.InputGesture.Key)) {
+                    LegacyPluginShortcuts.Add(menu.InputGesture.Key, menu);
                 }
             }
-            LegacyPlugins.Add(new MenuItemViewModel() { // Separator
-                Header = "-",
-                Height = 1
-            });
+
+            LegacyPlugins.Add(new MenuItemViewModel() { Header = "-", Height = 1 });
             LegacyPlugins.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.plugin.openfolder"),
                 Command = ReactiveCommand.Create(() => {
-                    try {
-                        OS.OpenFolder(PathManager.Inst.PluginsPath);
-                    } catch (Exception e) {
-                        DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e));
-                    }
+                    try { OS.OpenFolder(PathManager.Inst.PluginsPath); } 
+                    catch (Exception e) { DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e)); }
                 })
             });
             LegacyPlugins.Add(new MenuItemViewModel() {
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 0832de466..be44b1fc7 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -226,8 +226,12 @@ public void ResetShortcut(ShortcutItemViewModel item) {
 
         public void ResetAllShortcuts() {
             var defaults = new Preferences.SerializablePreferences().Shortcuts;
+
+            Preferences.Default.Shortcuts = defaults.ToList(); 
+            Preferences.Save(); 
             foreach (var item in allShortcuts) {
                 var defaultBinding = defaults.FirstOrDefault(s => s.ActionId == item.ActionId);
+                
                 if (defaultBinding != null && 
                     Enum.TryParse<Key>(defaultBinding.KeyName, out var defKey) && 
                     Enum.TryParse<KeyModifiers>(defaultBinding.ModifiersName, out var defMods)) {
@@ -238,10 +242,11 @@ public void ResetAllShortcuts() {
                     item.Key = Key.None;
                     item.Modifiers = KeyModifiers.None;
                 }
+                
                 item.IsListening = false;
                 item.RefreshDisplay();
             }
-            SaveShortcuts();
+            SaveShortcuts(); 
         }
         private List<ShortcutItemViewModel> allShortcuts = new List<ShortcutItemViewModel>();
         public ObservableCollection<ShortcutItemViewModel> FilteredShortcuts { get; } = new ObservableCollection<ShortcutItemViewModel>();
@@ -258,7 +263,17 @@ public PreferencesViewModel() {
                         Enum.TryParse<Key>(binding.KeyName, out var parsedKey) &&
                         Enum.TryParse<KeyModifiers>(binding.ModifiersName, out var parsedMods)) {
                         
-                        string displayName = ThemeManager.GetString($"shortcut.{binding.ActionId}") ?? binding.ActionId;
+                        string lookupKey = "shortcut." + binding.ActionId;
+                        string displayName = ThemeManager.GetString(lookupKey);
+                        
+                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                            displayName = ThemeManager.GetString(binding.ActionId);
+                        }
+
+                        if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
+                            displayName = binding.ActionId;
+                        }
+
                         if (displayName.StartsWith("shortcut.")) {
                             displayName = displayName.Substring(9);
                         }
@@ -364,6 +379,16 @@ public PreferencesViewModel() {
                 }
             }
 
+            var uniqueShortcuts = allShortcuts
+                .GroupBy(sc => sc.ActionId)
+                .Select(group => group.First())
+                .ToList();
+
+            allShortcuts.Clear();
+            foreach (var sc in uniqueShortcuts) {
+                allShortcuts.Add(sc);
+            }
+
             this.WhenAnyValue(vm => vm.ShortcutSearchText)
             .Subscribe(text => {
                 FilteredShortcuts.Clear();

From 7465b6e0f4d274d340928ce0e87a2a4118cde60b Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Tue, 5 May 2026 20:54:22 +0800
Subject: [PATCH 08/22] reworked shortcuts design

---
 OpenUtau/Views/PreferencesDialog.axaml | 53 +++++++++++++++++---------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 0a58458fc..c0a9e85e6 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -91,33 +91,48 @@
         </StackPanel>
 
         <!-- Shortcuts -->
-        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
-          <StackPanel Margin="0,10,0,0">
-            <TextBlock Text="{DynamicResource prefs.shortcuts}" Margin="0,10,0,10" FontWeight="Bold"/>
-            
-            <Grid ColumnDefinitions="*, Auto" Margin="5,0,5,10">
-              <TextBox Grid.Column="0" Text="{Binding ShortcutSearchText}" Watermark="{DynamicResource prefs.shortcut.search.watermark}" />
-              <Button Grid.Column="1" Margin="10,0,0,0" Content="{DynamicResource pianoroll.menu.reset}" Command="{Binding ResetAllShortcuts}" />
-            </Grid>
-
+        <Grid RowDefinitions="Auto, Auto, Auto, *">
+          <TextBlock Grid.Row="0" 
+                Text="{DynamicResource prefs.shortcuts}" 
+                Margin="0,10,0,10" 
+                FontWeight="Bold"/>
+          <Grid Grid.Row="1" ColumnDefinitions="*, Auto" Margin="5,0,5,5">
+            <TextBox Grid.Column="0" 
+                Text="{Binding ShortcutSearchText}" 
+                Watermark="{DynamicResource prefs.shortcut.search.watermark}" />
+            <Button Grid.Column="1" 
+                Margin="10,0,0,0" 
+                Content="{DynamicResource pianoroll.menu.reset}" 
+                Command="{Binding ResetAllShortcuts}" />
+          </Grid>
+          <TextBlock Grid.Row="2" 
+                Text="{DynamicResource prefs.note.restart}" 
+                Margin="5,0,5,10" 
+                FontStyle="Italic" 
+                Opacity="0.75" 
+                TextWrapping="Wrap"/>
+          <ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
             <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
                   <Grid ColumnDefinitions="*, Auto" Margin="5">
-                    <TextBlock Text="{Binding ActionName}" VerticalAlignment="Center"/>
-                    
-                    <Button Grid.Column="1" Content="{Binding DisplayString}" 
-                            x:CompileBindings="False"
-                            Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
-                            CommandParameter="{Binding}"
-                            PointerReleased="OnShortcutRightClick"
-                            ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
+                    <TextBlock Grid.Column="0" 
+                          Text="{Binding ActionName}" 
+                          VerticalAlignment="Center" 
+                          TextWrapping="Wrap"/>
+                    <Button Grid.Column="1" 
+                          Content="{Binding DisplayString}" 
+                          x:CompileBindings="False"
+                          Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
+                          CommandParameter="{Binding}"
+                          PointerReleased="OnShortcutRightClick"
+                          ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
                   </Grid>
                 </DataTemplate>
               </ItemsControl.ItemTemplate>
             </ItemsControl>
-          </StackPanel>
-        </ScrollViewer>
+          </ScrollViewer>
+        </Grid>
         
         <!-- Playback -->
         <StackPanel>

From bd55d6527108e7987d35a724328a6a9910af6a86 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Tue, 5 May 2026 22:21:52 +0800
Subject: [PATCH 09/22] fix ghost data

---
 OpenUtau/ViewModels/PreferencesViewModel.cs | 27 +++++++++++++++++++++
 OpenUtau/Views/PreferencesDialog.axaml      |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index be44b1fc7..abac4b828 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -256,6 +256,33 @@ public void ResetAllShortcuts() {
         public PreferencesViewModel() {
             ListenForShortcutCommand = ReactiveCommand.Create<ShortcutItemViewModel>(ListenForShortcut);
 
+            var validActionIds = new HashSet<string>();
+            
+            var defaultShortcuts = new Preferences.SerializablePreferences().Shortcuts;
+            foreach (var sc in defaultShortcuts) {
+                validActionIds.Add(sc.ActionId);
+            }
+            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
+                try { if (Activator.CreateInstance(type) is BatchEdit edit) validActionIds.Add(edit.Name); } catch { }
+            }
+            if (DocManager.Inst.Plugins != null) {
+                foreach (var plugin in DocManager.Inst.Plugins) {
+                    validActionIds.Add(plugin.Name);
+                }
+            }
+            if (Preferences.Default.Shortcuts != null) {
+                bool ghostsRemoved = false;
+                for (int i = Preferences.Default.Shortcuts.Count - 1; i >= 0; i--) {
+                    if (!validActionIds.Contains(Preferences.Default.Shortcuts[i].ActionId)) {
+                        Preferences.Default.Shortcuts.RemoveAt(i);
+                        ghostsRemoved = true;
+                    }
+                }
+                if (ghostsRemoved) {
+                    Preferences.Save();
+                }
+            }
+
             if (Preferences.Default.Shortcuts != null) {
                 foreach (var binding in Preferences.Default.Shortcuts) {
                     
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index c0a9e85e6..e88832ce2 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -133,7 +133,7 @@
             </ItemsControl>
           </ScrollViewer>
         </Grid>
-        
+
         <!-- Playback -->
         <StackPanel>
           <TextBlock Text="{DynamicResource prefs.playback.device}" FontWeight="Bold"/>

From d6508d2f27bceb10553e86af2f3ba148a8f2d999 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Wed, 6 May 2026 08:32:50 +0800
Subject: [PATCH 10/22] fix ghost data and write missing default shortcuts

---
 OpenUtau/ViewModels/PreferencesViewModel.cs | 93 ++++++++++++++-------
 1 file changed, 65 insertions(+), 28 deletions(-)

diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index abac4b828..9eda1ccc4 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -271,14 +271,46 @@ public PreferencesViewModel() {
                 }
             }
             if (Preferences.Default.Shortcuts != null) {
-                bool ghostsRemoved = false;
-                for (int i = Preferences.Default.Shortcuts.Count - 1; i >= 0; i--) {
-                    if (!validActionIds.Contains(Preferences.Default.Shortcuts[i].ActionId)) {
-                        Preferences.Default.Shortcuts.RemoveAt(i);
-                        ghostsRemoved = true;
+                var orderedShortcuts = new List<Preferences.ShortcutBinding>();
+                bool requiresSave = false;
+
+                foreach (var defaultBinding in defaultShortcuts) {
+                    var userBinding = Preferences.Default.Shortcuts.FirstOrDefault(s => s.ActionId == defaultBinding.ActionId);
+
+                    if (userBinding != null) {
+                        orderedShortcuts.Add(userBinding);
+                    } else {
+                        orderedShortcuts.Add(new Preferences.ShortcutBinding {
+                            ActionId = defaultBinding.ActionId,
+                            KeyName = defaultBinding.KeyName,
+                            ModifiersName = defaultBinding.ModifiersName
+                        });
+                        requiresSave = true;
+                    }
+                }
+
+                foreach (var userBinding in Preferences.Default.Shortcuts) {
+                    bool isDefault = defaultShortcuts.Any(d => d.ActionId == userBinding.ActionId);
+                    bool isValidPlugin = validActionIds.Contains(userBinding.ActionId);
+
+                    if (!isDefault && isValidPlugin) {
+                        orderedShortcuts.Add(userBinding);
                     }
                 }
-                if (ghostsRemoved) {
+
+                if (Preferences.Default.Shortcuts.Count != orderedShortcuts.Count) {
+                    requiresSave = true;
+                } else {
+                    for (int i = 0; i < orderedShortcuts.Count; i++) {
+                        if (Preferences.Default.Shortcuts[i].ActionId != orderedShortcuts[i].ActionId) {
+                            requiresSave = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (requiresSave) {
+                    Preferences.Default.Shortcuts = orderedShortcuts;
                     Preferences.Save();
                 }
             }
@@ -286,32 +318,37 @@ public PreferencesViewModel() {
             if (Preferences.Default.Shortcuts != null) {
                 foreach (var binding in Preferences.Default.Shortcuts) {
                     
-                    if (!string.IsNullOrEmpty(binding.KeyName) && 
-                        Enum.TryParse<Key>(binding.KeyName, out var parsedKey) &&
-                        Enum.TryParse<KeyModifiers>(binding.ModifiersName, out var parsedMods)) {
-                        
-                        string lookupKey = "shortcut." + binding.ActionId;
-                        string displayName = ThemeManager.GetString(lookupKey);
-                        
-                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                            displayName = ThemeManager.GetString(binding.ActionId);
-                        }
+                    Key parsedKey = Key.None;
+                    KeyModifiers parsedMods = KeyModifiers.None;
+                    
+                    if (!string.IsNullOrEmpty(binding.KeyName)) {
+                        Enum.TryParse(binding.KeyName, out parsedKey);
+                    }
+                    if (!string.IsNullOrEmpty(binding.ModifiersName)) {
+                        Enum.TryParse(binding.ModifiersName, out parsedMods);
+                    }
 
-                        if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
-                            displayName = binding.ActionId;
-                        }
+                    string lookupKey = "shortcut." + binding.ActionId;
+                    string displayName = ThemeManager.GetString(lookupKey);
+                    
+                    if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                        displayName = ThemeManager.GetString(binding.ActionId);
+                    }
 
-                        if (displayName.StartsWith("shortcut.")) {
-                            displayName = displayName.Substring(9);
-                        }
+                    if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
+                        displayName = binding.ActionId;
+                    }
 
-                        allShortcuts.Add(new ShortcutItemViewModel {
-                            ActionId = binding.ActionId,
-                            ActionName = displayName,
-                            Key = parsedKey,
-                            Modifiers = parsedMods
-                        });
+                    if (displayName.StartsWith("shortcut.")) {
+                        displayName = displayName.Substring(9);
                     }
+
+                    allShortcuts.Add(new ShortcutItemViewModel {
+                        ActionId = binding.ActionId,
+                        ActionName = displayName,
+                        Key = parsedKey,
+                        Modifiers = parsedMods
+                    });
                 }
             }
             

From cbb273d56a120377f0b3f483a5242e1a0ddb09dd Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Thu, 7 May 2026 08:09:18 +0800
Subject: [PATCH 11/22] fix macos cmd key

---
 OpenUtau/ViewModels/KeyTranslator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index e2a87b6be..990abcb45 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -14,7 +14,7 @@ public static string GetFriendlyName(string keyName) {
                 // Modifiers
                 "Windows" or "LWin" or "RWin" => IsMac ? "Cmd" : "Win",
                 "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "Opt" : "Alt",
-                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => "Ctrl",
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl"=> IsMac ? "Cmd" : "Ctrl",
                 "Shift" or "LeftShift" or "RightShift" => "Shift",
                 
                 // Navigation & Editing

From 28c21e401d26392c9a393c67248e3c2885da763e Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Fri, 8 May 2026 11:56:18 +0800
Subject: [PATCH 12/22] Fix key translator

---
 OpenUtau/Controls/PianoRoll.axaml.cs        | 27 ++++-------
 OpenUtau/ViewModels/KeyTranslator.cs        | 54 +++++++++++++++++++--
 OpenUtau/ViewModels/PianoRollViewModel.cs   | 23 ++++-----
 OpenUtau/ViewModels/PreferencesViewModel.cs |  9 ++--
 4 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index bdbd701f3..96eec8289 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -30,16 +30,7 @@ interface IValueTip {
     }
 
     public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
-        private Avalonia.Input.KeyGesture? GetGesture(string actionId) {
-            var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
-            if (sc != null && 
-                Enum.TryParse<Avalonia.Input.Key>(sc.KeyName, out var k) && 
-                Enum.TryParse<Avalonia.Input.KeyModifiers>(sc.ModifiersName, out var m) && 
-                k != Avalonia.Input.Key.None) {
-                return new Avalonia.Input.KeyGesture(k, m);
-            }
-            return null;
-        }
+
         public MainWindow? MainWindow { get; set; }
         public PianoRollViewModel ViewModel;
 
@@ -239,35 +230,35 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
 
             ViewModel.NoteBatchEdits.Insert(6, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.addbreath"),
-                InputGesture = GetGesture("Add Breath"),
+                InputGesture = KeyTranslator.GetGesture("Add Breath"),
                 Command = ReactiveCommand.Create(() => {
                     AddBreathNote();
                 })
             });
             ViewModel.NoteBatchEdits.Insert(9, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.quantize"),
-                InputGesture = GetGesture("Quantize Notes"),
+                InputGesture = KeyTranslator.GetGesture("Quantize Notes"),
                 Command = ReactiveCommand.Create(() => {
                     QuantizeNotes();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.randomizetuning"),
-                InputGesture = GetGesture("Randomize Tuning"),
+                InputGesture = KeyTranslator.GetGesture("Randomize Tuning"),
                 Command = ReactiveCommand.Create(() => {
                     RandomizeTuning();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.lengthencrossfade"),
-                InputGesture = GetGesture("Lengthen Crossfade"),
+                InputGesture = KeyTranslator.GetGesture("Lengthen Crossfade"),
                 Command = ReactiveCommand.Create(() => {
                     LengthenCrossfade();
                 })
             });
             ViewModel.LyricBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("lyricsreplace.replace"),
-                InputGesture = GetGesture("lyricsreplace.replace"),
+                InputGesture = KeyTranslator.GetGesture("lyricsreplace.replace"),
                 Command = ReactiveCommand.Create(() => {
                     ReplaceLyrics();
                 })
@@ -863,18 +854,18 @@ private void NotesCanvasRightPointerPressed(Control control, PointerPoint point,
                             Header = ThemeManager.GetString("context.note.copy"),
                             Command = ViewModel.NoteCopyCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = new KeyGesture(Key.C, KeyModifiers.Control),
+                            InputGesture = KeyTranslator.GetGesture("Copy"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.delete"),
                             Command = ViewModel.NoteDeleteCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = new KeyGesture(Key.Delete),
+                            InputGesture = KeyTranslator.GetGesture("DeleteNotes"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.pasteparameters"),
                             Command = ReactiveCommand.Create(() => ViewModel.NotesViewModel.PasteSelectedParams(RootWindow)),
-                            InputGesture = new KeyGesture(Key.V, KeyModifiers.Alt),
+                            InputGesture = KeyTranslator.GetGesture("PasteParameters"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("pianoroll.menu.notes"),
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 990abcb45..d9372d2af 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,9 +1,12 @@
+using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Input;
+using OpenUtau.Core.Util;
 
 namespace OpenUtau.App.ViewModels {
     public static class KeyTranslator {
-        private static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+        public static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
         /// <summary>
         /// Converts ugly internal Avalonia key names into human-readable strings.
@@ -12,10 +15,10 @@ public static class KeyTranslator {
         public static string GetFriendlyName(string keyName) {
             return keyName switch {
                 // Modifiers
-                "Windows" or "LWin" or "RWin" => IsMac ? "Cmd" : "Win",
-                "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "Opt" : "Alt",
-                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl"=> IsMac ? "Cmd" : "Ctrl",
-                "Shift" or "LeftShift" or "RightShift" => "Shift",
+                "Windows" or "LWin" or "RWin" => IsMac ? "⌘" : "Win",
+                "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "⌥" : "Alt",
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌘" : "Ctrl",
+                "Shift" or "LeftShift" or "RightShift" => IsMac ? "⇧" : "Shift",
                 
                 // Navigation & Editing
                 "Escape" => "Esc",
@@ -82,5 +85,46 @@ public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
                 _ => false
             };
         }
+
+        /// <summary>
+        /// Converts raw Avalonia KeyModifiers into a clean, OS-specific string.
+        /// Windows: "Ctrl + Shift" | macOS: "⇧⌘"
+        /// </summary>
+        public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
+            if (modifiers == KeyModifiers.None) return "";
+            var parts = new System.Collections.Generic.List<string>();
+            if (modifiers.HasFlag(KeyModifiers.Control)) {
+                parts.Add(IsMac ? "⌃" : "Ctrl");
+            }
+            if (modifiers.HasFlag(KeyModifiers.Alt)) {
+                parts.Add(IsMac ? "⌥" : "Alt");
+            }
+            if (modifiers.HasFlag(KeyModifiers.Shift)) {
+                parts.Add(IsMac ? "⇧" : "Shift");
+            }
+            if (modifiers.HasFlag(KeyModifiers.Meta)) {
+                parts.Add(IsMac ? "⌘" : "Win");
+            }
+
+            // Windows joins with " + ". Mac joins with nothing.
+            return string.Join(IsMac ? "" : " + ", parts);
+        }
+
+        /// <summary>
+        /// Generates a native Avalonia KeyGesture for UI Menus (Top Menu, Right-Click).
+        /// Automatically formats for Windows (Ctrl+S) or Mac (⌘S).
+        /// </summary>
+        public static Avalonia.Input.KeyGesture? GetGesture(string actionId) {
+            var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
+            
+            if (sc != null && 
+                Enum.TryParse<Avalonia.Input.Key>(sc.KeyName, out var k) && 
+                Enum.TryParse<Avalonia.Input.KeyModifiers>(sc.ModifiersName, out var m) && 
+                k != Avalonia.Input.Key.None) {
+                
+                return new Avalonia.Input.KeyGesture(k, m);
+            }
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 868359bd0..f9d047a08 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -109,12 +109,17 @@ public void ReloadShortcuts() {
             var newHotkeys = new Dictionary<string, string>();
             
             foreach (var sc in Preferences.Default.Shortcuts) {
-                string mods = sc.ModifiersName
-                    .Replace("None", "")
-                    .Replace(", ", "+");
+                Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var parsedMods);
                 
+                string mods = KeyTranslator.GetFriendlyModifiersName(parsedMods);
                 string key = KeyTranslator.GetFriendlyName(sc.KeyName); 
-                newHotkeys[sc.ActionId] = string.IsNullOrEmpty(mods) ? key : $"{mods}+{key}";
+                
+                if (string.IsNullOrEmpty(mods) || sc.ModifiersName == "None") {
+                    newHotkeys[sc.ActionId] = key;
+                } else {
+                    // Mac gets no separator, Windows gets standard "+" for menus
+                    newHotkeys[sc.ActionId] = KeyTranslator.IsMac ? $"{mods}{key}" : $"{mods.Replace(" + ", "+")}+{key}";
+                }
             }
             
             Hotkeys = newHotkeys;
@@ -231,17 +236,9 @@ private void SetUndoState() {
         private void LoadLegacyPlugins() {
             LegacyPlugins.Clear();
             
-            Avalonia.Input.KeyGesture? GetGesture(string actionId) {
-                var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
-                if (sc != null && Enum.TryParse<Key>(sc.KeyName, out var k) && Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var m) && k != Key.None) {
-                    return new Avalonia.Input.KeyGesture(k, m);
-                }
-                return null;
-            }
-
             LegacyPlugins.AddRange(DocManager.Inst.Plugins.Select(plugin => new MenuItemViewModel() {
                 Header = plugin.Name,
-                InputGesture = GetGesture(plugin.Name),
+                InputGesture = KeyTranslator.GetGesture(plugin.Name),
                 Command = legacyPluginCommand,
                 CommandParameter = plugin,
             }));
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 12c948a5b..e2b74aedb 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -40,10 +40,13 @@ public class ShortcutItemViewModel : ViewModelBase {
         public string DisplayString {
             get {
                 if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening") ?? "Press keys...";
-                
-                string mods = Modifiers == KeyModifiers.None ? "" : $"{Modifiers} + ";
+                string mods = KeyTranslator.GetFriendlyModifiersName(Modifiers);
                 string friendlyKey = KeyTranslator.GetFriendlyName(Key.ToString());
-                return $"{mods}{friendlyKey}";
+                if (!string.IsNullOrEmpty(mods)) {
+                    return KeyTranslator.IsMac ? $"{mods}{friendlyKey}" : $"{mods} + {friendlyKey}";
+                }
+                
+                return friendlyKey;
             }
         }
 

From fc6a82d20d00fc1c7521aebdcb401b2cf898fda4 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Wed, 20 May 2026 23:03:36 +0800
Subject: [PATCH 13/22] Fix tag location got lost

---
 OpenUtau/Controls/PianoRoll.axaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index d01084171..98a90a3bd 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -653,6 +653,19 @@
                 <Path Classes="stroked" Data="M 4.5 13.5 L 7.5 13.5 L 7.5 9.5 A 1,1 0 1 1 10.5,9.5 L 10.5 13.5 L 13.5 13.5 L 13.5 8.5 A 1,1 0 1 0 4.5,8.5 Z"/>
               </Border>
             </ToggleButton>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding ShowPhonemizerTags}"
+                          ToolTip.Tip="Show Phonemizer Tags">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M21.41 11.58l-9-9C12.04 2.21 11.54 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.41l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.41zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z">
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".65" ScaleY=".65" />
+                      <TranslateTransform X="-1" Y="-1"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
             <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton">
               <ToolTip.Tip>
                 <StackPanel>

From 28ed133af86b20d3785583fd65d22b20a83605b1 Mon Sep 17 00:00:00 2001
From: cadlaxa <cadag113003@gmail.com>
Date: Sat, 23 May 2026 17:28:40 +0800
Subject: [PATCH 14/22] Fixes to Macos keybinds

---
 OpenUtau/Controls/PianoRoll.axaml         | 62 +++++++++++------------
 OpenUtau/ViewModels/KeyTranslator.cs      | 45 ++++++++++------
 OpenUtau/ViewModels/PianoRollViewModel.cs | 39 +++++++++-----
 3 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index 98a90a3bd..da3518476 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -215,17 +215,17 @@
             </Menu.Styles>
 
             <MenuItem Header="{DynamicResource menu.edit}">
-              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
-              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
+              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding HotkeyDisplayTexts[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
+              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding HotkeyDisplayTexts[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding Hotkeys[Cut]}" Command="{Binding Cut}"/>
-              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding Hotkeys[Copy]}" Command="{Binding Copy}"/>
-              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding Hotkeys[Paste]}" Command="{Binding Paste}"/>
-              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding Hotkeys[PastePlain]}" Command="{Binding PastePlain}"/>
-              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding Hotkeys[DeleteNotes]}" Command="{Binding Delete}"/>
+              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding HotkeyDisplayTexts[Cut]}" Command="{Binding Cut}"/>
+              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding HotkeyDisplayTexts[Copy]}" Command="{Binding Copy}"/>
+              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding HotkeyDisplayTexts[Paste]}" Command="{Binding Paste}"/>
+              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding HotkeyDisplayTexts[PastePlain]}" Command="{Binding PastePlain}"/>
+              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding HotkeyDisplayTexts[DeleteNotes]}" Command="{Binding Delete}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding Hotkeys[SearchNote]}" Click="OnMenuSearchNote"/>
-              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding Hotkeys[SelectAll]}" Command="{Binding SelectAll}"/>
+              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding HotkeyDisplayTexts[SearchNote]}" Click="OnMenuSearchNote"/>
+              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding HotkeyDisplayTexts[SelectAll]}" Command="{Binding SelectAll}"/>
               <MenuItem Header="-" Height="1"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.singer}" Click="OnMenuSingers"/>
               <MenuItem Header="{DynamicResource menu.edit.lockunselectednotes}">
@@ -268,7 +268,7 @@
                   <CheckBox IsChecked="{Binding UseTrackColor}" />
                 </MenuItem.Icon>
               </MenuItem>
-              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[FullScreen]}" Click="OnMenuFullScreen"/>
+              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding HotkeyDisplayTexts[FullScreen]}" Click="OnMenuFullScreen"/>
               <MenuItem Header="{DynamicResource prefs.appearance.degree}">
                 <MenuItem Header="{DynamicResource prefs.appearance.degree.off}" Click="OnMenuDegreeStyle" Tag="0">
                   <MenuItem.Icon>
@@ -342,7 +342,7 @@
               <MenuItem Header="{DynamicResource pianoroll.menu.external}" ItemsSource="{Binding ExternalBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" Classes="MenuItemWithSubMenu"/>
             </MenuItem>
-            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding Hotkeys[EditLyrics]}" Click="OnMenuEditLyrics"/>
+            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding HotkeyDisplayTexts[EditLyrics]}" Click="OnMenuEditLyrics"/>
             <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
           </Menu>
         </Border>
@@ -352,7 +352,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.tips}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleTips], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleTips], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -367,7 +367,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.selectionv2}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect1], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect1], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -387,7 +387,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.penv2}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect2Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -407,7 +407,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.penplus}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Alt], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect2Alt], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -427,7 +427,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.eraser}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect3], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect3], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -447,7 +447,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.drawpitch}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -467,7 +467,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.overwritepitch}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Overwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Overwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -487,7 +487,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.drawlinepitch}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Line], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Line], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -507,7 +507,7 @@
                   <ToolTip.Tip>
                     <StackPanel>
                       <TextBlock Text="{DynamicResource pianoroll.tool.overwritelinepitch}"/>
-                      <TextBlock Text="{Binding Hotkeys[ToolSelect4LineOverwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                      <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4LineOverwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                     </StackPanel>
                   </ToolTip.Tip>
                   <Grid Width="18" Height="18">
@@ -527,7 +527,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.knife}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToolSelect5], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect5], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -546,7 +546,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.tone}"/>
-                  <TextBlock Text="{Binding Hotkeys[TogglePlayTone], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePlayTone], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -564,7 +564,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.vibrato}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleVibrato], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleVibrato], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -579,7 +579,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.pitch}"/>
-                  <TextBlock Text="{Binding Hotkeys[TogglePitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -592,7 +592,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.finalpitch}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleFinalPitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleFinalPitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -603,7 +603,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.waveform}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleWaveform], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleWaveform], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -621,7 +621,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.phoneme}"/>
-                  <TextBlock Text="{Binding Hotkeys[TogglePhoneme], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePhoneme], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -632,7 +632,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.expressions}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleExpressions], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleExpressions], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -646,7 +646,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.snap}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleSnap], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleSnap], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Border Width="18" Height="18">
@@ -670,7 +670,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.snapdiv}"/>
-                  <TextBlock Text="{Binding Hotkeys[OpenSnapMenu], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[OpenSnapMenu], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
@@ -699,7 +699,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.noteparams}"/>
-                  <TextBlock Text="{Binding Hotkeys[ToggleNoteParams], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleNoteParams], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index d9372d2af..ac8eb9ae6 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -9,15 +9,34 @@ public static class KeyTranslator {
         public static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
         /// <summary>
-        /// Converts ugly internal Avalonia key names into human-readable strings.
-        /// Accounts for macOS and Linux naming conventions.
+        /// Normalizes modifiers so Windows "Ctrl" becomes Mac "Cmd", 
+        /// and Windows "Win" becomes Mac "Ctrl".
         /// </summary>
+        private static KeyModifiers NormalizeModifiers(KeyModifiers modifiers) {
+            if (!IsMac) return modifiers;
+
+            var normalized = modifiers;
+            bool hasCtrl = modifiers.HasFlag(KeyModifiers.Control);
+            bool hasMeta = modifiers.HasFlag(KeyModifiers.Meta);
+
+            if (hasCtrl) {
+                normalized &= ~KeyModifiers.Control;
+                normalized |= KeyModifiers.Meta; 
+            }
+            if (hasMeta) {
+                normalized &= ~KeyModifiers.Meta;
+                normalized |= KeyModifiers.Control; 
+            }
+
+            return normalized;
+        }
+
         public static string GetFriendlyName(string keyName) {
             return keyName switch {
                 // Modifiers
                 "Windows" or "LWin" or "RWin" => IsMac ? "⌘" : "Win",
                 "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "⌥" : "Alt",
-                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌘" : "Ctrl",
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌃" : "Ctrl", 
                 "Shift" or "LeftShift" or "RightShift" => IsMac ? "⇧" : "Shift",
                 
                 // Navigation & Editing
@@ -65,10 +84,6 @@ public static string GetFriendlyName(string keyName) {
             };
         }
 
-        /// <summary>
-        /// Fuzzy matcher for cross-platform keyboard quirks.
-        /// If the exact enum doesn't match, it checks known hardware equivalents.
-        /// </summary>
         public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
             if (savedKey == pressedKey) return true;
 
@@ -86,12 +101,12 @@ public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
             };
         }
 
-        /// <summary>
-        /// Converts raw Avalonia KeyModifiers into a clean, OS-specific string.
-        /// Windows: "Ctrl + Shift" | macOS: "⇧⌘"
-        /// </summary>
         public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
             if (modifiers == KeyModifiers.None) return "";
+            
+            // Apply macOS normalization before rendering strings
+            modifiers = NormalizeModifiers(modifiers);
+
             var parts = new System.Collections.Generic.List<string>();
             if (modifiers.HasFlag(KeyModifiers.Control)) {
                 parts.Add(IsMac ? "⌃" : "Ctrl");
@@ -106,14 +121,9 @@ public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
                 parts.Add(IsMac ? "⌘" : "Win");
             }
 
-            // Windows joins with " + ". Mac joins with nothing.
             return string.Join(IsMac ? "" : " + ", parts);
         }
 
-        /// <summary>
-        /// Generates a native Avalonia KeyGesture for UI Menus (Top Menu, Right-Click).
-        /// Automatically formats for Windows (Ctrl+S) or Mac (⌘S).
-        /// </summary>
         public static Avalonia.Input.KeyGesture? GetGesture(string actionId) {
             var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
             
@@ -122,6 +132,9 @@ public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
                 Enum.TryParse<Avalonia.Input.KeyModifiers>(sc.ModifiersName, out var m) && 
                 k != Avalonia.Input.Key.None) {
                 
+                // Apply macOS normalization to the actual hotkey gesture
+                m = NormalizeModifiers(m);
+
                 return new Avalonia.Input.KeyGesture(k, m);
             }
             return null;
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index e467766bc..88df3602e 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -47,7 +47,8 @@ public class PianoRollViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public NotesViewModel NotesViewModel { get; set; }
         [Reactive] public PlaybackViewModel? PlaybackViewModel { get; set; }
         [Reactive] public CurveViewModel CurveViewModel { get; set; }
-        [Reactive] public Dictionary<string, string> Hotkeys { get; set; } = new Dictionary<string, string>();
+        [Reactive] public Dictionary<string, KeyGesture> Hotkeys { get; set; } = new Dictionary<string, KeyGesture>();
+        [Reactive] public Dictionary<string, string> HotkeyDisplayTexts { get; set; } = new Dictionary<string, string>();
 
         public double Width => Preferences.Default.PianorollWindowSize.Width;
         public double Height => Preferences.Default.PianorollWindowSize.Height;
@@ -114,23 +115,33 @@ public bool ShowPhonemizerTags {
         private ReactiveCommand<Classic.Plugin, Unit> legacyPluginCommand;
 
         public void ReloadShortcuts() {
-            var newHotkeys = new Dictionary<string, string>();
+            var newHotkeys = new Dictionary<string, KeyGesture>();
+            var newDisplayTexts = new Dictionary<string, string>();
             
-            foreach (var sc in Preferences.Default.Shortcuts) {
-                Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var parsedMods);
-                
-                string mods = KeyTranslator.GetFriendlyModifiersName(parsedMods);
-                string key = KeyTranslator.GetFriendlyName(sc.KeyName); 
-                
-                if (string.IsNullOrEmpty(mods) || sc.ModifiersName == "None") {
-                    newHotkeys[sc.ActionId] = key;
-                } else {
-                    // Mac gets no separator, Windows gets standard "+" for menus
-                    newHotkeys[sc.ActionId] = KeyTranslator.IsMac ? $"{mods}{key}" : $"{mods.Replace(" + ", "+")}+{key}";
+            if (Preferences.Default.Shortcuts != null) {
+                foreach (var sc in Preferences.Default.Shortcuts) {
+                    // Functional Gesture Binding
+                    var gesture = KeyTranslator.GetGesture(sc.ActionId);
+                    if (gesture != null) {
+                        newHotkeys[sc.ActionId] = gesture;
+                    }
+
+                    // Friendly Display Text Binding
+                    Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var parsedMods);
+                    string mods = KeyTranslator.GetFriendlyModifiersName(parsedMods);
+                    string key = KeyTranslator.GetFriendlyName(sc.KeyName); 
+                    
+                    if (string.IsNullOrEmpty(mods) || sc.ModifiersName == "None") {
+                        newDisplayTexts[sc.ActionId] = key;
+                    } else {
+                        newDisplayTexts[sc.ActionId] = KeyTranslator.IsMac 
+                            ? $"{mods}{key}" 
+                            : $"{mods.Replace(" + ", "+")}+{key}";
+                    }
                 }
             }
-            
             Hotkeys = newHotkeys;
+            HotkeyDisplayTexts = newDisplayTexts;
         }
 
         public PianoRollViewModel() {

From e77d98231d6d2c7f433d74120292780a717710bd Mon Sep 17 00:00:00 2001
From: Maiko <maiko3tattun@gmail.com>
Date: Sun, 24 May 2026 20:42:19 +0900
Subject: [PATCH 15/22] Fix Shortcut Key (wip)

---
 OpenUtau.Core/Util/Preferences.cs           | 187 +------
 OpenUtau/Controls/PianoRoll.axaml           |  62 +--
 OpenUtau/Controls/PianoRoll.axaml.cs        | 101 +---
 OpenUtau/ViewModels/KeyTranslator.cs        | 345 ++++++++++--
 OpenUtau/ViewModels/PianoRollViewModel.cs   |  28 +-
 OpenUtau/ViewModels/PreferencesViewModel.cs | 579 +++++++++-----------
 OpenUtau/Views/PreferencesDialog.axaml      |  91 +--
 OpenUtau/Views/ShortcutKeyDialog.axaml      |   9 +
 OpenUtau/Views/ShortcutKeyDialog.axaml.cs   |  12 +
 9 files changed, 685 insertions(+), 729 deletions(-)
 create mode 100644 OpenUtau/Views/ShortcutKeyDialog.axaml
 create mode 100644 OpenUtau/Views/ShortcutKeyDialog.axaml.cs

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index 79bb4f678..007485acc 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -19,8 +19,12 @@ static Preferences() {
         }
         public class ShortcutBinding {
             public string ActionId { get; set; }
-            public string KeyName { get; set; } 
-            public string ModifiersName { get; set; }
+            public string[] Shortcuts { get; set; }
+
+            public ShortcutBinding(string actionId, string[] shortcuts) {
+                ActionId = actionId;
+                Shortcuts = shortcuts;
+            }
         }
         public static void Save() {
             try {
@@ -221,184 +225,7 @@ public class SerializablePreferences {
             public bool LockUnselectedNotesPitch = true;
             public bool LockUnselectedNotesVibrato = true;
             public bool LockUnselectedNotesExpressions = true;
-            [JsonProperty(ObjectCreationHandling = ObjectCreationHandling.Replace)]
-            public List<ShortcutBinding> Shortcuts { get; set; } = new List<ShortcutBinding> {
-                // Playback & Selection
-                new ShortcutBinding { ActionId = "PlayOrPause", KeyName = "Space", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "PlaySelection", KeyName = "Space", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ClearSelection", KeyName = "Escape", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "SelectAll", KeyName = "A", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "DeselectAll", KeyName = "D", ModifiersName = "Control" },
-
-                // UI & Windows
-                new ShortcutBinding { ActionId = "HideDetachedWindow", KeyName = "F4", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "FullScreen", KeyName = "F11", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "OpenPluginMenu", KeyName = "N", ModifiersName = "None" },
-
-                // Lyrics
-                new ShortcutBinding { ActionId = "EditLyrics", KeyName = "Enter", ModifiersName = "None" },
-
-                // Tools
-                new ShortcutBinding { ActionId = "ToolSelect1", KeyName = "D1", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToolSelect2Main", KeyName = "D2", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToolSelect2Alt", KeyName = "D2", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "ToolSelect3", KeyName = "D3", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToolSelect4Main", KeyName = "D4", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToolSelect4Overwrite", KeyName = "D4", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "ToolSelect4Line", KeyName = "D4", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "ToolSelect4LineOverwrite", KeyName = "D4", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "ToolSelect5", KeyName = "D5", ModifiersName = "None" },
-
-                // Expressions
-                new ShortcutBinding { ActionId = "ExpSelect1", KeyName = "D1", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect2", KeyName = "D2", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect3", KeyName = "D3", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect4", KeyName = "D4", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect5", KeyName = "D5", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect6", KeyName = "D6", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect7", KeyName = "D7", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect8", KeyName = "D8", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect9", KeyName = "D9", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ExpSelect10", KeyName = "D0", ModifiersName = "Alt" },
-
-                // Toggles
-                new ShortcutBinding { ActionId = "ToggleFinalPitch", KeyName = "R", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToggleTips", KeyName = "T", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToggleVibrato", KeyName = "U", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "TogglePitch", KeyName = "I", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "TogglePhoneme", KeyName = "O", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToggleExpressions", KeyName = "L", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToggleSnap", KeyName = "P", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "OpenSnapMenu", KeyName = "P", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ToggleNoteParams", KeyName = "OemPipe", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "TogglePlayTone", KeyName = "Y", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ToggleWaveform", KeyName = "W", ModifiersName = "None" },
-
-                // Transposition
-                new ShortcutBinding { ActionId = "TransposeUp", KeyName = "Up", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.octaveup", KeyName = "Up", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "TransposeDown", KeyName = "Down", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.octavedown", KeyName = "Down", ModifiersName = "Control" },
-
-                // Note Movement & Sizing
-                new ShortcutBinding { ActionId = "MoveCursorLeft", KeyName = "Left", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ResizeNotesLeft", KeyName = "Left", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "MoveNotesLeft", KeyName = "Left", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "ExtendSelectionLeft", KeyName = "Left", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "MoveCursorRight", KeyName = "Right", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ResizeNotesRight", KeyName = "Right", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "MoveNotesRight", KeyName = "Right", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "ExtendSelectionRight", KeyName = "Right", ModifiersName = "Shift" },
-
-                // Edit Operations
-                new ShortcutBinding { ActionId = "Undo", KeyName = "Z", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "Redo", KeyName = "Y", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "Copy", KeyName = "C", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "Cut", KeyName = "X", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "Paste", KeyName = "V", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "PastePlain", KeyName = "V", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "PasteParameters", KeyName = "V", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "InsertNote", KeyName = "Insert", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "DeleteNotes", KeyName = "Delete", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "MergeNotes", KeyName = "U", ModifiersName = "Control" },
-
-                // Playhead & Timeline Navigation
-                new ShortcutBinding { ActionId = "PlayheadHome", KeyName = "Home", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "SelectToStart", KeyName = "Home", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "PlayheadEnd", KeyName = "End", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "SelectToEnd", KeyName = "End", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "PlayheadLeft", KeyName = "OemOpenBrackets", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "PlayheadToSelectionStart", KeyName = "OemOpenBrackets", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "PlayheadToViewStart", KeyName = "OemOpenBrackets", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "PlayheadRight", KeyName = "OemCloseBrackets", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "PlayheadToSelectionEnd", KeyName = "OemCloseBrackets", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "PlayheadToViewEnd", KeyName = "OemCloseBrackets", ModifiersName = "Shift" },
-
-                // Scrolling & Zooming
-                new ShortcutBinding { ActionId = "ScrollLeft", KeyName = "A", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ScrollRight", KeyName = "D", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ScrollUp", KeyName = "W", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ScrollDown", KeyName = "S", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "ZoomIn", KeyName = "E", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "ZoomOut", KeyName = "Q", ModifiersName = "None" },
-
-                // Track & Project Operations
-                new ShortcutBinding { ActionId = "SaveProject", KeyName = "S", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "SoloTrack", KeyName = "S", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "MuteTrack", KeyName = "M", ModifiersName = "Shift" },
-                new ShortcutBinding { ActionId = "FocusSelection", KeyName = "F", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "SearchNote", KeyName = "F", ModifiersName = "Control" },
-
-                // Parts Navigation
-                new ShortcutBinding { ActionId = "MoveToNextPartUp", KeyName = "PageUp", ModifiersName = "None" },
-                new ShortcutBinding { ActionId = "MoveToNextPartDown", KeyName = "PageDown", ModifiersName = "None" },
-                
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.loadrenderedpitch", KeyName = "R", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.refreshrealcurves", KeyName = "R", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.bakepitch", KeyName = "K", ModifiersName = "Alt" },
-
-                // Tails and Overlap
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.addtaildash", KeyName = "OemMinus", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.addtailrest", KeyName = "R", ModifiersName = "Alt, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.removetaildash", KeyName = "OemMinus", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.removetailrest", KeyName = "R", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.fixoverlap", KeyName = "F", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.autolegato", KeyName = "A", ModifiersName = "Alt" },
-
-                // Common notes
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.commonnotecopy", KeyName = "C", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.commonnotepaste", KeyName = "P", ModifiersName = "Control, Shift" },
-
-                // Timings
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.randomizetiming", KeyName = "T", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.randomizeoffset", KeyName = "T", ModifiersName = "Control, Alt" },
-
-                // Lang
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.romajitohiragana", KeyName = "J", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.hiraganatoromaji", KeyName = "J", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.javcvtocv", KeyName = "K", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.hanzitopinyin", KeyName = "H", ModifiersName = "Control, Alt" },
-
-                // Suffixes and Phonetic Hints
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removetonesuffix", KeyName = "S", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removelettersuffix", KeyName = "S", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.movesuffixtovoicecolor", KeyName = "C", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.removephonetichint", KeyName = "P", ModifiersName = "Control, Alt" },
-
-                // Dash and Slur
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.dashtoplus", KeyName = "OemPlus", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.dashtoplustilda", KeyName = "OemPlus", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.lyrics.insertslur", KeyName = "I", ModifiersName = "Alt" },
-
-                // Reset
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.all", KeyName = "Delete", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.allparameters", KeyName = "I", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.exps", KeyName = "E", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.clear.vibratos", KeyName = "V", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.vibratos", KeyName = "U", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.pitchbends", KeyName = "B", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.phonemetimings", KeyName = "T", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "pianoroll.menu.notes.reset.aliases", KeyName = "A", ModifiersName = "Control, Alt" },
-
-                // other toggles
-                new ShortcutBinding { ActionId = "Lock Pitch Points", KeyName = "L", ModifiersName = "Control, Shift" },
-                new ShortcutBinding { ActionId = "Lock Vibrato", KeyName = "U", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "Lock Expressions", KeyName = "E", ModifiersName = "Control, Alt" },
-                new ShortcutBinding { ActionId = "Show Portrait", KeyName = "P", ModifiersName = "Alt, Shift" },
-                new ShortcutBinding { ActionId = "Show Icon", KeyName = "I", ModifiersName = "Alt, Shift" },
-                new ShortcutBinding { ActionId = "Show Ghost Notes", KeyName = "G", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Use Track Color", KeyName = "C", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Detach Piano Roll", KeyName = "D", ModifiersName = "Alt, Shift" },
-                new ShortcutBinding { ActionId = "Hide Piano Roll", KeyName = "H", ModifiersName = "Alt, Shift" },
-                new ShortcutBinding { ActionId = "lyricsreplace.replace", KeyName = "H", ModifiersName = "Control" },
-                new ShortcutBinding { ActionId = "Quantize Notes", KeyName = "Q", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Randomize Tuning", KeyName = "R", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Lengthen Crossfade", KeyName = "L", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Add Breath", KeyName = "B", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Edit Note Defaults", KeyName = "N", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Open Singers Window", KeyName = "O", ModifiersName = "Alt" },
-                new ShortcutBinding { ActionId = "Open Expressions", KeyName = "E", ModifiersName = "Alt" },
-            };
+            public ShortcutBinding[] Shortcuts = [];
             public bool VoicebankPublishUseIgnore = true;
             public string VoicebankPublishIgnores = @"#Adobe Audition
 *.pkf
diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index da3518476..98a90a3bd 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -215,17 +215,17 @@
             </Menu.Styles>
 
             <MenuItem Header="{DynamicResource menu.edit}">
-              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding HotkeyDisplayTexts[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
-              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding HotkeyDisplayTexts[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
+              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
+              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding HotkeyDisplayTexts[Cut]}" Command="{Binding Cut}"/>
-              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding HotkeyDisplayTexts[Copy]}" Command="{Binding Copy}"/>
-              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding HotkeyDisplayTexts[Paste]}" Command="{Binding Paste}"/>
-              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding HotkeyDisplayTexts[PastePlain]}" Command="{Binding PastePlain}"/>
-              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding HotkeyDisplayTexts[DeleteNotes]}" Command="{Binding Delete}"/>
+              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding Hotkeys[Cut]}" Command="{Binding Cut}"/>
+              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding Hotkeys[Copy]}" Command="{Binding Copy}"/>
+              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding Hotkeys[Paste]}" Command="{Binding Paste}"/>
+              <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding Hotkeys[PastePlain]}" Command="{Binding PastePlain}"/>
+              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding Hotkeys[DeleteNotes]}" Command="{Binding Delete}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding HotkeyDisplayTexts[SearchNote]}" Click="OnMenuSearchNote"/>
-              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding HotkeyDisplayTexts[SelectAll]}" Command="{Binding SelectAll}"/>
+              <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding Hotkeys[SearchNote]}" Click="OnMenuSearchNote"/>
+              <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding Hotkeys[SelectAll]}" Command="{Binding SelectAll}"/>
               <MenuItem Header="-" Height="1"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.singer}" Click="OnMenuSingers"/>
               <MenuItem Header="{DynamicResource menu.edit.lockunselectednotes}">
@@ -268,7 +268,7 @@
                   <CheckBox IsChecked="{Binding UseTrackColor}" />
                 </MenuItem.Icon>
               </MenuItem>
-              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding HotkeyDisplayTexts[FullScreen]}" Click="OnMenuFullScreen"/>
+              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[FullScreen]}" Click="OnMenuFullScreen"/>
               <MenuItem Header="{DynamicResource prefs.appearance.degree}">
                 <MenuItem Header="{DynamicResource prefs.appearance.degree.off}" Click="OnMenuDegreeStyle" Tag="0">
                   <MenuItem.Icon>
@@ -342,7 +342,7 @@
               <MenuItem Header="{DynamicResource pianoroll.menu.external}" ItemsSource="{Binding ExternalBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" Classes="MenuItemWithSubMenu"/>
             </MenuItem>
-            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding HotkeyDisplayTexts[EditLyrics]}" Click="OnMenuEditLyrics"/>
+            <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding Hotkeys[EditLyrics]}" Click="OnMenuEditLyrics"/>
             <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
           </Menu>
         </Border>
@@ -352,7 +352,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.tips}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleTips], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleTips], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -367,7 +367,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.selectionv2}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect1], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect1], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -387,7 +387,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.penv2}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect2Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -407,7 +407,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.penplus}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect2Alt], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect2Alt], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -427,7 +427,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.eraser}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect3], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect3], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -447,7 +447,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.drawpitch}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Main], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -467,7 +467,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.overwritepitch}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Overwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Overwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -487,7 +487,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.drawlinepitch}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4Line], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect4Line], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -507,7 +507,7 @@
                   <ToolTip.Tip>
                     <StackPanel>
                       <TextBlock Text="{DynamicResource pianoroll.tool.overwritelinepitch}"/>
-                      <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect4LineOverwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                      <TextBlock Text="{Binding Hotkeys[ToolSelect4LineOverwrite], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                     </StackPanel>
                   </ToolTip.Tip>
                   <Grid Width="18" Height="18">
@@ -527,7 +527,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.tool.knife}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToolSelect5], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToolSelect5], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -546,7 +546,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.tone}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePlayTone], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePlayTone], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -564,7 +564,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.vibrato}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleVibrato], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleVibrato], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -579,7 +579,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.pitch}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -592,7 +592,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.finalpitch}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleFinalPitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleFinalPitch], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -603,7 +603,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.waveform}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleWaveform], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleWaveform], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -621,7 +621,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.phoneme}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[TogglePhoneme], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[TogglePhoneme], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -632,7 +632,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.expressions}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleExpressions], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleExpressions], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
@@ -646,7 +646,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.snap}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleSnap], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleSnap], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Border Width="18" Height="18">
@@ -670,7 +670,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.snapdiv}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[OpenSnapMenu], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[OpenSnapMenu], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
@@ -699,7 +699,7 @@
               <ToolTip.Tip>
                 <StackPanel>
                   <TextBlock Text="{DynamicResource pianoroll.toggle.noteparams}"/>
-                  <TextBlock Text="{Binding HotkeyDisplayTexts[ToggleNoteParams], StringFormat='[ {0} ]'}" Opacity="0.6"/>
+                  <TextBlock Text="{Binding Hotkeys[ToggleNoteParams], StringFormat='[ {0} ]'}" Opacity="0.6"/>
                 </StackPanel>
               </ToolTip.Tip>
               <Grid Width="18" Height="18">
diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 7a50b0c24..74940a16f 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -47,19 +47,6 @@ public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
 
         private Window RootWindow => (Window) TopLevel.GetTopLevel(this)!;
 
-        string? GetActionIdForShortcut(Key pressedKey, KeyModifiers pressedMods) {
-            foreach (var sc in Preferences.Default.Shortcuts) {
-                if (Enum.TryParse(sc.KeyName, out Key parsedKey) && 
-                    Enum.TryParse(sc.ModifiersName, out KeyModifiers parsedMods)) {
-                    
-                    if (KeyTranslator.IsKeyMatch(parsedKey, pressedKey) && parsedMods == pressedMods) {
-                        return sc.ActionId;
-                    }
-                }
-            }
-            return null;
-        }
-
         public PianoRoll(PianoRollViewModel model) {
             InitializeComponent();
             DataContext = ViewModel = model;
@@ -125,22 +112,11 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new BakePitch(),
                 new RandomizeTiming(),
                 new RandomizePhonemeOffset()
-            }.Select(edit => {
-                Avalonia.Input.KeyGesture? menuGesture = null;
-                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
-                if (savedSc != null && 
-                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
-                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
-                    parsedKey != Avalonia.Input.Key.None) {
-                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
-                }
-
-                return new MenuItemViewModel() {
-                    Header = ThemeManager.GetString(edit.Name),
-                    InputGesture = menuGesture,
-                    Command = noteBatchEditCommand,
-                    CommandParameter = edit,
-                };
+            }.Select(edit => new MenuItemViewModel() {
+                Header = ThemeManager.GetString(edit.Name),
+                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                Command = noteBatchEditCommand,
+                CommandParameter = edit,
             }));
 
             ViewModel.LyricBatchEdits.AddRange(new List<BatchEdit>() {
@@ -155,22 +131,11 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new DashToPlus(),
                 new DashToPlusTilda(),
                 new InsertSlur(),
-            }.Select(edit => {
-                Avalonia.Input.KeyGesture? menuGesture = null;
-                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
-                if (savedSc != null && 
-                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
-                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
-                    parsedKey != Avalonia.Input.Key.None) {
-                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
-                }
-
-                return new MenuItemViewModel() {
-                    Header = ThemeManager.GetString(edit.Name),
-                    InputGesture = menuGesture,
-                    Command = noteBatchEditCommand,
-                    CommandParameter = edit,
-                };
+            }.Select(edit => new MenuItemViewModel() {
+                Header = ThemeManager.GetString(edit.Name),
+                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                Command = noteBatchEditCommand,
+                CommandParameter = edit,
             }));
 
             ViewModel.ResetBatchEdits.AddRange(new List<BatchEdit>() {
@@ -181,45 +146,23 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new ResetVibratos(),
                 new ClearTimings(),
                 new ResetAliases(),
-            }.Select(edit => {
-                Avalonia.Input.KeyGesture? menuGesture = null;
-                var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
-                if (savedSc != null && 
-                    Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
-                    Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
-                    parsedKey != Avalonia.Input.Key.None) {
-                    menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
-                }
-
-                return new MenuItemViewModel() {
-                    Header = ThemeManager.GetString(edit.Name),
-                    InputGesture = menuGesture,
-                    Command = noteBatchEditCommand,
-                    CommandParameter = edit,
-                };
+            }.Select(edit => new MenuItemViewModel() {
+                Header = ThemeManager.GetString(edit.Name),
+                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                Command = noteBatchEditCommand,
+                CommandParameter = edit,
             }));
+            
             try {
                 ViewModel.ExternalBatchEdits.AddRange(
                     DocManager.Inst.ExternalBatchEditTypes
                         .Select(type => Activator.CreateInstance(type) as BatchEdit)
                         .Where(edit => edit != null)
-                        .Select(edit => {
-                            Avalonia.Input.KeyGesture? menuGesture = null;
-                            var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit!.Name);
-                            
-                            if (savedSc != null && 
-                                Enum.TryParse<Avalonia.Input.Key>(savedSc.KeyName, out var parsedKey) && 
-                                Enum.TryParse<Avalonia.Input.KeyModifiers>(savedSc.ModifiersName, out var parsedMods) && 
-                                parsedKey != Avalonia.Input.Key.None) {
-                                menuGesture = new Avalonia.Input.KeyGesture(parsedKey, parsedMods);
-                            }
-
-                            return new MenuItemViewModel() {
-                                Header = ThemeManager.GetString(edit!.Name),
-                                InputGesture = menuGesture,
-                                Command = noteBatchEditCommand,
-                                CommandParameter = edit,
-                            };
+                        .Select(edit => new MenuItemViewModel() {
+                            Header = ThemeManager.GetString(edit!.Name),
+                            InputGesture = KeyTranslator.GetGesture(edit.Name),
+                            Command = noteBatchEditCommand,
+                            CommandParameter = edit,
                         })
                 );
             } catch (Exception e) {
@@ -1450,7 +1393,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
             string mainPenIdx = Preferences.Default.PenPlusDefault ? "2+" : "2";
             string altPenIdx = Preferences.Default.PenPlusDefault ? "2" : "2+";
 
-            string? action = GetActionIdForShortcut(args.Key, args.KeyModifiers);
+            string? action = KeyTranslator.GetActionIdForShortcut(args.Key, args.KeyModifiers);
 
             switch (action) {
                 // Playback & Selection
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index ac8eb9ae6..7b4cd9467 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,42 +1,310 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Concurrency;
 using System.Runtime.InteropServices;
 using Avalonia.Input;
 using OpenUtau.Core.Util;
+using SharpCompress;
 
 namespace OpenUtau.App.ViewModels {
+    public class ShortcutKey {
+        public string ActionId { get; set; }
+        //public string KeyName { get; set; } 
+        //public string ModifiersName { get; set; }
+        public KeyGesture Gesture { get; set; }
+
+        public ShortcutKey(string actionId, string shortcut) {
+            ActionId = actionId;
+            KeyGesture key = KeyGesture.Parse(shortcut);
+            if (KeyTranslator.IsMac) {
+                var m = key.KeyModifiers;
+                bool hasCtrl = m.HasFlag(KeyModifiers.Control);
+                bool hasMeta = m.HasFlag(KeyModifiers.Meta);
+                if (hasCtrl) {
+                    m &= ~KeyModifiers.Control;
+                    m |= KeyModifiers.Meta; 
+                }
+                if (hasMeta) {
+                    m &= ~KeyModifiers.Meta;
+                    m |= KeyModifiers.Control; 
+                }
+                Gesture = new KeyGesture(key.Key, m);
+            } else {
+                Gesture = key;
+            }
+        }
+
+        public override string ToString() => KeyTranslator.GetFriendlyName(Gesture.Key, Gesture.KeyModifiers);
+    }
+    
     public static class KeyTranslator {
         public static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+        public static List<ShortcutKey> Shortcuts { get; set; } = new List<ShortcutKey>();
+        private static Preferences.ShortcutBinding[] DefShortcuts { get; }
+
+        static KeyTranslator() {
+            DefShortcuts = [
+                // Playback & Selection
+                new Preferences.ShortcutBinding("PlayOrPause", ["Space"]),
+                new Preferences.ShortcutBinding("PlaySelection", ["Alt+Space"]),
+                new Preferences.ShortcutBinding("ClearSelection", ["Escape"]),
+                new Preferences.ShortcutBinding("SelectAll", ["Control+A"]),
+                new Preferences.ShortcutBinding("DeselectAll", ["Control+D"]),
+
+                // UI & Windows
+                new Preferences.ShortcutBinding("HideDetachedWindow", ["Alt+F4"]),
+                new Preferences.ShortcutBinding("FullScreen", ["F11"]),
+                new Preferences.ShortcutBinding("OpenPluginMenu", ["N"]),
+
+                // Lyrics
+                new Preferences.ShortcutBinding("EditLyrics", ["Enter"]),
+
+                // Tools
+                new Preferences.ShortcutBinding("ToolSelect1", ["D1"]),
+                new Preferences.ShortcutBinding("ToolSelect2Main", ["D2"]),
+                new Preferences.ShortcutBinding("ToolSelect2Alt", ["Control+D2"]),
+                new Preferences.ShortcutBinding("ToolSelect3", ["D3"]),
+                new Preferences.ShortcutBinding("ToolSelect4Main", ["D4"]),
+                new Preferences.ShortcutBinding("ToolSelect4Overwrite", ["Control+D4"]),
+                new Preferences.ShortcutBinding("ToolSelect4Line", ["Shift+D4"]),
+                new Preferences.ShortcutBinding("ToolSelect4LineOverwrite", ["Control+Shift+D4"]),
+                new Preferences.ShortcutBinding("ToolSelect5", ["D5"]),
+
+                // Expressions
+                new Preferences.ShortcutBinding("ExpSelect1", ["Alt+D1"]),
+                new Preferences.ShortcutBinding("ExpSelect2", ["Alt+D2"]),
+                new Preferences.ShortcutBinding("ExpSelect3", ["Alt+D3"]),
+                new Preferences.ShortcutBinding("ExpSelect4", ["Alt+D4"]),
+                new Preferences.ShortcutBinding("ExpSelect5", ["Alt+D5"]),
+                new Preferences.ShortcutBinding("ExpSelect6", ["Alt+D6"]),
+                new Preferences.ShortcutBinding("ExpSelect7", ["Alt+D7"]),
+                new Preferences.ShortcutBinding("ExpSelect8", ["Alt+D8"]),
+                new Preferences.ShortcutBinding("ExpSelect9", ["Alt+D9"]),
+                new Preferences.ShortcutBinding("ExpSelect10", ["Alt+D0"]),
+
+                // Toggles
+                new Preferences.ShortcutBinding("ToggleFinalPitch", ["R"]),
+                new Preferences.ShortcutBinding("ToggleTips", ["T"]),
+                new Preferences.ShortcutBinding("ToggleVibrato", ["U"]),
+                new Preferences.ShortcutBinding("TogglePitch", ["I"]),
+                new Preferences.ShortcutBinding("TogglePhoneme", ["O"]),
+                new Preferences.ShortcutBinding("ToggleExpressions", ["L"]),
+                new Preferences.ShortcutBinding("ToggleSnap", ["P"]),
+                new Preferences.ShortcutBinding("OpenSnapMenu", ["Alt+P"]),
+                new Preferences.ShortcutBinding("ToggleNoteParams", ["OemPipe"]),
+                new Preferences.ShortcutBinding("TogglePlayTone", ["Y"]),
+                new Preferences.ShortcutBinding("ToggleWaveform", ["W"]),
+
+                // Transposition
+                new Preferences.ShortcutBinding("TransposeUp", ["Up"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.octaveup", ["Control+Up"]),
+                new Preferences.ShortcutBinding("TransposeDown", ["Down"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.octavedown", ["Control+Down"]),
+
+                // Note Movement & Sizing
+                new Preferences.ShortcutBinding("MoveCursorLeft", ["Left"]),
+                new Preferences.ShortcutBinding("ResizeNotesLeft", ["Alt+Left"]),
+                new Preferences.ShortcutBinding("MoveNotesLeft", ["Control+Left"]),
+                new Preferences.ShortcutBinding("ExtendSelectionLeft", ["Shift+Left"]),
+                new Preferences.ShortcutBinding("MoveCursorRight", ["Right"]),
+                new Preferences.ShortcutBinding("ResizeNotesRight", ["Alt+Right"]),
+                new Preferences.ShortcutBinding("MoveNotesRight", ["Control+Right"]),
+                new Preferences.ShortcutBinding("ExtendSelectionRight", ["Shift+Right"]),
+
+                // Edit Operations
+                new Preferences.ShortcutBinding("Undo", ["Control+Z"]),
+                new Preferences.ShortcutBinding("Redo", ["Control+Y", "Control+Shift+Z"]),
+                new Preferences.ShortcutBinding("Copy", ["Control+C"]),
+                new Preferences.ShortcutBinding("Cut", ["Control+X"]),
+                new Preferences.ShortcutBinding("Paste", ["Control+V"]),
+                new Preferences.ShortcutBinding("PastePlain", ["Control+Shift+V"]),
+                new Preferences.ShortcutBinding("PasteParameters", ["Alt+V"]),
+                new Preferences.ShortcutBinding("InsertNote", ["Insert"]),
+                new Preferences.ShortcutBinding("DeleteNotes", ["Delete"]),
+                new Preferences.ShortcutBinding("MergeNotes", ["Control+U"]),
+
+                // Playhead & Timeline Navigation
+                new Preferences.ShortcutBinding("PlayheadHome", ["Home"]),
+                new Preferences.ShortcutBinding("SelectToStart", ["Shift+Home"]),
+                new Preferences.ShortcutBinding("PlayheadEnd", ["End"]),
+                new Preferences.ShortcutBinding("SelectToEnd", ["Shift+End"]),
+                new Preferences.ShortcutBinding("PlayheadLeft", ["OemOpenBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadToSelectionStart", ["Control+OemOpenBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadToViewStart", ["Shift+OemOpenBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadRight", ["OemCloseBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadToSelectionEnd", ["Control+OemCloseBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadToViewEnd", ["Shift+OemCloseBrackets"]),
+
+                // Scrolling & Zooming
+                new Preferences.ShortcutBinding("ScrollLeft", ["A"]),
+                new Preferences.ShortcutBinding("ScrollRight", ["D"]),
+                new Preferences.ShortcutBinding("ScrollUp", ["Alt+W"]),
+                new Preferences.ShortcutBinding("ScrollDown", ["Alt+S"]),
+                new Preferences.ShortcutBinding("ZoomIn", ["E"]),
+                new Preferences.ShortcutBinding("ZoomOut", ["Q"]),
+
+                // Track & Project Operations
+                new Preferences.ShortcutBinding("SaveProject", ["Control+S"]),
+                new Preferences.ShortcutBinding("SoloTrack", ["Shift+S"]),
+                new Preferences.ShortcutBinding("MuteTrack", ["Shift+M"]),
+                new Preferences.ShortcutBinding("FocusSelection", ["F"]),
+                new Preferences.ShortcutBinding("SearchNote", ["Control+F"]),
+
+                // Parts Navigation
+                new Preferences.ShortcutBinding("MoveToNextPartUp", ["PageUp"]),
+                new Preferences.ShortcutBinding("MoveToNextPartDown", ["PageDown"]),
+
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.loadrenderedpitch", ["Control+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.refreshrealcurves", ["Control+Shift+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.bakepitch", ["Alt+K"]),
+
+                // Tails and Overlap
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.addtaildash", ["Alt+OemMinus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.addtailrest", ["Alt+Shift+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetaildash", ["Control+Alt+OemMinus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetailrest", ["Control+Alt+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.fixoverlap", ["Alt+F"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.autolegato", ["Alt+A"]),
 
-        /// <summary>
-        /// Normalizes modifiers so Windows "Ctrl" becomes Mac "Cmd", 
-        /// and Windows "Win" becomes Mac "Ctrl".
-        /// </summary>
-        private static KeyModifiers NormalizeModifiers(KeyModifiers modifiers) {
-            if (!IsMac) return modifiers;
+                // Common notes
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotecopy", ["Control+Shift+C"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotepaste", ["Control+Shift+P"]),
 
-            var normalized = modifiers;
-            bool hasCtrl = modifiers.HasFlag(KeyModifiers.Control);
-            bool hasMeta = modifiers.HasFlag(KeyModifiers.Meta);
+                // Timings
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.randomizetiming", ["Alt+T"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.randomizeoffset", ["Control+Alt+T"]),
 
-            if (hasCtrl) {
-                normalized &= ~KeyModifiers.Control;
-                normalized |= KeyModifiers.Meta; 
+                // Lang
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.romajitohiragana", ["Control+Shift+J"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.hiraganatoromaji", ["Control+Alt+J"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.javcvtocv", ["Control+Shift+K"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.hanzitopinyin", ["Control+Alt+H"]),
+
+                // Suffixes and Phonetic Hints
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removetonesuffix", ["Control+Alt+S"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removelettersuffix", ["Control+Shift+S"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.movesuffixtovoicecolor", ["Control+Alt+C"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removephonetichint", ["Control+Alt+P"]),
+
+                // Dash and Slur
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.dashtoplus", ["Alt+OemPlus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.dashtoplustilda", ["Control+Alt+OemPlus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.insertslur", ["Alt+I"]),
+
+                // Reset
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.all", ["Control+Shift+Delete"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.allparameters", ["Control+Alt+I"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.exps", ["Control+Shift+E"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.clear.vibratos", ["Control+Alt+V"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.vibratos", ["Control+Shift+U"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.pitchbends", ["Control+Alt+B"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.phonemetimings", ["Control+Shift+T"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.aliases", ["Control+Alt+A"]),
+
+                // other toggles
+                new Preferences.ShortcutBinding("Lock Pitch Points", ["Control+Shift+L"]),
+                new Preferences.ShortcutBinding("Lock Vibrato", ["Control+Alt+U"]),
+                new Preferences.ShortcutBinding("Lock Expressions", ["Control+Alt+E"]),
+                new Preferences.ShortcutBinding("Show Portrait", ["Alt+Shift+P"]),
+                new Preferences.ShortcutBinding("Show Icon", ["Alt+Shift+I"]),
+                new Preferences.ShortcutBinding("Show Ghost Notes", ["Alt+G"]),
+                new Preferences.ShortcutBinding("Use Track Color", ["Alt+C"]),
+                new Preferences.ShortcutBinding("Detach Piano Roll", ["Alt+Shift+D"]),
+                new Preferences.ShortcutBinding("Hide Piano Roll", ["Alt+Shift+H"]),
+                new Preferences.ShortcutBinding("lyricsreplace.replace", ["Control+H"]),
+                new Preferences.ShortcutBinding("Quantize Notes", ["Alt+Q"]),
+                new Preferences.ShortcutBinding("Randomize Tuning", ["Alt+R"]),
+                new Preferences.ShortcutBinding("Lengthen Crossfade", ["Alt+L"]),
+                new Preferences.ShortcutBinding("Add Breath", ["Alt+B"]),
+                new Preferences.ShortcutBinding("Edit Note Defaults", ["Alt+N"]),
+                new Preferences.ShortcutBinding("Open Singers Window", ["Alt+O"]),
+                new Preferences.ShortcutBinding("Open Expressions", ["Alt+E"])
+            ];
+        }
+
+        public static void LoadShortcuts() {
+            Shortcuts.Clear();
+            var def = DefShortcuts.ToList();
+            foreach (var sc in Preferences.Default.Shortcuts) {
+                var defSc = def.FirstOrDefault(defSc => defSc.ActionId == sc.ActionId);
+                if (defSc != null) {
+                    defSc.Shortcuts = sc.Shortcuts;
+                }
             }
-            if (hasMeta) {
-                normalized &= ~KeyModifiers.Meta;
-                normalized |= KeyModifiers.Control; 
+            Shortcuts = def.SelectMany(s => s.Shortcuts
+                .Select(key => new ShortcutKey(s.ActionId, key))).ToList();
+        }
+
+        public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
+            var diff = new List<Preferences.ShortcutBinding>();
+            foreach (var item in items) {
+                var defKey = DefShortcuts.FirstOrDefault(s => s.ActionId == item.ActionId);
+                if (defKey != null) {
+                    var gestures = item.Gestures.Select(g => g.ToString()).ToArray();
+                    if (defKey.Shortcuts.Length != gestures.Length) {
+                        diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
+                    } else if (defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
+                        diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
+                    }
+                }
             }
+            Preferences.Default.Shortcuts = diff.ToArray();
+            Preferences.Save();
+            LoadShortcuts();
+        }
 
-            return normalized;
+        public static void ResetShortcuts() {
+            Preferences.Default.Shortcuts = [];
+            Preferences.Save();
+            LoadShortcuts();
+        }
+
+        public static KeyGesture? GetGesture(string actionId) {
+            // Since only one shortcut can be displayed in the menu, if there are multiple shortcuts, it returns the first one
+            return Shortcuts.FirstOrDefault(s => s.ActionId == actionId)?.Gesture;
+        }
+        
+        public static string? GetActionIdForShortcut(Key pressedKey, KeyModifiers pressedMods) {
+            foreach (var sc in Shortcuts) {
+                if (IsKeyMatch(sc.Gesture.Key, pressedKey) && sc.Gesture.KeyModifiers == pressedMods) {
+                    return sc.ActionId;
+                }
+            }
+            return null;
+        }
+
+        public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
+            if (savedKey == pressedKey) return true;
+            return savedKey switch {
+                Key.OemPipe => pressedKey == Key.Oem5 || pressedKey == Key.OemBackslash,
+                Key.OemOpenBrackets => pressedKey == Key.Oem4,
+                Key.OemCloseBrackets => pressedKey == Key.Oem6,
+                Key.OemQuotes => pressedKey == Key.Oem7,
+                Key.OemSemicolon => pressedKey == Key.Oem1,
+                Key.OemTilde => pressedKey == Key.Oem3 || pressedKey == Key.Oem8,
+                Key.OemMinus => pressedKey == Key.Subtract,
+                Key.OemPlus => pressedKey == Key.Add,
+                Key.OemQuestion => pressedKey == Key.Oem2,
+                _ => false
+            };
+        }
+
+        public static string GetFriendlyName(Key key, KeyModifiers modifiers) {
+            string mods = GetFriendlyModifiersName(modifiers);
+            string friendlyKey = GetFriendlyName(key.ToString());
+            if (!string.IsNullOrEmpty(mods)) {
+                return IsMac ? $"{mods} {friendlyKey}": $"{mods} + {friendlyKey}";
+            }
+            return friendlyKey;
         }
 
         public static string GetFriendlyName(string keyName) {
             return keyName switch {
                 // Modifiers
-                "Windows" or "LWin" or "RWin" => IsMac ? "⌘" : "Win",
+                "Windows" or "LWin" or "RWin" => IsMac ? "⌃" : "Win",
                 "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "⌥" : "Alt",
-                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌃" : "Ctrl", 
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌘" : "Ctrl",
                 "Shift" or "LeftShift" or "RightShift" => IsMac ? "⇧" : "Shift",
                 
                 // Navigation & Editing
@@ -84,28 +352,11 @@ public static string GetFriendlyName(string keyName) {
             };
         }
 
-        public static bool IsKeyMatch(Key savedKey, Key pressedKey) {
-            if (savedKey == pressedKey) return true;
-
-            return savedKey switch {
-                Key.OemPipe => pressedKey == Key.Oem5 || pressedKey == Key.OemBackslash,
-                Key.OemOpenBrackets => pressedKey == Key.Oem4,
-                Key.OemCloseBrackets => pressedKey == Key.Oem6,
-                Key.OemQuotes => pressedKey == Key.Oem7,
-                Key.OemSemicolon => pressedKey == Key.Oem1,
-                Key.OemTilde => pressedKey == Key.Oem3 || pressedKey == Key.Oem8,
-                Key.OemMinus => pressedKey == Key.Subtract,
-                Key.OemPlus => pressedKey == Key.Add,
-                Key.OemQuestion => pressedKey == Key.Oem2,
-                _ => false
-            };
-        }
-
         public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
-            if (modifiers == KeyModifiers.None) return "";
+            if (modifiers == KeyModifiers.None) return string.Empty;
             
             // Apply macOS normalization before rendering strings
-            modifiers = NormalizeModifiers(modifiers);
+            //modifiers = NormalizeModifiers(modifiers);
 
             var parts = new System.Collections.Generic.List<string>();
             if (modifiers.HasFlag(KeyModifiers.Control)) {
@@ -121,23 +372,7 @@ public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
                 parts.Add(IsMac ? "⌘" : "Win");
             }
 
-            return string.Join(IsMac ? "" : " + ", parts);
-        }
-
-        public static Avalonia.Input.KeyGesture? GetGesture(string actionId) {
-            var sc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == actionId);
-            
-            if (sc != null && 
-                Enum.TryParse<Avalonia.Input.Key>(sc.KeyName, out var k) && 
-                Enum.TryParse<Avalonia.Input.KeyModifiers>(sc.ModifiersName, out var m) && 
-                k != Avalonia.Input.Key.None) {
-                
-                // Apply macOS normalization to the actual hotkey gesture
-                m = NormalizeModifiers(m);
-
-                return new Avalonia.Input.KeyGesture(k, m);
-            }
-            return null;
+            return string.Join(IsMac ? " " : " + ", parts);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 88df3602e..f3308505e 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -48,7 +48,6 @@ public class PianoRollViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public PlaybackViewModel? PlaybackViewModel { get; set; }
         [Reactive] public CurveViewModel CurveViewModel { get; set; }
         [Reactive] public Dictionary<string, KeyGesture> Hotkeys { get; set; } = new Dictionary<string, KeyGesture>();
-        [Reactive] public Dictionary<string, string> HotkeyDisplayTexts { get; set; } = new Dictionary<string, string>();
 
         public double Width => Preferences.Default.PianorollWindowSize.Width;
         public double Height => Preferences.Default.PianorollWindowSize.Height;
@@ -115,33 +114,12 @@ public bool ShowPhonemizerTags {
         private ReactiveCommand<Classic.Plugin, Unit> legacyPluginCommand;
 
         public void ReloadShortcuts() {
+            KeyTranslator.LoadShortcuts();
             var newHotkeys = new Dictionary<string, KeyGesture>();
-            var newDisplayTexts = new Dictionary<string, string>();
-            
-            if (Preferences.Default.Shortcuts != null) {
-                foreach (var sc in Preferences.Default.Shortcuts) {
-                    // Functional Gesture Binding
-                    var gesture = KeyTranslator.GetGesture(sc.ActionId);
-                    if (gesture != null) {
-                        newHotkeys[sc.ActionId] = gesture;
-                    }
-
-                    // Friendly Display Text Binding
-                    Enum.TryParse<KeyModifiers>(sc.ModifiersName, out var parsedMods);
-                    string mods = KeyTranslator.GetFriendlyModifiersName(parsedMods);
-                    string key = KeyTranslator.GetFriendlyName(sc.KeyName); 
-                    
-                    if (string.IsNullOrEmpty(mods) || sc.ModifiersName == "None") {
-                        newDisplayTexts[sc.ActionId] = key;
-                    } else {
-                        newDisplayTexts[sc.ActionId] = KeyTranslator.IsMac 
-                            ? $"{mods}{key}" 
-                            : $"{mods.Replace(" + ", "+")}+{key}";
-                    }
-                }
+            foreach (var sc in KeyTranslator.Shortcuts) {
+                newHotkeys.TryAdd(sc.ActionId, sc.Gesture);
             }
             Hotkeys = newHotkeys;
-            HotkeyDisplayTexts = newDisplayTexts;
         }
 
         public PianoRollViewModel() {
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index e2b74aedb..8d60170d7 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -33,20 +33,14 @@ public class ShortcutItemViewModel : ViewModelBase {
         public string ActionName { get; set; } = string.Empty;
         public string ActionId { get; set; } = string.Empty;
         
-        [Reactive] public Key Key { get; set; }
-        [Reactive] public KeyModifiers Modifiers { get; set; }
+        public List<KeyGesture> Gestures { get; set; } = new List<KeyGesture>();
         [Reactive] public bool IsListening { get; set; }
 
         public string DisplayString {
             get {
                 if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening") ?? "Press keys...";
-                string mods = KeyTranslator.GetFriendlyModifiersName(Modifiers);
-                string friendlyKey = KeyTranslator.GetFriendlyName(Key.ToString());
-                if (!string.IsNullOrEmpty(mods)) {
-                    return KeyTranslator.IsMac ? $"{mods}{friendlyKey}" : $"{mods} + {friendlyKey}";
-                }
-                
-                return friendlyKey;
+                var gesture = Gestures.FirstOrDefault();
+                return gesture == null ? "None" : KeyTranslator.GetFriendlyName(gesture.Key, gesture.KeyModifiers);
             }
         }
 
@@ -159,317 +153,12 @@ public int SafeMaxThreadCount {
 
         // Shortcuts
         [Reactive] public ShortcutItemViewModel? ActiveShortcut { get; set; }
-        public void ListenForShortcut(ShortcutItemViewModel item) {
-            // Cancel any existing listening item
-            if (ActiveShortcut != null) {
-                ActiveShortcut.IsListening = false;
-                ActiveShortcut.RefreshDisplay();
-            }
-
-            ActiveShortcut = item;
-            ActiveShortcut.IsListening = true;
-            ActiveShortcut.RefreshDisplay();
-        }
-
-        private void SaveShortcuts() {
-            Preferences.Default.Shortcuts.Clear();
-            foreach (var sc in allShortcuts) { 
-                Preferences.Default.Shortcuts.Add(new Preferences.ShortcutBinding {
-                    ActionId = sc.ActionId,
-                    KeyName = sc.Key.ToString(),
-                    ModifiersName = sc.Modifiers.ToString()
-                });
-            }
-            Preferences.Save();
-            MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
-        }
-
-        public void AssignShortcut(Key key, KeyModifiers modifiers) {
-            if (ActiveShortcut == null) return;
-            if (key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftShift || key == Key.RightShift || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LWin || key == Key.RWin) {
-                return;
-            }
-
-            var duplicate = allShortcuts.FirstOrDefault(s => s != ActiveShortcut && s.Key == key && s.Modifiers == modifiers);
-            
-            if (duplicate != null) {
-                ActiveShortcut.IsListening = false;
-                ActiveShortcut.RefreshDisplay();
-                ActiveShortcut = null;
-                string formatString = ThemeManager.GetString("prefs.shortcuts.duplicate") ?? "The shortcut '{0}' is already assigned to '{1}'.";
-                string message = string.Format(formatString, duplicate.DisplayString, duplicate.ActionName);
-                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(message));
-                return; 
-            }
-            ActiveShortcut.Key = key;
-            ActiveShortcut.Modifiers = modifiers;
-            ActiveShortcut.IsListening = false;
-            ActiveShortcut.RefreshDisplay();
-            ActiveShortcut = null;
-            SaveShortcuts();
-        }
-
-        public void ResetShortcut(ShortcutItemViewModel item) {
-            var defaults = new Preferences.SerializablePreferences().Shortcuts;
-            var defaultBinding = defaults.FirstOrDefault(s => s.ActionId == item.ActionId);
-            
-            if (defaultBinding != null && 
-                Enum.TryParse<Key>(defaultBinding.KeyName, out var defKey) && 
-                Enum.TryParse<KeyModifiers>(defaultBinding.ModifiersName, out var defMods)) {
-                
-                item.Key = defKey;
-                item.Modifiers = defMods;
-            } else {
-                item.Key = Key.None;
-                item.Modifiers = KeyModifiers.None;
-            }
-            item.IsListening = false;
-            item.RefreshDisplay();
-            SaveShortcuts();
-        }
-
-        public void ResetAllShortcuts() {
-            var defaults = new Preferences.SerializablePreferences().Shortcuts;
-
-            Preferences.Default.Shortcuts = defaults.ToList(); 
-            Preferences.Save(); 
-            foreach (var item in allShortcuts) {
-                var defaultBinding = defaults.FirstOrDefault(s => s.ActionId == item.ActionId);
-                
-                if (defaultBinding != null && 
-                    Enum.TryParse<Key>(defaultBinding.KeyName, out var defKey) && 
-                    Enum.TryParse<KeyModifiers>(defaultBinding.ModifiersName, out var defMods)) {
-                    
-                    item.Key = defKey;
-                    item.Modifiers = defMods;
-                } else {
-                    item.Key = Key.None;
-                    item.Modifiers = KeyModifiers.None;
-                }
-                
-                item.IsListening = false;
-                item.RefreshDisplay();
-            }
-            SaveShortcuts(); 
-        }
         private List<ShortcutItemViewModel> allShortcuts = new List<ShortcutItemViewModel>();
         public ObservableCollection<ShortcutItemViewModel> FilteredShortcuts { get; } = new ObservableCollection<ShortcutItemViewModel>();
         [Reactive] public string ShortcutSearchText { get; set; } = string.Empty;
         public ReactiveCommand<ShortcutItemViewModel, Unit> ListenForShortcutCommand { get; }
 
         public PreferencesViewModel() {
-            ListenForShortcutCommand = ReactiveCommand.Create<ShortcutItemViewModel>(ListenForShortcut);
-
-            var validActionIds = new HashSet<string>();
-            
-            var defaultShortcuts = new Preferences.SerializablePreferences().Shortcuts;
-            foreach (var sc in defaultShortcuts) {
-                validActionIds.Add(sc.ActionId);
-            }
-            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
-                try { if (Activator.CreateInstance(type) is BatchEdit edit) validActionIds.Add(edit.Name); } catch { }
-            }
-            if (DocManager.Inst.Plugins != null) {
-                foreach (var plugin in DocManager.Inst.Plugins) {
-                    validActionIds.Add(plugin.Name);
-                }
-            }
-            if (Preferences.Default.Shortcuts != null) {
-                var orderedShortcuts = new List<Preferences.ShortcutBinding>();
-                bool requiresSave = false;
-
-                foreach (var defaultBinding in defaultShortcuts) {
-                    var userBinding = Preferences.Default.Shortcuts.FirstOrDefault(s => s.ActionId == defaultBinding.ActionId);
-
-                    if (userBinding != null) {
-                        orderedShortcuts.Add(userBinding);
-                    } else {
-                        orderedShortcuts.Add(new Preferences.ShortcutBinding {
-                            ActionId = defaultBinding.ActionId,
-                            KeyName = defaultBinding.KeyName,
-                            ModifiersName = defaultBinding.ModifiersName
-                        });
-                        requiresSave = true;
-                    }
-                }
-
-                foreach (var userBinding in Preferences.Default.Shortcuts) {
-                    bool isDefault = defaultShortcuts.Any(d => d.ActionId == userBinding.ActionId);
-                    bool isValidPlugin = validActionIds.Contains(userBinding.ActionId);
-
-                    if (!isDefault && isValidPlugin) {
-                        orderedShortcuts.Add(userBinding);
-                    }
-                }
-
-                if (Preferences.Default.Shortcuts.Count != orderedShortcuts.Count) {
-                    requiresSave = true;
-                } else {
-                    for (int i = 0; i < orderedShortcuts.Count; i++) {
-                        if (Preferences.Default.Shortcuts[i].ActionId != orderedShortcuts[i].ActionId) {
-                            requiresSave = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (requiresSave) {
-                    Preferences.Default.Shortcuts = orderedShortcuts;
-                    Preferences.Save();
-                }
-            }
-
-            if (Preferences.Default.Shortcuts != null) {
-                foreach (var binding in Preferences.Default.Shortcuts) {
-                    
-                    Key parsedKey = Key.None;
-                    KeyModifiers parsedMods = KeyModifiers.None;
-                    
-                    if (!string.IsNullOrEmpty(binding.KeyName)) {
-                        Enum.TryParse(binding.KeyName, out parsedKey);
-                    }
-                    if (!string.IsNullOrEmpty(binding.ModifiersName)) {
-                        Enum.TryParse(binding.ModifiersName, out parsedMods);
-                    }
-
-                    string lookupKey = "shortcut." + binding.ActionId;
-                    string displayName = ThemeManager.GetString(lookupKey);
-                    
-                    if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                        displayName = ThemeManager.GetString(binding.ActionId);
-                    }
-
-                    if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
-                        displayName = binding.ActionId;
-                    }
-
-                    if (displayName.StartsWith("shortcut.")) {
-                        displayName = displayName.Substring(9);
-                    }
-
-                    allShortcuts.Add(new ShortcutItemViewModel {
-                        ActionId = binding.ActionId,
-                        ActionName = displayName,
-                        Key = parsedKey,
-                        Modifiers = parsedMods
-                    });
-                }
-            }
-            
-            // external batch edits
-            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
-                try {
-                    if (Activator.CreateInstance(type) is BatchEdit edit) {
-                        
-                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
-                        Key savedKey = Key.None;
-                        KeyModifiers savedMods = KeyModifiers.None;
-                        
-                        if (savedSc != null) {
-                            Enum.TryParse(savedSc.KeyName, out savedKey);
-                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
-                        }
-
-                        string pluginName = edit.Name;
-                        if (allShortcuts.Any(s => s.ActionId == pluginName)) {
-                            continue; 
-                        }
-                        
-                        string lookupKey = "shortcut." + pluginName;
-                        string displayName = ThemeManager.GetString(lookupKey);
-                        
-                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                            displayName = pluginName;
-                        }
-                        if (displayName.StartsWith("shortcut.")) {
-                            displayName = displayName.Substring(9);
-                        }
-
-                        allShortcuts.Add(new ShortcutItemViewModel {
-                            ActionId = pluginName, 
-                            ActionName = displayName,
-                            Key = savedKey,
-                            Modifiers = savedMods
-                        });
-                    }
-                } catch { 
-                }
-            }
-            
-            // legacy plugins
-            if (DocManager.Inst.Plugins != null) {
-                foreach (var plugin in DocManager.Inst.Plugins) {
-                    try {
-                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == plugin.Name);
-                        
-                        Key savedKey = Key.None;
-                        KeyModifiers savedMods = KeyModifiers.None;
-                        
-                        if (savedSc != null) {
-                            Enum.TryParse(savedSc.KeyName, out savedKey);
-                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
-                        }
-
-                        string pluginName = plugin.Name;
-                        string lookupKey = "shortcut." + pluginName;
-                        string displayName = ThemeManager.GetString(lookupKey);
-                        
-                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                            displayName = pluginName;
-                        }
-
-                        if (displayName.StartsWith("shortcut.")) {
-                            displayName = displayName.Substring(9);
-                        }
-
-                        string legacyTag = ThemeManager.GetString("pianoroll.menu.part.legacypluginexp.shortcuts");
-                        if (string.IsNullOrEmpty(legacyTag) || legacyTag == "pianoroll.menu.part.legacypluginexp.shortcuts") {
-                            legacyTag = "(legacy)";
-                        }
-
-                        var existingItem = allShortcuts.FirstOrDefault(s => s.ActionId == pluginName);
-                        if (existingItem != null) {
-                            if (!existingItem.ActionName.EndsWith(legacyTag)) {
-                                existingItem.ActionName = $"{existingItem.ActionName} {legacyTag}";
-                            }
-                            continue;
-                        }
-
-                        allShortcuts.Add(new ShortcutItemViewModel {
-                            ActionId = pluginName, 
-                            ActionName = $"{displayName} {legacyTag}",
-                            Key = savedKey,
-                            Modifiers = savedMods
-                        });
-                    } catch {
-                        
-                    }
-                }
-            }
-
-            var uniqueShortcuts = allShortcuts
-                .GroupBy(sc => sc.ActionId)
-                .Select(group => group.First())
-                .ToList();
-
-            allShortcuts.Clear();
-            foreach (var sc in uniqueShortcuts) {
-                allShortcuts.Add(sc);
-            }
-
-            this.WhenAnyValue(vm => vm.ShortcutSearchText)
-            .Subscribe(text => {
-                FilteredShortcuts.Clear();
-                var lowerText = text?.ToLowerInvariant() ?? string.Empty;
-                foreach (var sc in allShortcuts) {
-                    if (string.IsNullOrEmpty(lowerText) || 
-                        sc.ActionName.ToLowerInvariant().Contains(lowerText) || 
-                        sc.DisplayString.ToLowerInvariant().Contains(lowerText)) {
-                        FilteredShortcuts.Add(sc);
-                    }
-                }
-            });
-
             var audioOutput = PlaybackManager.Inst.AudioOutput;
             if (audioOutput != null) {
                 AudioOutputDevices = audioOutput.GetOutputDevices();
@@ -532,6 +221,8 @@ public PreferencesViewModel() {
             RememberUst = Preferences.Default.RememberUst;
             RememberVsqx = Preferences.Default.RememberVsqx;
             ClearCacheOnQuit = Preferences.Default.ClearCacheOnQuit;
+            ListenForShortcutCommand = ReactiveCommand.Create<ShortcutItemViewModel>(ListenForShortcut);
+            LoadShortcuts();
 
             MessageBus.Current.Listen<ThemeEditorStateChangedEvent>()
                 .Subscribe(_ => this.RaisePropertyChanged(nameof(IsThemeEditorOpen)));
@@ -744,6 +435,18 @@ public PreferencesViewModel() {
                     Preferences.Default.SkipRenderingMutedTracks = skipRenderingMutedTracks;
                     Preferences.Save();
                 });
+            this.WhenAnyValue(vm => vm.ShortcutSearchText)
+                .Subscribe(text => {
+                    FilteredShortcuts.Clear();
+                    var lowerText = text?.ToLowerInvariant() ?? string.Empty;
+                    foreach (var sc in allShortcuts) {
+                        if (string.IsNullOrEmpty(lowerText) || 
+                            sc.ActionName.ToLowerInvariant().Contains(lowerText) || 
+                            sc.DisplayString.ToLowerInvariant().Contains(lowerText)) {
+                            FilteredShortcuts.Add(sc);
+                        }
+                    }
+                });
         }
 
         public void TestAudioOutputDevice() {
@@ -797,5 +500,253 @@ public void RefreshThemes() {
         public void ToggleOnnxGpuDisplay(bool show) {
             ShowOnnxGpu = show;
         }
+
+        private void LoadShortcuts() {
+            var validActionIds = new HashSet<string>();
+            
+            var defaultShortcuts = new Preferences.SerializablePreferences().Shortcuts;
+            foreach (var sc in defaultShortcuts) {
+                validActionIds.Add(sc.ActionId);
+            }
+            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
+                try { if (Activator.CreateInstance(type) is BatchEdit edit) validActionIds.Add(edit.Name); } catch { }
+            }
+            if (DocManager.Inst.Plugins != null) {
+                foreach (var plugin in DocManager.Inst.Plugins) {
+                    validActionIds.Add(plugin.Name);
+                }
+            }
+            if (Preferences.Default.Shortcuts != null) {
+                /*var orderedShortcuts = new List<Preferences.ShortcutBinding>();
+                bool requiresSave = false;
+
+                foreach (var defaultBinding in defaultShortcuts) {
+                    var userBinding = Preferences.Default.Shortcuts.FirstOrDefault(s => s.ActionId == defaultBinding.ActionId);
+
+                    if (userBinding != null) {
+                        orderedShortcuts.Add(userBinding);
+                    } else {
+                        orderedShortcuts.Add(new Preferences.ShortcutBinding {
+                            ActionId = defaultBinding.ActionId,
+                            KeyName = defaultBinding.KeyName,
+                            ModifiersName = defaultBinding.ModifiersName
+                        });
+                        requiresSave = true;
+                    }
+                }
+
+                foreach (var userBinding in Preferences.Default.Shortcuts) {
+                    bool isDefault = defaultShortcuts.Any(d => d.ActionId == userBinding.ActionId);
+                    bool isValidPlugin = validActionIds.Contains(userBinding.ActionId);
+
+                    if (!isDefault && isValidPlugin) {
+                        orderedShortcuts.Add(userBinding);
+                    }
+                }
+
+                if (Preferences.Default.Shortcuts.Count != orderedShortcuts.Count) {
+                    requiresSave = true;
+                } else {
+                    for (int i = 0; i < orderedShortcuts.Count; i++) {
+                        if (Preferences.Default.Shortcuts[i].ActionId != orderedShortcuts[i].ActionId) {
+                            requiresSave = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (requiresSave) {
+                    Preferences.Default.Shortcuts = orderedShortcuts;
+                    Preferences.Save();
+                }
+            }
+
+            if (Preferences.Default.Shortcuts != null) {
+                foreach (var binding in Preferences.Default.Shortcuts) {
+                    
+                    Key parsedKey = Key.None;
+                    KeyModifiers parsedMods = KeyModifiers.None;
+                    
+                    if (!string.IsNullOrEmpty(binding.KeyName)) {
+                        Enum.TryParse(binding.KeyName, out parsedKey);
+                    }
+                    if (!string.IsNullOrEmpty(binding.ModifiersName)) {
+                        Enum.TryParse(binding.ModifiersName, out parsedMods);
+                    }
+
+                    string lookupKey = "shortcut." + binding.ActionId;
+                    string displayName = ThemeManager.GetString(lookupKey);
+                    
+                    if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                        displayName = ThemeManager.GetString(binding.ActionId);
+                    }
+
+                    if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
+                        displayName = binding.ActionId;
+                    }
+
+                    if (displayName.StartsWith("shortcut.")) {
+                        displayName = displayName.Substring(9);
+                    }
+
+                    allShortcuts.Add(new ShortcutItemViewModel {
+                        ActionId = binding.ActionId,
+                        ActionName = displayName,
+                        Key = parsedKey,
+                        Modifiers = parsedMods
+                    });
+                }
+            }
+            
+            // external batch edits
+            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
+                try {
+                    if (Activator.CreateInstance(type) is BatchEdit edit) {
+                        
+                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
+                        Key savedKey = Key.None;
+                        KeyModifiers savedMods = KeyModifiers.None;
+                        
+                        if (savedSc != null) {
+                            Enum.TryParse(savedSc.KeyName, out savedKey);
+                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
+                        }
+
+                        string pluginName = edit.Name;
+                        if (allShortcuts.Any(s => s.ActionId == pluginName)) {
+                            continue; 
+                        }
+                        
+                        string lookupKey = "shortcut." + pluginName;
+                        string displayName = ThemeManager.GetString(lookupKey);
+                        
+                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                            displayName = pluginName;
+                        }
+                        if (displayName.StartsWith("shortcut.")) {
+                            displayName = displayName.Substring(9);
+                        }
+
+                        allShortcuts.Add(new ShortcutItemViewModel {
+                            ActionId = pluginName, 
+                            ActionName = displayName,
+                            Key = savedKey,
+                            Modifiers = savedMods
+                        });
+                    }
+                } catch { 
+                }
+            }
+            
+            // legacy plugins
+            if (DocManager.Inst.Plugins != null) {
+                foreach (var plugin in DocManager.Inst.Plugins) {
+                    try {
+                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == plugin.Name);
+                        
+                        Key savedKey = Key.None;
+                        KeyModifiers savedMods = KeyModifiers.None;
+                        
+                        if (savedSc != null) {
+                            Enum.TryParse(savedSc.KeyName, out savedKey);
+                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
+                        }
+
+                        string pluginName = plugin.Name;
+                        string lookupKey = "shortcut." + pluginName;
+                        string displayName = ThemeManager.GetString(lookupKey);
+                        
+                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                            displayName = pluginName;
+                        }
+
+                        if (displayName.StartsWith("shortcut.")) {
+                            displayName = displayName.Substring(9);
+                        }
+
+                        string legacyTag = ThemeManager.GetString("pianoroll.menu.part.legacypluginexp.shortcuts");
+                        if (string.IsNullOrEmpty(legacyTag) || legacyTag == "pianoroll.menu.part.legacypluginexp.shortcuts") {
+                            legacyTag = "(legacy)";
+                        }
+
+                        var existingItem = allShortcuts.FirstOrDefault(s => s.ActionId == pluginName);
+                        if (existingItem != null) {
+                            if (!existingItem.ActionName.EndsWith(legacyTag)) {
+                                existingItem.ActionName = $"{existingItem.ActionName} {legacyTag}";
+                            }
+                            continue;
+                        }
+
+                        allShortcuts.Add(new ShortcutItemViewModel {
+                            ActionId = pluginName, 
+                            ActionName = $"{displayName} {legacyTag}",
+                            Key = savedKey,
+                            Modifiers = savedMods
+                        });
+                    } catch {
+                        
+                    }
+                }*/
+            }
+
+            var uniqueShortcuts = allShortcuts
+                .GroupBy(sc => sc.ActionId)
+                .Select(group => group.First())
+                .ToList();
+
+            allShortcuts.Clear();
+            foreach (var sc in uniqueShortcuts) {
+                allShortcuts.Add(sc);
+            }
+        }
+        
+        public void ListenForShortcut(ShortcutItemViewModel item) {
+            // Cancel any existing listening item
+            if (ActiveShortcut != null) {
+                ActiveShortcut.IsListening = false;
+                ActiveShortcut.RefreshDisplay();
+            }
+
+            ActiveShortcut = item;
+            ActiveShortcut.IsListening = true;
+            ActiveShortcut.RefreshDisplay();
+        }
+
+        private void SaveShortcuts() {
+            KeyTranslator.SaveShortcuts(allShortcuts);
+            LoadShortcuts();
+            MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
+        }
+
+        public void AssignShortcut(Key key, KeyModifiers modifiers) {
+            /*if (ActiveShortcut == null) return;
+            if (key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftShift || key == Key.RightShift || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LWin || key == Key.RWin) {
+                return;
+            }
+
+            var duplicate = allShortcuts.FirstOrDefault(s => s != ActiveShortcut && s.Key == key && s.Modifiers == modifiers);
+            
+            if (duplicate != null) {
+                ActiveShortcut.IsListening = false;
+                ActiveShortcut.RefreshDisplay();
+                ActiveShortcut = null;
+                string formatString = ThemeManager.GetString("prefs.shortcuts.duplicate") ?? "The shortcut '{0}' is already assigned to '{1}'.";
+                string message = string.Format(formatString, duplicate.DisplayString, duplicate.ActionName);
+                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(message));
+                return; 
+            }
+            ActiveShortcut.Key = key;
+            ActiveShortcut.Modifiers = modifiers;
+            ActiveShortcut.IsListening = false;
+            ActiveShortcut.RefreshDisplay();
+            ActiveShortcut = null;
+            SaveShortcuts();*/
+        }
+
+        public void ResetAllShortcuts() {
+            KeyTranslator.ResetShortcuts();
+            LoadShortcuts();
+            MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
+        }
     }
 }
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 19a7a75a3..3fb3da6cb 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -52,7 +52,6 @@
         </Style>
       </ListBox.Styles>
       <ListBoxItem Content="{DynamicResource prefs.general}"/>
-      <ListBoxItem Content="{DynamicResource prefs.shortcuts}"/>
       <ListBoxItem Content="{DynamicResource prefs.playback}"/>
       <ListBoxItem Content="{DynamicResource prefs.paths}"/>
       <ListBoxItem Content="{DynamicResource prefs.editing}"/>
@@ -61,6 +60,7 @@
       <ListBoxItem Content="{DynamicResource prefs.utau}"/>
       <ListBoxItem Content="{DynamicResource prefs.diffsinger}"/>
       <ListBoxItem Content="{DynamicResource prefs.advanced}"/>
+      <ListBoxItem Content="{DynamicResource prefs.shortcuts}"/>
     </ListBox>
     <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
       <Carousel Name="PageCarousel" Margin="10" HorizontalAlignment="Stretch" 
@@ -90,50 +90,6 @@
           <TextBlock Classes="restart"/>
         </StackPanel>
 
-        <!-- Shortcuts -->
-        <Grid RowDefinitions="Auto, Auto, Auto, *">
-          <TextBlock Grid.Row="0" 
-                Text="{DynamicResource prefs.shortcuts}" 
-                Margin="0,10,0,10" 
-                FontWeight="Bold"/>
-          <Grid Grid.Row="1" ColumnDefinitions="*, Auto" Margin="5,0,5,5">
-            <TextBox Grid.Column="0" 
-                Text="{Binding ShortcutSearchText}" 
-                Watermark="{DynamicResource prefs.shortcut.search.watermark}" />
-            <Button Grid.Column="1" 
-                Margin="10,0,0,0" 
-                Content="{DynamicResource pianoroll.menu.reset}" 
-                Command="{Binding ResetAllShortcuts}" />
-          </Grid>
-          <TextBlock Grid.Row="2" 
-                Text="{DynamicResource prefs.note.restart}" 
-                Margin="5,0,5,10" 
-                FontStyle="Italic" 
-                Opacity="0.75" 
-                TextWrapping="Wrap"/>
-          <ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
-            <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <Grid ColumnDefinitions="*, Auto" Margin="5">
-                    <TextBlock Grid.Column="0" 
-                          Text="{Binding ActionName}" 
-                          VerticalAlignment="Center" 
-                          TextWrapping="Wrap"/>
-                    <Button Grid.Column="1" 
-                          Content="{Binding DisplayString}" 
-                          x:CompileBindings="False"
-                          Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
-                          CommandParameter="{Binding}"
-                          PointerReleased="OnShortcutRightClick"
-                          ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
-                  </Grid>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-          </ScrollViewer>
-        </Grid>
-
         <!-- Playback -->
         <StackPanel>
           <Grid>
@@ -402,6 +358,51 @@
                     HorizontalAlignment="Stretch" Click="DetectWinePath"/>
           </Grid>
         </StackPanel>
+
+        <!-- Shortcuts -->
+        <Grid RowDefinitions="Auto, Auto, Auto, *">
+          <TextBlock Grid.Row="0" 
+                Text="{DynamicResource prefs.shortcuts}" 
+                Margin="0,10,0,10" 
+                FontWeight="Bold"/>
+          <Grid Grid.Row="1" ColumnDefinitions="*, Auto" Margin="5,0,5,5">
+            <TextBox Grid.Column="0" 
+                Text="{Binding ShortcutSearchText}" 
+                Watermark="{DynamicResource prefs.shortcut.search.watermark}" />
+            <Button Grid.Column="1" 
+                Margin="10,0,0,0" 
+                Content="{DynamicResource pianoroll.menu.reset}" 
+                Command="{Binding ResetAllShortcuts}" />
+          </Grid>
+          <TextBlock Grid.Row="2" 
+                Text="{DynamicResource prefs.note.restart}" 
+                Margin="5,0,5,10" 
+                FontStyle="Italic" 
+                Opacity="0.75" 
+                TextWrapping="Wrap"/>
+          <ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
+            <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
+              <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                  <Grid ColumnDefinitions="*, Auto" Margin="5">
+                    <TextBlock Grid.Column="0" 
+                          Text="{Binding ActionName}" 
+                          VerticalAlignment="Center" 
+                          TextWrapping="Wrap"/>
+                    <Button Grid.Column="1" 
+                          Content="{Binding DisplayString}" 
+                          x:CompileBindings="False"
+                          Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
+                          CommandParameter="{Binding}"
+                          PointerReleased="OnShortcutRightClick"
+                          ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
+                  </Grid>
+                </DataTemplate>
+              </ItemsControl.ItemTemplate>
+            </ItemsControl>
+          </ScrollViewer>
+        </Grid>
+        
       </Carousel>
     </ScrollViewer>
   </Grid>
diff --git a/OpenUtau/Views/ShortcutKeyDialog.axaml b/OpenUtau/Views/ShortcutKeyDialog.axaml
new file mode 100644
index 000000000..97340d8dc
--- /dev/null
+++ b/OpenUtau/Views/ShortcutKeyDialog.axaml
@@ -0,0 +1,9 @@
+<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" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="OpenUtau.Views.ShortcutKeyDialog"
+        Title="ShortcutKeyDialog">
+    Welcome to Avalonia!
+</Window>
diff --git a/OpenUtau/Views/ShortcutKeyDialog.axaml.cs b/OpenUtau/Views/ShortcutKeyDialog.axaml.cs
new file mode 100644
index 000000000..7d3c50a9b
--- /dev/null
+++ b/OpenUtau/Views/ShortcutKeyDialog.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace OpenUtau.Views;
+
+public partial class ShortcutKeyDialog : Window {
+    public ShortcutKeyDialog() {
+        InitializeComponent();
+    }
+}
+

From 43495be2a612e222977f3751f9f27b3899f5eb13 Mon Sep 17 00:00:00 2001
From: Maiko <maiko3tattun@gmail.com>
Date: Mon, 25 May 2026 00:28:37 +0900
Subject: [PATCH 16/22] Fix Shortct Key (wip2)

---
 OpenUtau.Core/Util/Preferences.cs           |   2 +-
 OpenUtau/Controls/PianoRoll.axaml.cs        |  52 ++----
 OpenUtau/ViewModels/KeyTranslator.cs        |  91 ++++++----
 OpenUtau/ViewModels/PianoRollViewModel.cs   |  21 ++-
 OpenUtau/ViewModels/PreferencesViewModel.cs | 191 +++-----------------
 OpenUtau/Views/PreferencesDialog.axaml      |   4 +-
 OpenUtau/Views/PreferencesDialog.axaml.cs   |   3 +-
 7 files changed, 114 insertions(+), 250 deletions(-)

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index 007485acc..bfb15c526 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -7,7 +7,6 @@
 using Newtonsoft.Json;
 using OpenUtau.Core.Render;
 using Serilog;
-using System.Collections.Generic;
 
 namespace OpenUtau.Core.Util {
 
@@ -226,6 +225,7 @@ public class SerializablePreferences {
             public bool LockUnselectedNotesVibrato = true;
             public bool LockUnselectedNotesExpressions = true;
             public ShortcutBinding[] Shortcuts = [];
+            public ShortcutBinding[] PluginShortcuts = [];
             public bool VoicebankPublishUseIgnore = true;
             public string VoicebankPublishIgnores = @"#Adobe Audition
 *.pkf
diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 74940a16f..8b239ad06 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -114,7 +114,7 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new RandomizePhonemeOffset()
             }.Select(edit => new MenuItemViewModel() {
                 Header = ThemeManager.GetString(edit.Name),
-                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                InputGesture = KeyTranslator.GetGestureForMenu(edit.Name),
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
@@ -133,7 +133,7 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new InsertSlur(),
             }.Select(edit => new MenuItemViewModel() {
                 Header = ThemeManager.GetString(edit.Name),
-                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                InputGesture = KeyTranslator.GetGestureForMenu(edit.Name),
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
@@ -148,7 +148,7 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 new ResetAliases(),
             }.Select(edit => new MenuItemViewModel() {
                 Header = ThemeManager.GetString(edit.Name),
-                InputGesture = KeyTranslator.GetGesture(edit.Name),
+                InputGesture = KeyTranslator.GetGestureForMenu(edit.Name),
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
@@ -160,7 +160,7 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                         .Where(edit => edit != null)
                         .Select(edit => new MenuItemViewModel() {
                             Header = ThemeManager.GetString(edit!.Name),
-                            InputGesture = KeyTranslator.GetGesture(edit.Name),
+                            InputGesture = KeyTranslator.GetGestureForMenu(edit.Name),
                             Command = noteBatchEditCommand,
                             CommandParameter = edit,
                         })
@@ -173,35 +173,35 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
 
             ViewModel.NoteBatchEdits.Insert(6, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.addbreath"),
-                InputGesture = KeyTranslator.GetGesture("Add Breath"),
+                InputGesture = KeyTranslator.GetGestureForMenu("Add Breath"),
                 Command = ReactiveCommand.Create(() => {
                     AddBreathNote();
                 })
             });
             ViewModel.NoteBatchEdits.Insert(9, new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.quantize"),
-                InputGesture = KeyTranslator.GetGesture("Quantize Notes"),
+                InputGesture = KeyTranslator.GetGestureForMenu("Quantize Notes"),
                 Command = ReactiveCommand.Create(() => {
                     QuantizeNotes();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.randomizetuning"),
-                InputGesture = KeyTranslator.GetGesture("Randomize Tuning"),
+                InputGesture = KeyTranslator.GetGestureForMenu("Randomize Tuning"),
                 Command = ReactiveCommand.Create(() => {
                     RandomizeTuning();
                 })
             });
             ViewModel.NoteBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.notes.lengthencrossfade"),
-                InputGesture = KeyTranslator.GetGesture("Lengthen Crossfade"),
+                InputGesture = KeyTranslator.GetGestureForMenu("Lengthen Crossfade"),
                 Command = ReactiveCommand.Create(() => {
                     LengthenCrossfade();
                 })
             });
             ViewModel.LyricBatchEdits.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("lyricsreplace.replace"),
-                InputGesture = KeyTranslator.GetGesture("lyricsreplace.replace"),
+                InputGesture = KeyTranslator.GetGestureForMenu("lyricsreplace.replace"),
                 Command = ReactiveCommand.Create(() => {
                     ReplaceLyrics();
                 })
@@ -823,18 +823,18 @@ private void NotesCanvasRightPointerPressed(Control control, PointerPoint point,
                             Header = ThemeManager.GetString("context.note.copy"),
                             Command = ViewModel.NoteCopyCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = KeyTranslator.GetGesture("Copy"),
+                            InputGesture = KeyTranslator.GetGestureForMenu("Copy"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.delete"),
                             Command = ViewModel.NoteDeleteCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = KeyTranslator.GetGesture("DeleteNotes"),
+                            InputGesture = KeyTranslator.GetGestureForMenu("DeleteNotes"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.pasteparameters"),
                             Command = ReactiveCommand.Create(() => ViewModel.NotesViewModel.PasteSelectedParams(RootWindow)),
-                            InputGesture = KeyTranslator.GetGesture("PasteParameters"),
+                            InputGesture = KeyTranslator.GetGestureForMenu("PasteParameters"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("pianoroll.menu.notes"),
@@ -1393,7 +1393,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
             string mainPenIdx = Preferences.Default.PenPlusDefault ? "2+" : "2";
             string altPenIdx = Preferences.Default.PenPlusDefault ? "2" : "2+";
 
-            string? action = KeyTranslator.GetActionIdForShortcut(args.Key, args.KeyModifiers);
+            string? action = KeyTranslator.GetActionIdFromKey(args.Key, args.KeyModifiers);
 
             switch (action) {
                 // Playback & Selection
@@ -1488,20 +1488,9 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 // Edit Operations
                 case "Undo": ViewModel.Undo(); return true;
                 case "Redo": ViewModel.Redo(); return true;
-                case "Copy":
-                    if (curveVm.IsSelected(notesVm.PrimaryKey)) curveVm.Copy(notesVm.Part);
-                    else notesVm.CopyNotes();
-                    return true;
-                case "Cut":
-                    if (curveVm.IsSelected(notesVm.PrimaryKey)) curveVm.Cut(notesVm.Part);
-                    else notesVm.CutNotes();
-                    return true;
-                case "Paste":
-                    if (DocManager.Inst.NotesClipboard != null && DocManager.Inst.NotesClipboard.Count > 0) notesVm.PasteNotes();
-                    else if (DocManager.Inst.CurvesClipboard != null && project.tracks[notesVm.Part.trackNo].TryGetExpDescriptor(project, notesVm.PrimaryKey, out var descriptor)) {
-                        curveVm.Paste(notesVm.Part, descriptor);
-                    }
-                    return true;
+                case "Copy": ViewModel.Copy(); return true;
+                case "Cut": ViewModel.Cut(); return true;
+                case "Paste": ViewModel.Paste(); return true;
                 case "PastePlain": notesVm.PastePlainNotes(); return true;
                 case "PasteParameters": notesVm.PasteSelectedParams(RootWindow); return true;
                 case "InsertNote": notesVm.InsertNote(); return true;
@@ -1579,15 +1568,6 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     }
                 }
             }
-            // Legacy plugins
-            if (!string.IsNullOrEmpty(action)) {
-                foreach (var menu in ViewModel.LegacyPlugins) {
-                    if (menu.Header?.ToString() == action) {
-                        menu.Command?.Execute(menu.CommandParameter);
-                        return true;
-                    }
-                }
-            }
             return false;
         }
 
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 7b4cd9467..72be0ce9f 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,47 +1,27 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Concurrency;
 using System.Runtime.InteropServices;
 using Avalonia.Input;
 using OpenUtau.Core.Util;
-using SharpCompress;
 
 namespace OpenUtau.App.ViewModels {
     public class ShortcutKey {
         public string ActionId { get; set; }
-        //public string KeyName { get; set; } 
-        //public string ModifiersName { get; set; }
         public KeyGesture Gesture { get; set; }
 
         public ShortcutKey(string actionId, string shortcut) {
             ActionId = actionId;
             KeyGesture key = KeyGesture.Parse(shortcut);
-            if (KeyTranslator.IsMac) {
-                var m = key.KeyModifiers;
-                bool hasCtrl = m.HasFlag(KeyModifiers.Control);
-                bool hasMeta = m.HasFlag(KeyModifiers.Meta);
-                if (hasCtrl) {
-                    m &= ~KeyModifiers.Control;
-                    m |= KeyModifiers.Meta; 
-                }
-                if (hasMeta) {
-                    m &= ~KeyModifiers.Meta;
-                    m |= KeyModifiers.Control; 
-                }
-                Gesture = new KeyGesture(key.Key, m);
-            } else {
-                Gesture = key;
-            }
+            Gesture = KeyTranslator.GestureConverter(key);
         }
 
-        public override string ToString() => KeyTranslator.GetFriendlyName(Gesture.Key, Gesture.KeyModifiers);
+        public override string ToString() => $"{ActionId}: {KeyTranslator.GetFriendlyName(Gesture.Key, Gesture.KeyModifiers)}";
     }
     
     public static class KeyTranslator {
         public static readonly bool IsMac = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
         public static List<ShortcutKey> Shortcuts { get; set; } = new List<ShortcutKey>();
-        private static Preferences.ShortcutBinding[] DefShortcuts { get; }
+        public static Preferences.ShortcutBinding[] DefShortcuts { get; }
 
         static KeyTranslator() {
             DefShortcuts = [
@@ -225,31 +205,48 @@ static KeyTranslator() {
 
         public static void LoadShortcuts() {
             Shortcuts.Clear();
-            var def = DefShortcuts.ToList();
-            foreach (var sc in Preferences.Default.Shortcuts) {
-                var defSc = def.FirstOrDefault(defSc => defSc.ActionId == sc.ActionId);
-                if (defSc != null) {
-                    defSc.Shortcuts = sc.Shortcuts;
+            Shortcuts = GetMergedShortcuts().SelectMany(s => s.Shortcuts
+                .Select(key => new ShortcutKey(s.ActionId, key)))
+                .Where(key => key.Gesture.Key != Key.None)
+                .ToList();
+            //merged.AddRange(Preferences.Default.PluginShortcuts); Todo
+        }
+
+        public static List<Preferences.ShortcutBinding> GetMergedShortcuts() {
+            var merged = new List<Preferences.ShortcutBinding>();
+            foreach (var sc in DefShortcuts) {
+                var customized = Preferences.Default.Shortcuts.FirstOrDefault(pref => pref.ActionId == sc.ActionId);
+                if (customized != null) {
+                    merged.Add(new Preferences.ShortcutBinding(sc.ActionId, customized.Shortcuts));
+                } else {
+                    merged.Add(sc);
                 }
             }
-            Shortcuts = def.SelectMany(s => s.Shortcuts
-                .Select(key => new ShortcutKey(s.ActionId, key))).ToList();
+            return merged;
         }
 
         public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
             var diff = new List<Preferences.ShortcutBinding>();
+            var plugin = new  List<Preferences.ShortcutBinding>();
             foreach (var item in items) {
                 var defKey = DefShortcuts.FirstOrDefault(s => s.ActionId == item.ActionId);
                 if (defKey != null) {
-                    var gestures = item.Gestures.Select(g => g.ToString()).ToArray();
+                    item.Gestures.RemoveAll(g => g.Key == Key.None);
+                    var gestures = item.Gestures.Select(g => GestureConverter(g).ToString()).ToArray();
                     if (defKey.Shortcuts.Length != gestures.Length) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     } else if (defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     }
+                } else {
+                    item.Gestures.RemoveAll(g => g.Key == Key.None);
+                    if (item.Gestures.Count == 0) continue;
+                    var gestures = item.Gestures.Select(g => GestureConverter(g).ToString()).ToArray();
+                    plugin.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                 }
             }
             Preferences.Default.Shortcuts = diff.ToArray();
+            Preferences.Default.PluginShortcuts = plugin.ToArray();
             Preferences.Save();
             LoadShortcuts();
         }
@@ -260,12 +257,31 @@ public static void ResetShortcuts() {
             LoadShortcuts();
         }
 
-        public static KeyGesture? GetGesture(string actionId) {
+        public static KeyGesture GestureConverter(KeyGesture gesture) {
+            if (IsMac) {
+                var m = gesture.KeyModifiers;
+                bool hasCtrl = m.HasFlag(KeyModifiers.Control);
+                bool hasMeta = m.HasFlag(KeyModifiers.Meta);
+                if (hasCtrl) {
+                    m &= ~KeyModifiers.Control;
+                    m |= KeyModifiers.Meta; 
+                }
+                if (hasMeta) {
+                    m &= ~KeyModifiers.Meta;
+                    m |= KeyModifiers.Control;
+                }
+                return new KeyGesture(gesture.Key, m);
+            } else {
+                return gesture;
+            }
+        }
+
+        public static KeyGesture? GetGestureForMenu(string actionId) {
             // Since only one shortcut can be displayed in the menu, if there are multiple shortcuts, it returns the first one
             return Shortcuts.FirstOrDefault(s => s.ActionId == actionId)?.Gesture;
         }
         
-        public static string? GetActionIdForShortcut(Key pressedKey, KeyModifiers pressedMods) {
+        public static string? GetActionIdFromKey(Key pressedKey, KeyModifiers pressedMods) {
             foreach (var sc in Shortcuts) {
                 if (IsKeyMatch(sc.Gesture.Key, pressedKey) && sc.Gesture.KeyModifiers == pressedMods) {
                     return sc.ActionId;
@@ -310,8 +326,8 @@ public static string GetFriendlyName(string keyName) {
                 // Navigation & Editing
                 "Escape" => "Esc",
                 "Return" => "Enter",
-                "Back" => IsMac ? "Delete" : "Backspace",
-                "Delete" => IsMac ? "Forward Del" : "Del",
+                "Back" => "Backspace",
+                "Delete" => "Delete",
                 "Insert" => "Ins",
                 "PageUp" => "PgUp",
                 "PageDown" => "PgDn",
@@ -354,11 +370,8 @@ public static string GetFriendlyName(string keyName) {
 
         public static string GetFriendlyModifiersName(KeyModifiers modifiers) {
             if (modifiers == KeyModifiers.None) return string.Empty;
-            
-            // Apply macOS normalization before rendering strings
-            //modifiers = NormalizeModifiers(modifiers);
 
-            var parts = new System.Collections.Generic.List<string>();
+            var parts = new List<string>();
             if (modifiers.HasFlag(KeyModifiers.Control)) {
                 parts.Add(IsMac ? "⌃" : "Ctrl");
             }
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index f3308505e..c6ce8dee0 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -232,27 +232,32 @@ private void SetUndoState() {
 
         private void LoadLegacyPlugins() {
             LegacyPlugins.Clear();
-            
             LegacyPlugins.AddRange(DocManager.Inst.Plugins.Select(plugin => new MenuItemViewModel() {
                 Header = plugin.Name,
-                InputGesture = KeyTranslator.GetGesture(plugin.Name),
                 Command = legacyPluginCommand,
                 CommandParameter = plugin,
             }));
 
             LegacyPluginShortcuts.Clear();
             foreach (MenuItemViewModel menu in LegacyPlugins) {
-                if (menu.InputGesture != null && !LegacyPluginShortcuts.ContainsKey(menu.InputGesture.Key)) {
-                    LegacyPluginShortcuts.Add(menu.InputGesture.Key, menu);
+                if (menu.CommandParameter is Classic.Plugin plugin) {
+                    if (Enum.TryParse(plugin.Shortcut, out Key key) && !LegacyPluginShortcuts.ContainsKey(key)) {
+                        LegacyPluginShortcuts.Add(key, menu);
+                    }
                 }
             }
-
-            LegacyPlugins.Add(new MenuItemViewModel() { Header = "-", Height = 1 });
+            LegacyPlugins.Add(new MenuItemViewModel() { // Separator
+                Header = "-",
+                Height = 1
+            });
             LegacyPlugins.Add(new MenuItemViewModel() {
                 Header = ThemeManager.GetString("pianoroll.menu.plugin.openfolder"),
                 Command = ReactiveCommand.Create(() => {
-                    try { OS.OpenFolder(PathManager.Inst.PluginsPath); } 
-                    catch (Exception e) { DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e)); }
+                    try {
+                        OS.OpenFolder(PathManager.Inst.PluginsPath);
+                    } catch (Exception e) {
+                        DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e));
+                    }
                 })
             });
             LegacyPlugins.Add(new MenuItemViewModel() {
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 8d60170d7..7c47274dc 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -32,16 +32,34 @@ public class ShortcutsRefreshEvent { }
     public class ShortcutItemViewModel : ViewModelBase {
         public string ActionName { get; set; } = string.Empty;
         public string ActionId { get; set; } = string.Empty;
-        
         public List<KeyGesture> Gestures { get; set; } = new List<KeyGesture>();
         [Reactive] public bool IsListening { get; set; }
 
         public string DisplayString {
             get {
                 if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening") ?? "Press keys...";
-                var gesture = Gestures.FirstOrDefault();
-                return gesture == null ? "None" : KeyTranslator.GetFriendlyName(gesture.Key, gesture.KeyModifiers);
+                var text = string.Join(", ", Gestures.Select(g => KeyTranslator.GetFriendlyName(g.Key, g.KeyModifiers)));
+                return Gestures.Count == 0 ? "None" : text;
+            }
+        }
+        
+        public ShortcutItemViewModel() {}
+        public ShortcutItemViewModel(Preferences.ShortcutBinding binding) {
+            string lookupKey = "shortcut." + binding.ActionId;
+            string displayName = ThemeManager.GetString(lookupKey);
+            if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
+                displayName = ThemeManager.GetString(binding.ActionId);
+            }
+            if (string.IsNullOrEmpty(displayName)) {
+                displayName = binding.ActionId;
             }
+            if (displayName.StartsWith("shortcut.")) {
+                displayName = displayName.Substring(9);
+            }
+
+            ActionId = binding.ActionId;
+            ActionName = displayName;
+            Gestures = binding.Shortcuts.Select(s => KeyTranslator.GestureConverter(KeyGesture.Parse(s))).ToList();
         }
 
         public void RefreshDisplay() {
@@ -502,102 +520,9 @@ public void ToggleOnnxGpuDisplay(bool show) {
         }
 
         private void LoadShortcuts() {
-            var validActionIds = new HashSet<string>();
-            
-            var defaultShortcuts = new Preferences.SerializablePreferences().Shortcuts;
-            foreach (var sc in defaultShortcuts) {
-                validActionIds.Add(sc.ActionId);
-            }
-            foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
-                try { if (Activator.CreateInstance(type) is BatchEdit edit) validActionIds.Add(edit.Name); } catch { }
-            }
-            if (DocManager.Inst.Plugins != null) {
-                foreach (var plugin in DocManager.Inst.Plugins) {
-                    validActionIds.Add(plugin.Name);
-                }
-            }
-            if (Preferences.Default.Shortcuts != null) {
-                /*var orderedShortcuts = new List<Preferences.ShortcutBinding>();
-                bool requiresSave = false;
-
-                foreach (var defaultBinding in defaultShortcuts) {
-                    var userBinding = Preferences.Default.Shortcuts.FirstOrDefault(s => s.ActionId == defaultBinding.ActionId);
-
-                    if (userBinding != null) {
-                        orderedShortcuts.Add(userBinding);
-                    } else {
-                        orderedShortcuts.Add(new Preferences.ShortcutBinding {
-                            ActionId = defaultBinding.ActionId,
-                            KeyName = defaultBinding.KeyName,
-                            ModifiersName = defaultBinding.ModifiersName
-                        });
-                        requiresSave = true;
-                    }
-                }
-
-                foreach (var userBinding in Preferences.Default.Shortcuts) {
-                    bool isDefault = defaultShortcuts.Any(d => d.ActionId == userBinding.ActionId);
-                    bool isValidPlugin = validActionIds.Contains(userBinding.ActionId);
-
-                    if (!isDefault && isValidPlugin) {
-                        orderedShortcuts.Add(userBinding);
-                    }
-                }
-
-                if (Preferences.Default.Shortcuts.Count != orderedShortcuts.Count) {
-                    requiresSave = true;
-                } else {
-                    for (int i = 0; i < orderedShortcuts.Count; i++) {
-                        if (Preferences.Default.Shortcuts[i].ActionId != orderedShortcuts[i].ActionId) {
-                            requiresSave = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (requiresSave) {
-                    Preferences.Default.Shortcuts = orderedShortcuts;
-                    Preferences.Save();
-                }
-            }
-
-            if (Preferences.Default.Shortcuts != null) {
-                foreach (var binding in Preferences.Default.Shortcuts) {
-                    
-                    Key parsedKey = Key.None;
-                    KeyModifiers parsedMods = KeyModifiers.None;
-                    
-                    if (!string.IsNullOrEmpty(binding.KeyName)) {
-                        Enum.TryParse(binding.KeyName, out parsedKey);
-                    }
-                    if (!string.IsNullOrEmpty(binding.ModifiersName)) {
-                        Enum.TryParse(binding.ModifiersName, out parsedMods);
-                    }
-
-                    string lookupKey = "shortcut." + binding.ActionId;
-                    string displayName = ThemeManager.GetString(lookupKey);
-                    
-                    if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                        displayName = ThemeManager.GetString(binding.ActionId);
-                    }
-
-                    if (string.IsNullOrEmpty(displayName) || displayName == binding.ActionId) {
-                        displayName = binding.ActionId;
-                    }
-
-                    if (displayName.StartsWith("shortcut.")) {
-                        displayName = displayName.Substring(9);
-                    }
-
-                    allShortcuts.Add(new ShortcutItemViewModel {
-                        ActionId = binding.ActionId,
-                        ActionName = displayName,
-                        Key = parsedKey,
-                        Modifiers = parsedMods
-                    });
-                }
-            }
-            
+            var shortcuts = KeyTranslator.GetMergedShortcuts().Select(binding => new ShortcutItemViewModel(binding));
+            allShortcuts.AddRange(shortcuts);
+            /* Todo
             // external batch edits
             foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
                 try {
@@ -636,68 +561,7 @@ private void LoadShortcuts() {
                     }
                 } catch { 
                 }
-            }
-            
-            // legacy plugins
-            if (DocManager.Inst.Plugins != null) {
-                foreach (var plugin in DocManager.Inst.Plugins) {
-                    try {
-                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == plugin.Name);
-                        
-                        Key savedKey = Key.None;
-                        KeyModifiers savedMods = KeyModifiers.None;
-                        
-                        if (savedSc != null) {
-                            Enum.TryParse(savedSc.KeyName, out savedKey);
-                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
-                        }
-
-                        string pluginName = plugin.Name;
-                        string lookupKey = "shortcut." + pluginName;
-                        string displayName = ThemeManager.GetString(lookupKey);
-                        
-                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                            displayName = pluginName;
-                        }
-
-                        if (displayName.StartsWith("shortcut.")) {
-                            displayName = displayName.Substring(9);
-                        }
-
-                        string legacyTag = ThemeManager.GetString("pianoroll.menu.part.legacypluginexp.shortcuts");
-                        if (string.IsNullOrEmpty(legacyTag) || legacyTag == "pianoroll.menu.part.legacypluginexp.shortcuts") {
-                            legacyTag = "(legacy)";
-                        }
-
-                        var existingItem = allShortcuts.FirstOrDefault(s => s.ActionId == pluginName);
-                        if (existingItem != null) {
-                            if (!existingItem.ActionName.EndsWith(legacyTag)) {
-                                existingItem.ActionName = $"{existingItem.ActionName} {legacyTag}";
-                            }
-                            continue;
-                        }
-
-                        allShortcuts.Add(new ShortcutItemViewModel {
-                            ActionId = pluginName, 
-                            ActionName = $"{displayName} {legacyTag}",
-                            Key = savedKey,
-                            Modifiers = savedMods
-                        });
-                    } catch {
-                        
-                    }
-                }*/
-            }
-
-            var uniqueShortcuts = allShortcuts
-                .GroupBy(sc => sc.ActionId)
-                .Select(group => group.First())
-                .ToList();
-
-            allShortcuts.Clear();
-            foreach (var sc in uniqueShortcuts) {
-                allShortcuts.Add(sc);
-            }
+            }*/
         }
         
         public void ListenForShortcut(ShortcutItemViewModel item) {
@@ -718,6 +582,7 @@ private void SaveShortcuts() {
             MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
         }
 
+        // Todo
         public void AssignShortcut(Key key, KeyModifiers modifiers) {
             /*if (ActiveShortcut == null) return;
             if (key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftShift || key == Key.RightShift || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LWin || key == Key.RWin) {
@@ -739,8 +604,8 @@ public void AssignShortcut(Key key, KeyModifiers modifiers) {
             ActiveShortcut.Modifiers = modifiers;
             ActiveShortcut.IsListening = false;
             ActiveShortcut.RefreshDisplay();
-            ActiveShortcut = null;
-            SaveShortcuts();*/
+            ActiveShortcut = null;*/
+            SaveShortcuts();
         }
 
         public void ResetAllShortcuts() {
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 3fb3da6cb..50cd073a7 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -5,12 +5,12 @@
         xmlns:vm="using:OpenUtau.App.ViewModels"
         xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
         xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
-        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="460"
+        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="490"
         x:Class="OpenUtau.App.Views.PreferencesDialog"
         Icon="/Assets/open-utau.ico"
         Title="{DynamicResource prefs.caption}"
         WindowStartupLocation="CenterScreen"
-        Width="700" Height="460">
+        Width="700" Height="490">
   <Window.Resources>
     <vm:CultureNameConverter x:Key="cultureNameConverter"/>
   </Window.Resources>
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index 7ab1282d4..3813164f1 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -18,6 +18,7 @@ public PreferencesDialog() {
             InitializeComponent();
         }
 
+        // Todo: move to another dialog
         protected override void OnKeyDown(KeyEventArgs e) {
             if (DataContext is PreferencesViewModel vm && vm.ActiveShortcut != null) {
                 // If they hit escape without modifiers, cancel listening
@@ -43,7 +44,7 @@ sender is Button btn &&
                 btn.DataContext is ShortcutItemViewModel item) {
                 
                 if (DataContext is PreferencesViewModel vm) {
-                    vm.ResetShortcut(item);
+                    //vm.ResetShortcut(item);
                     e.Handled = true;
                 }
             }

From ca434d4de5361eb49e3d0eb9de5aa5f1e7aad593 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Tue, 26 May 2026 02:40:25 +0900
Subject: [PATCH 17/22] Support multiple key, add, delete

---
 OpenUtau/Controls/PianoRoll.axaml.cs        |  23 ++--
 OpenUtau/ViewModels/KeyTranslator.cs        | 117 ++++++++++----------
 OpenUtau/ViewModels/PianoRollViewModel.cs   |   2 +
 OpenUtau/ViewModels/PreferencesViewModel.cs |  83 ++++++++++----
 OpenUtau/Views/PreferencesDialog.axaml      |  40 ++++---
 OpenUtau/Views/PreferencesDialog.axaml.cs   |  26 +++--
 OpenUtau/Views/ShortcutKeyDialog.axaml      |   9 --
 OpenUtau/Views/ShortcutKeyDialog.axaml.cs   |  12 --
 8 files changed, 177 insertions(+), 135 deletions(-)
 delete mode 100644 OpenUtau/Views/ShortcutKeyDialog.axaml
 delete mode 100644 OpenUtau/Views/ShortcutKeyDialog.axaml.cs

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 8b239ad06..9cb27475e 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.IO;
 using System.Linq;
 using System.Reactive;
-using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -1394,6 +1392,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
             string altPenIdx = Preferences.Default.PenPlusDefault ? "2" : "2+";
 
             string? action = KeyTranslator.GetActionIdFromKey(args.Key, args.KeyModifiers);
+            if (action == null) return false;
 
             switch (action) {
                 // Playback & Selection
@@ -1555,19 +1554,17 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 case "Hide Piano Roll": OnMenuHidePianoRoll(this, new RoutedEventArgs()); return true;
             }
             // External and batch note edits
-            if (!string.IsNullOrEmpty(action)) {
-                var allDynamicMenus = ViewModel.NoteBatchEdits
-                    .Concat(ViewModel.LyricBatchEdits)
-                    .Concat(ViewModel.ResetBatchEdits)
-                    .Concat(ViewModel.ExternalBatchEdits);
-
-                foreach (var menu in allDynamicMenus) {
-                    if (menu.CommandParameter is BatchEdit edit && edit.Name == action) {
-                        menu.Command?.Execute(edit);
-                        return true;
-                    }
+            var allDynamicMenus = ViewModel.NoteBatchEdits
+                .Concat(ViewModel.LyricBatchEdits)
+                .Concat(ViewModel.ResetBatchEdits)
+                .Concat(ViewModel.ExternalBatchEdits);
+            foreach (var menu in allDynamicMenus) {
+                if (menu.CommandParameter is BatchEdit edit && edit.Name == action) {
+                    menu.Command?.Execute(edit);
+                    return true;
                 }
             }
+
             return false;
         }
 
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 72be0ce9f..38d0fee18 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Input;
@@ -29,8 +29,8 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("PlayOrPause", ["Space"]),
                 new Preferences.ShortcutBinding("PlaySelection", ["Alt+Space"]),
                 new Preferences.ShortcutBinding("ClearSelection", ["Escape"]),
-                new Preferences.ShortcutBinding("SelectAll", ["Control+A"]),
-                new Preferences.ShortcutBinding("DeselectAll", ["Control+D"]),
+                new Preferences.ShortcutBinding("SelectAll", ["Ctrl+A"]),
+                new Preferences.ShortcutBinding("DeselectAll", ["Ctrl+D"]),
 
                 // UI & Windows
                 new Preferences.ShortcutBinding("HideDetachedWindow", ["Alt+F4"]),
@@ -38,17 +38,17 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("OpenPluginMenu", ["N"]),
 
                 // Lyrics
-                new Preferences.ShortcutBinding("EditLyrics", ["Enter"]),
+                new Preferences.ShortcutBinding("EditLyrics", ["Return"]),
 
                 // Tools
                 new Preferences.ShortcutBinding("ToolSelect1", ["D1"]),
                 new Preferences.ShortcutBinding("ToolSelect2Main", ["D2"]),
-                new Preferences.ShortcutBinding("ToolSelect2Alt", ["Control+D2"]),
+                new Preferences.ShortcutBinding("ToolSelect2Alt", ["Ctrl+D2"]),
                 new Preferences.ShortcutBinding("ToolSelect3", ["D3"]),
                 new Preferences.ShortcutBinding("ToolSelect4Main", ["D4"]),
-                new Preferences.ShortcutBinding("ToolSelect4Overwrite", ["Control+D4"]),
+                new Preferences.ShortcutBinding("ToolSelect4Overwrite", ["Ctrl+D4"]),
                 new Preferences.ShortcutBinding("ToolSelect4Line", ["Shift+D4"]),
-                new Preferences.ShortcutBinding("ToolSelect4LineOverwrite", ["Control+Shift+D4"]),
+                new Preferences.ShortcutBinding("ToolSelect4LineOverwrite", ["Ctrl+Shift+D4"]),
                 new Preferences.ShortcutBinding("ToolSelect5", ["D5"]),
 
                 // Expressions
@@ -78,42 +78,42 @@ static KeyTranslator() {
 
                 // Transposition
                 new Preferences.ShortcutBinding("TransposeUp", ["Up"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.octaveup", ["Control+Up"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.octaveup", ["Ctrl+Up"]),
                 new Preferences.ShortcutBinding("TransposeDown", ["Down"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.octavedown", ["Control+Down"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.octavedown", ["Ctrl+Down"]),
 
                 // Note Movement & Sizing
                 new Preferences.ShortcutBinding("MoveCursorLeft", ["Left"]),
                 new Preferences.ShortcutBinding("ResizeNotesLeft", ["Alt+Left"]),
-                new Preferences.ShortcutBinding("MoveNotesLeft", ["Control+Left"]),
+                new Preferences.ShortcutBinding("MoveNotesLeft", ["Ctrl+Left"]),
                 new Preferences.ShortcutBinding("ExtendSelectionLeft", ["Shift+Left"]),
                 new Preferences.ShortcutBinding("MoveCursorRight", ["Right"]),
                 new Preferences.ShortcutBinding("ResizeNotesRight", ["Alt+Right"]),
-                new Preferences.ShortcutBinding("MoveNotesRight", ["Control+Right"]),
+                new Preferences.ShortcutBinding("MoveNotesRight", ["Ctrl+Right"]),
                 new Preferences.ShortcutBinding("ExtendSelectionRight", ["Shift+Right"]),
 
                 // Edit Operations
-                new Preferences.ShortcutBinding("Undo", ["Control+Z"]),
-                new Preferences.ShortcutBinding("Redo", ["Control+Y", "Control+Shift+Z"]),
-                new Preferences.ShortcutBinding("Copy", ["Control+C"]),
-                new Preferences.ShortcutBinding("Cut", ["Control+X"]),
-                new Preferences.ShortcutBinding("Paste", ["Control+V"]),
-                new Preferences.ShortcutBinding("PastePlain", ["Control+Shift+V"]),
+                new Preferences.ShortcutBinding("Undo", ["Ctrl+Z"]),
+                new Preferences.ShortcutBinding("Redo", ["Ctrl+Y", "Ctrl+Shift+Z"]),
+                new Preferences.ShortcutBinding("Copy", ["Ctrl+C"]),
+                new Preferences.ShortcutBinding("Cut", ["Ctrl+X"]),
+                new Preferences.ShortcutBinding("Paste", ["Ctrl+V"]),
+                new Preferences.ShortcutBinding("PastePlain", ["Ctrl+Shift+V"]),
                 new Preferences.ShortcutBinding("PasteParameters", ["Alt+V"]),
                 new Preferences.ShortcutBinding("InsertNote", ["Insert"]),
                 new Preferences.ShortcutBinding("DeleteNotes", ["Delete"]),
-                new Preferences.ShortcutBinding("MergeNotes", ["Control+U"]),
+                new Preferences.ShortcutBinding("MergeNotes", ["Ctrl+U"]),
 
                 // Playhead & Timeline Navigation
                 new Preferences.ShortcutBinding("PlayheadHome", ["Home"]),
                 new Preferences.ShortcutBinding("SelectToStart", ["Shift+Home"]),
                 new Preferences.ShortcutBinding("PlayheadEnd", ["End"]),
                 new Preferences.ShortcutBinding("SelectToEnd", ["Shift+End"]),
-                new Preferences.ShortcutBinding("PlayheadLeft", ["OemOpenBrackets"]),
-                new Preferences.ShortcutBinding("PlayheadToSelectionStart", ["Control+OemOpenBrackets"]),
-                new Preferences.ShortcutBinding("PlayheadToViewStart", ["Shift+OemOpenBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadLeft", ["Oem4"]),
+                new Preferences.ShortcutBinding("PlayheadToSelectionStart", ["Ctrl+Oem4"]),
+                new Preferences.ShortcutBinding("PlayheadToViewStart", ["Shift+Oem4"]),
                 new Preferences.ShortcutBinding("PlayheadRight", ["OemCloseBrackets"]),
-                new Preferences.ShortcutBinding("PlayheadToSelectionEnd", ["Control+OemCloseBrackets"]),
+                new Preferences.ShortcutBinding("PlayheadToSelectionEnd", ["Ctrl+OemCloseBrackets"]),
                 new Preferences.ShortcutBinding("PlayheadToViewEnd", ["Shift+OemCloseBrackets"]),
 
                 // Scrolling & Zooming
@@ -125,74 +125,74 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("ZoomOut", ["Q"]),
 
                 // Track & Project Operations
-                new Preferences.ShortcutBinding("SaveProject", ["Control+S"]),
+                new Preferences.ShortcutBinding("SaveProject", ["Ctrl+S"]),
                 new Preferences.ShortcutBinding("SoloTrack", ["Shift+S"]),
                 new Preferences.ShortcutBinding("MuteTrack", ["Shift+M"]),
                 new Preferences.ShortcutBinding("FocusSelection", ["F"]),
-                new Preferences.ShortcutBinding("SearchNote", ["Control+F"]),
+                new Preferences.ShortcutBinding("SearchNote", ["Ctrl+F"]),
 
                 // Parts Navigation
                 new Preferences.ShortcutBinding("MoveToNextPartUp", ["PageUp"]),
                 new Preferences.ShortcutBinding("MoveToNextPartDown", ["PageDown"]),
 
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.loadrenderedpitch", ["Control+R"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.refreshrealcurves", ["Control+Shift+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.loadrenderedpitch", ["Ctrl+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.refreshrealcurves", ["Ctrl+Shift+R"]),
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.bakepitch", ["Alt+K"]),
 
                 // Tails and Overlap
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.addtaildash", ["Alt+OemMinus"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.addtailrest", ["Alt+Shift+R"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetaildash", ["Control+Alt+OemMinus"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetailrest", ["Control+Alt+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.addtailrest", ["Shift+Alt+R"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetaildash", ["Ctrl+Alt+OemMinus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.removetailrest", ["Ctrl+Alt+R"]),
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.fixoverlap", ["Alt+F"]),
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.autolegato", ["Alt+A"]),
 
                 // Common notes
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotecopy", ["Control+Shift+C"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotepaste", ["Control+Shift+P"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotecopy", ["Ctrl+Shift+C"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.commonnotepaste", ["Ctrl+Shift+P"]),
 
                 // Timings
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.randomizetiming", ["Alt+T"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.randomizeoffset", ["Control+Alt+T"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.randomizeoffset", ["Ctrl+Alt+T"]),
 
                 // Lang
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.romajitohiragana", ["Control+Shift+J"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.hiraganatoromaji", ["Control+Alt+J"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.javcvtocv", ["Control+Shift+K"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.hanzitopinyin", ["Control+Alt+H"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.romajitohiragana", ["Ctrl+Shift+J"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.hiraganatoromaji", ["Ctrl+Alt+J"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.javcvtocv", ["Ctrl+Shift+K"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.hanzitopinyin", ["Ctrl+Alt+H"]),
 
                 // Suffixes and Phonetic Hints
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removetonesuffix", ["Control+Alt+S"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removelettersuffix", ["Control+Shift+S"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.movesuffixtovoicecolor", ["Control+Alt+C"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removephonetichint", ["Control+Alt+P"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removetonesuffix", ["Ctrl+Alt+S"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removelettersuffix", ["Ctrl+Shift+S"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.movesuffixtovoicecolor", ["Ctrl+Alt+C"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.removephonetichint", ["Ctrl+Alt+P"]),
 
                 // Dash and Slur
                 new Preferences.ShortcutBinding("pianoroll.menu.lyrics.dashtoplus", ["Alt+OemPlus"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.dashtoplustilda", ["Control+Alt+OemPlus"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.lyrics.dashtoplustilda", ["Ctrl+Alt+OemPlus"]),
                 new Preferences.ShortcutBinding("pianoroll.menu.lyrics.insertslur", ["Alt+I"]),
 
                 // Reset
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.all", ["Control+Shift+Delete"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.allparameters", ["Control+Alt+I"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.exps", ["Control+Shift+E"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.clear.vibratos", ["Control+Alt+V"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.vibratos", ["Control+Shift+U"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.pitchbends", ["Control+Alt+B"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.phonemetimings", ["Control+Shift+T"]),
-                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.aliases", ["Control+Alt+A"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.all", ["Ctrl+Shift+Delete"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.allparameters", ["Ctrl+Alt+I"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.exps", ["Ctrl+Shift+E"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.clear.vibratos", ["Ctrl+Alt+V"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.vibratos", ["Ctrl+Shift+U"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.pitchbends", ["Ctrl+Alt+B"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.phonemetimings", ["Ctrl+Shift+T"]),
+                new Preferences.ShortcutBinding("pianoroll.menu.notes.reset.aliases", ["Ctrl+Alt+A"]),
 
                 // other toggles
-                new Preferences.ShortcutBinding("Lock Pitch Points", ["Control+Shift+L"]),
-                new Preferences.ShortcutBinding("Lock Vibrato", ["Control+Alt+U"]),
-                new Preferences.ShortcutBinding("Lock Expressions", ["Control+Alt+E"]),
-                new Preferences.ShortcutBinding("Show Portrait", ["Alt+Shift+P"]),
-                new Preferences.ShortcutBinding("Show Icon", ["Alt+Shift+I"]),
+                new Preferences.ShortcutBinding("Lock Pitch Points", ["Ctrl+Shift+L"]),
+                new Preferences.ShortcutBinding("Lock Vibrato", ["Ctrl+Alt+U"]),
+                new Preferences.ShortcutBinding("Lock Expressions", ["Ctrl+Alt+E"]),
+                new Preferences.ShortcutBinding("Show Portrait", ["Shift+Alt+P"]),
+                new Preferences.ShortcutBinding("Show Icon", ["Shift+Alt+I"]),
                 new Preferences.ShortcutBinding("Show Ghost Notes", ["Alt+G"]),
                 new Preferences.ShortcutBinding("Use Track Color", ["Alt+C"]),
-                new Preferences.ShortcutBinding("Detach Piano Roll", ["Alt+Shift+D"]),
-                new Preferences.ShortcutBinding("Hide Piano Roll", ["Alt+Shift+H"]),
-                new Preferences.ShortcutBinding("lyricsreplace.replace", ["Control+H"]),
+                new Preferences.ShortcutBinding("Detach Piano Roll", ["Shift+Alt+D"]),
+                new Preferences.ShortcutBinding("Hide Piano Roll", ["Shift+Alt+H"]),
+                new Preferences.ShortcutBinding("lyricsreplace.replace", ["Ctrl+H"]),
                 new Preferences.ShortcutBinding("Quantize Notes", ["Alt+Q"]),
                 new Preferences.ShortcutBinding("Randomize Tuning", ["Alt+R"]),
                 new Preferences.ShortcutBinding("Lengthen Crossfade", ["Alt+L"]),
@@ -235,7 +235,7 @@ public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
                     var gestures = item.Gestures.Select(g => GestureConverter(g).ToString()).ToArray();
                     if (defKey.Shortcuts.Length != gestures.Length) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
-                    } else if (defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
+                    } else if (!defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     }
                 } else {
@@ -253,6 +253,7 @@ public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
 
         public static void ResetShortcuts() {
             Preferences.Default.Shortcuts = [];
+            Preferences.Default.PluginShortcuts = [];
             Preferences.Save();
             LoadShortcuts();
         }
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index c6ce8dee0..a52640fdc 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -213,6 +213,8 @@ public PianoRollViewModel() {
             });
             LoadLegacyPlugins();
             DocManager.Inst.AddSubscriber(this);
+            MessageBus.Current.Listen<ShortcutsRefreshEvent>()
+                .Subscribe(_ => ReloadShortcuts());
         }
 
         private void SetUndoState() {
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 7c47274dc..93585ecc6 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -1,22 +1,21 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reactive;
 using System.Reactive.Linq;
 using System.Text.RegularExpressions;
+using Avalonia.Input;
 using OpenUtau.Audio;
 using OpenUtau.Classic;
 using OpenUtau.Core;
+using OpenUtau.Core.Render;
 using OpenUtau.Core.Util;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using OpenUtau.Core.Render;
 using Serilog;
-using Avalonia.Input;
-using System.Collections.ObjectModel;
-using System.Reactive;
-using OpenUtau.Core.Editing;
 
 namespace OpenUtau.App.ViewModels {
     public class LyricsHelperOption {
@@ -30,10 +29,14 @@ public override string ToString() {
     }
     public class ShortcutsRefreshEvent { }
     public class ShortcutItemViewModel : ViewModelBase {
-        public string ActionName { get; set; } = string.Empty;
-        public string ActionId { get; set; } = string.Empty;
+        public string ActionName { get; } = string.Empty;
+        public string ActionId { get; } = string.Empty;
+
         public List<KeyGesture> Gestures { get; set; } = new List<KeyGesture>();
-        [Reactive] public bool IsListening { get; set; }
+        public bool IsListening { get; set; } = false;
+        public bool IsAdding { get; set; } = false;
+
+        public ObservableCollection<MenuItemViewModel> ContextMenuItems { get; set; } = new ObservableCollection<MenuItemViewModel>();
 
         public string DisplayString {
             get {
@@ -42,9 +45,12 @@ public string DisplayString {
                 return Gestures.Count == 0 ? "None" : text;
             }
         }
-        
+
+        public Action? Save;
+        public Action<ShortcutItemViewModel>? ListenForShortcut;
+
         public ShortcutItemViewModel() {}
-        public ShortcutItemViewModel(Preferences.ShortcutBinding binding) {
+        public ShortcutItemViewModel(Preferences.ShortcutBinding binding, Action save, Action<ShortcutItemViewModel>? listenForShortcut) {
             string lookupKey = "shortcut." + binding.ActionId;
             string displayName = ThemeManager.GetString(lookupKey);
             if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
@@ -60,6 +66,42 @@ public ShortcutItemViewModel(Preferences.ShortcutBinding binding) {
             ActionId = binding.ActionId;
             ActionName = displayName;
             Gestures = binding.Shortcuts.Select(s => KeyTranslator.GestureConverter(KeyGesture.Parse(s))).ToList();
+            Save = save;
+            ListenForShortcut = listenForShortcut;
+        }
+
+        public void CreateMenuItem() {
+            ContextMenuItems.Clear();
+            ContextMenuItems.Add(new MenuItemViewModel() { Header = "Add", Command = ReactiveCommand.Create(() => {
+                IsAdding = true;
+                ListenForShortcut?.Invoke(this);
+            })});
+            foreach (var gesture in Gestures) {
+                var text = $"Delete \"{KeyTranslator.GetFriendlyName(gesture.Key, gesture.KeyModifiers)}\"";
+                ContextMenuItems.Add(new MenuItemViewModel() { Header = text, Command = ReactiveCommand.Create(() => Delete(gesture)) });
+            }
+            ContextMenuItems.Add(new MenuItemViewModel() { Header = "Reset", Command = ReactiveCommand.Create(() => Reset()) });
+        }
+
+        public void Delete(KeyGesture gesture) {
+            Gestures.Remove(gesture);
+            IsAdding = false;
+            IsListening = false;
+            RefreshDisplay();
+            Save?.Invoke();
+        }
+
+        public void Reset() {
+            var binding = KeyTranslator.DefShortcuts.FirstOrDefault(s => s.ActionId == ActionId);
+            if (binding == null) {
+                Gestures.Clear();
+            } else {
+                Gestures = binding.Shortcuts.Select(s => KeyTranslator.GestureConverter(KeyGesture.Parse(s))).ToList();
+            }
+            IsAdding = false;
+            IsListening = false;
+            RefreshDisplay();
+            Save?.Invoke();
         }
 
         public void RefreshDisplay() {
@@ -520,7 +562,7 @@ public void ToggleOnnxGpuDisplay(bool show) {
         }
 
         private void LoadShortcuts() {
-            var shortcuts = KeyTranslator.GetMergedShortcuts().Select(binding => new ShortcutItemViewModel(binding));
+            var shortcuts = KeyTranslator.GetMergedShortcuts().Select(binding => new ShortcutItemViewModel(binding, () => SaveShortcuts(), item => ListenForShortcut(item)));
             allShortcuts.AddRange(shortcuts);
             /* Todo
             // external batch edits
@@ -563,10 +605,11 @@ private void LoadShortcuts() {
                 }
             }*/
         }
-        
+
         public void ListenForShortcut(ShortcutItemViewModel item) {
             // Cancel any existing listening item
             if (ActiveShortcut != null) {
+                ActiveShortcut.IsAdding = false;
                 ActiveShortcut.IsListening = false;
                 ActiveShortcut.RefreshDisplay();
             }
@@ -578,20 +621,19 @@ public void ListenForShortcut(ShortcutItemViewModel item) {
 
         private void SaveShortcuts() {
             KeyTranslator.SaveShortcuts(allShortcuts);
-            LoadShortcuts();
             MessageBus.Current.SendMessage(new ShortcutsRefreshEvent());
         }
 
-        // Todo
         public void AssignShortcut(Key key, KeyModifiers modifiers) {
-            /*if (ActiveShortcut == null) return;
+            if (ActiveShortcut == null) return;
             if (key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftShift || key == Key.RightShift || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LWin || key == Key.RWin) {
                 return;
             }
 
-            var duplicate = allShortcuts.FirstOrDefault(s => s != ActiveShortcut && s.Key == key && s.Modifiers == modifiers);
+            var duplicate = allShortcuts.FirstOrDefault(s => s != ActiveShortcut && s.Gestures.Any(g => g.Key == key && g.KeyModifiers == modifiers));
             
             if (duplicate != null) {
+                ActiveShortcut.IsAdding = false;
                 ActiveShortcut.IsListening = false;
                 ActiveShortcut.RefreshDisplay();
                 ActiveShortcut = null;
@@ -600,11 +642,14 @@ public void AssignShortcut(Key key, KeyModifiers modifiers) {
                 DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(message));
                 return; 
             }
-            ActiveShortcut.Key = key;
-            ActiveShortcut.Modifiers = modifiers;
+            if (!ActiveShortcut.IsAdding) {
+                ActiveShortcut.Gestures.Clear();
+            }
+            ActiveShortcut.Gestures.Add(new KeyGesture(key, modifiers));
+            ActiveShortcut.IsAdding = false;
             ActiveShortcut.IsListening = false;
             ActiveShortcut.RefreshDisplay();
-            ActiveShortcut = null;*/
+            ActiveShortcut = null;
             SaveShortcuts();
         }
 
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 50cd073a7..eb7bd0e5c 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -5,12 +5,12 @@
         xmlns:vm="using:OpenUtau.App.ViewModels"
         xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
         xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
-        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="490"
+        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="480"
         x:Class="OpenUtau.App.Views.PreferencesDialog"
         Icon="/Assets/open-utau.ico"
         Title="{DynamicResource prefs.caption}"
         WindowStartupLocation="CenterScreen"
-        Width="700" Height="490">
+        Width="700" Height="480">
   <Window.Resources>
     <vm:CultureNameConverter x:Key="cultureNameConverter"/>
   </Window.Resources>
@@ -62,7 +62,7 @@
       <ListBoxItem Content="{DynamicResource prefs.advanced}"/>
       <ListBoxItem Content="{DynamicResource prefs.shortcuts}"/>
     </ListBox>
-    <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
+    <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
       <Carousel Name="PageCarousel" Margin="10" HorizontalAlignment="Stretch" 
           SelectedIndex="{Binding ElementName=DrawerList, Path=SelectedIndex}">
         <!-- General -->
@@ -360,7 +360,7 @@
         </StackPanel>
 
         <!-- Shortcuts -->
-        <Grid RowDefinitions="Auto, Auto, Auto, *">
+        <Grid RowDefinitions="Auto, Auto, Auto, *" Height="460">
           <TextBlock Grid.Row="0" 
                 Text="{DynamicResource prefs.shortcuts}" 
                 Margin="0,10,0,10" 
@@ -374,28 +374,40 @@
                 Content="{DynamicResource pianoroll.menu.reset}" 
                 Command="{Binding ResetAllShortcuts}" />
           </Grid>
-          <TextBlock Grid.Row="2" 
-                Text="{DynamicResource prefs.note.restart}" 
-                Margin="5,0,5,10" 
-                FontStyle="Italic" 
-                Opacity="0.75" 
-                TextWrapping="Wrap"/>
-          <ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
+          <TextBlock Grid.Row="2" Classes="restart"/>
+          <ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible" Padding="0,0,10,0">
             <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                  <Grid ColumnDefinitions="*, Auto" Margin="5">
+                  <Grid ColumnDefinitions="*, Auto, 5, Auto" Margin="5">
                     <TextBlock Grid.Column="0" 
                           Text="{Binding ActionName}" 
                           VerticalAlignment="Center" 
                           TextWrapping="Wrap"/>
                     <Button Grid.Column="1" 
-                          Content="{Binding DisplayString}" 
+                          Content="{Binding DisplayString}"
                           x:CompileBindings="False"
                           Command="{Binding $parent[Window].DataContext.ListenForShortcutCommand}" 
                           CommandParameter="{Binding}"
                           PointerReleased="OnShortcutRightClick"
-                          ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"/>
+                          ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"
+                          Focusable="False"/>
+                    <Button Grid.Column="3" MinWidth="10"
+                          Content="..."
+                          Click="OnShortcutMiscClick"
+                          Focusable="False">
+                          <Button.ContextMenu>
+                            <ContextMenu ItemsSource="{Binding ContextMenuItems}">
+                              <ContextMenu.Styles>
+                                <Style Selector="MenuItem">
+                                  <Setter Property="Header" Value="{Binding Header}"/>
+                                  <Setter Property="Command" Value="{Binding Command}"/>
+                                  <Setter Property="Height" Value="{Binding Height}"/>
+                                </Style>
+                              </ContextMenu.Styles>
+                            </ContextMenu>
+                          </Button.ContextMenu>
+                    </Button>
                   </Grid>
                 </DataTemplate>
               </ItemsControl.ItemTemplate>
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index 3813164f1..5c78beaf4 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace OpenUtau.App.Views {
     public partial class PreferencesDialog : Window {
-        private PreferencesViewModel? viewModel => this.DataContext as PreferencesViewModel;   
+        private PreferencesViewModel? viewModel => this.DataContext as PreferencesViewModel;
 
         public PreferencesDialog() {
             InitializeComponent();
@@ -23,6 +23,7 @@ protected override void OnKeyDown(KeyEventArgs e) {
             if (DataContext is PreferencesViewModel vm && vm.ActiveShortcut != null) {
                 // If they hit escape without modifiers, cancel listening
                 if (e.Key == Key.Escape && e.KeyModifiers == KeyModifiers.None) {
+                    vm.ActiveShortcut.IsAdding = false;
                     vm.ActiveShortcut.IsListening = false;
                     vm.ActiveShortcut.RefreshDisplay();
                     vm.ActiveShortcut = null;
@@ -34,19 +35,24 @@ protected override void OnKeyDown(KeyEventArgs e) {
                 e.Handled = true;
                 return;
             }
-
             base.OnKeyDown(e);
         }
 
         public void OnShortcutRightClick(object sender, PointerReleasedEventArgs e) {
-            if (e.InitialPressMouseButton == MouseButton.Right && 
-                sender is Button btn && 
+            if (e.InitialPressMouseButton == MouseButton.Right &&
+                sender is Button btn &&
                 btn.DataContext is ShortcutItemViewModel item) {
-                
-                if (DataContext is PreferencesViewModel vm) {
-                    //vm.ResetShortcut(item);
-                    e.Handled = true;
-                }
+                item.Reset();
+                e.Handled = true;
+            }
+        }
+        
+        void OnShortcutMiscClick(object? sender, RoutedEventArgs e) {
+            if (sender is Button btn &&
+                btn.DataContext is ShortcutItemViewModel item) {
+                item.CreateMenuItem();
+                btn.ContextMenu?.Open();
+                e.Handled = true;
             }
         }
 
@@ -164,7 +170,7 @@ void OnCustomThemeCreate(object sender, RoutedEventArgs e) {
             dialog.SetPrompt(ThemeManager.GetString("prefs.appearance.customtheme.create.prompt"));
             dialog.onFinish = s => {
                 if (string.IsNullOrEmpty(s)) {
-                    MessageBox.ShowModal(this, 
+                    MessageBox.ShowModal(this,
                         ThemeManager.GetString("prefs.appearance.customtheme.create.empty"),
                         ThemeManager.GetString("prefs.appearance.customtheme.create.title"));
                     return;
diff --git a/OpenUtau/Views/ShortcutKeyDialog.axaml b/OpenUtau/Views/ShortcutKeyDialog.axaml
deleted file mode 100644
index 97340d8dc..000000000
--- a/OpenUtau/Views/ShortcutKeyDialog.axaml
+++ /dev/null
@@ -1,9 +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" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="OpenUtau.Views.ShortcutKeyDialog"
-        Title="ShortcutKeyDialog">
-    Welcome to Avalonia!
-</Window>
diff --git a/OpenUtau/Views/ShortcutKeyDialog.axaml.cs b/OpenUtau/Views/ShortcutKeyDialog.axaml.cs
deleted file mode 100644
index 7d3c50a9b..000000000
--- a/OpenUtau/Views/ShortcutKeyDialog.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace OpenUtau.Views;
-
-public partial class ShortcutKeyDialog : Window {
-    public ShortcutKeyDialog() {
-        InitializeComponent();
-    }
-}
-

From b3fefb811d39bd2d63563ca671fc7ed6b292e5e1 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 31 May 2026 17:50:27 +0900
Subject: [PATCH 18/22] support external batch edit

---
 OpenUtau/Controls/PianoRoll.axaml.cs        | 19 +----
 OpenUtau/Strings/Strings.axaml              |  3 +-
 OpenUtau/ViewModels/KeyTranslator.cs        | 43 ++++++++---
 OpenUtau/ViewModels/PreferencesViewModel.cs | 86 ++++++++-------------
 OpenUtau/Views/PreferencesDialog.axaml      |  3 +-
 OpenUtau/Views/PreferencesDialog.axaml.cs   |  1 -
 6 files changed, 75 insertions(+), 80 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index 9cb27475e..aeec53f0e 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -28,7 +28,6 @@ interface IValueTip {
     }
 
     public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
-
         public MainWindow? MainWindow { get; set; }
         public PianoRollViewModel ViewModel;
 
@@ -43,7 +42,7 @@ public partial class PianoRoll : UserControl, IValueTip, ICmdSubscriber {
         private ReactiveCommand<Unit, Unit>? noteDefaultsCommand;
         private ReactiveCommand<BatchEdit, Unit>? noteBatchEditCommand;
 
-        private Window RootWindow => (Window) TopLevel.GetTopLevel(this)!;
+        private Window RootWindow => (Window)TopLevel.GetTopLevel(this)!;
 
         public PianoRoll(PianoRollViewModel model) {
             InitializeComponent();
@@ -116,7 +115,6 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
-
             ViewModel.LyricBatchEdits.AddRange(new List<BatchEdit>() {
                 new RomajiToHiragana(),
                 new HiraganaToRomaji(),
@@ -135,7 +133,6 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
-
             ViewModel.ResetBatchEdits.AddRange(new List<BatchEdit>() {
                 new ResetAll(),
                 new ResetPitchBends(),
@@ -150,7 +147,6 @@ await MessageBox.ShowProcessing(RootWindow, $"{name} - ? / ?",
                 Command = noteBatchEditCommand,
                 CommandParameter = edit,
             }));
-            
             try {
                 ViewModel.ExternalBatchEdits.AddRange(
                     DocManager.Inst.ExternalBatchEditTypes
@@ -1356,9 +1352,8 @@ void OnKeyDown(object? sender, KeyEventArgs args) {
         // To add a new keyboard shortcut to the Piano Roll:
         // 
         // 1. Add a new `case "YourActionName":` inside the switch statement below.
-        // 2. Open `Preferences.cs` and add a default key binding to the `Shortcuts` list
-        //    (e.g., new ShortcutBinding { ActionId = "YourActionName", KeyName = "...", ModifiersName = "..." })
-        // 3. Open `Strings.axaml` (and other language files) and add the display name:
+        // 2. Open `KeyTranslator.cs` and add a default key binding to the `Shortcuts` list
+        // 3. Open `Strings.axaml` and add the display name:
         //    <system:String x:Key="shortcut.YourActionName">Shortcut Name</system:String>
 
         bool OnKeyExtendedHandler(KeyEventArgs args) {
@@ -1372,13 +1367,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
             int snapUnit = project.resolution * 4 / notesVm.SnapDiv;
             int deltaTicks = notesVm.IsSnapOn ? snapUnit : 15;
 
-            bool isNone = args.KeyModifiers == KeyModifiers.None;
-            bool isAlt = args.KeyModifiers == KeyModifiers.Alt;
-            bool isCtrl = args.KeyModifiers == cmdKey;
-            bool isShift = args.KeyModifiers == KeyModifiers.Shift;
-            bool isBoth = args.KeyModifiers == (cmdKey | KeyModifiers.Shift);
-
-            if (PluginMenu.IsSubMenuOpen && isNone) {
+            if (PluginMenu.IsSubMenuOpen && args.KeyModifiers == KeyModifiers.None) {
                 if (ViewModel.LegacyPluginShortcuts.ContainsKey(args.Key)) {
                     var plugin = ViewModel.LegacyPluginShortcuts[args.Key];
                     if (plugin != null && plugin.Command != null) {
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 4e2c2acdf..902ae867e 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -486,8 +486,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="pianoroll.menu.notes.reset.pitchbends">Reset pitch bends</system:String>
   <system:String x:Key="pianoroll.menu.notes.reset.vibratos">Reset vibratos</system:String>
   <system:String x:Key="pianoroll.menu.part">Part</system:String>
-  <system:String x:Key="pianoroll.menu.part.legacypluginexp">Legacy Plugin (Experimental)</system:String>
-  <system:String x:Key="pianoroll.menu.part.legacypluginexp.shortcuts">(legacy)</system:String>
+  <system:String x:Key="pianoroll.menu.part.legacypluginexp">Legacy Plugin</system:String>
   <system:String x:Key="pianoroll.menu.part.singer">Singer and Oto settings</system:String>
   <system:String x:Key="pianoroll.menu.plugin.openfolder">Open folder</system:String>
   <system:String x:Key="pianoroll.menu.plugin.reload">Reload</system:String>
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 38d0fee18..3f8bde5f5 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -1,7 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Input;
+using OpenUtau.Core;
+using OpenUtau.Core.Editing;
 using OpenUtau.Core.Util;
 
 namespace OpenUtau.App.ViewModels {
@@ -11,8 +14,7 @@ public class ShortcutKey {
 
         public ShortcutKey(string actionId, string shortcut) {
             ActionId = actionId;
-            KeyGesture key = KeyGesture.Parse(shortcut);
-            Gesture = KeyTranslator.GestureConverter(key);
+            Gesture = KeyTranslator.StringToGesture(shortcut);
         }
 
         public override string ToString() => $"{ActionId}: {KeyTranslator.GetFriendlyName(Gesture.Key, Gesture.KeyModifiers)}";
@@ -209,7 +211,15 @@ public static void LoadShortcuts() {
                 .Select(key => new ShortcutKey(s.ActionId, key)))
                 .Where(key => key.Gesture.Key != Key.None)
                 .ToList();
-            //merged.AddRange(Preferences.Default.PluginShortcuts); Todo
+
+            // external batch edits
+            var edits = DocManager.Inst.ExternalBatchEditTypes
+                .Select(type => Activator.CreateInstance(type) as BatchEdit)
+                .OfType<BatchEdit>();
+            Shortcuts.AddRange(Preferences.Default.PluginShortcuts.SelectMany(s => s.Shortcuts
+                .Where(key => edits.Any(edit => edit.Name == s.ActionId))
+                .Select(key => new ShortcutKey(s.ActionId, key)))
+                .Where(key => key.Gesture.Key != Key.None));
         }
 
         public static List<Preferences.ShortcutBinding> GetMergedShortcuts() {
@@ -228,20 +238,24 @@ public static void LoadShortcuts() {
         public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
             var diff = new List<Preferences.ShortcutBinding>();
             var plugin = new  List<Preferences.ShortcutBinding>();
+            var edits = DocManager.Inst.ExternalBatchEditTypes
+                .Select(type => Activator.CreateInstance(type) as BatchEdit)
+                .OfType<BatchEdit>();
+
             foreach (var item in items) {
                 var defKey = DefShortcuts.FirstOrDefault(s => s.ActionId == item.ActionId);
                 if (defKey != null) {
                     item.Gestures.RemoveAll(g => g.Key == Key.None);
-                    var gestures = item.Gestures.Select(g => GestureConverter(g).ToString()).ToArray();
+                    var gestures = item.Gestures.Select(GestureToString).ToArray();
                     if (defKey.Shortcuts.Length != gestures.Length) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     } else if (!defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     }
-                } else {
+                } else if (edits.Any(edit => edit.Name == item.ActionId)) {
                     item.Gestures.RemoveAll(g => g.Key == Key.None);
                     if (item.Gestures.Count == 0) continue;
-                    var gestures = item.Gestures.Select(g => GestureConverter(g).ToString()).ToArray();
+                    var gestures = item.Gestures.Select(GestureToString).ToArray();
                     plugin.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                 }
             }
@@ -258,14 +272,25 @@ public static void ResetShortcuts() {
             LoadShortcuts();
         }
 
-        public static KeyGesture GestureConverter(KeyGesture gesture) {
+        public static KeyGesture StringToGesture(string shortcut) {
+            try {
+                var gesture = KeyGesture.Parse(shortcut);
+                return GestureConverter(gesture);
+            } catch {
+                return new KeyGesture(Key.None);
+            }
+        }
+        public static string GestureToString(KeyGesture gesture) {
+            return GestureConverter(gesture).ToString();
+        }
+        private static KeyGesture GestureConverter(KeyGesture gesture) {
             if (IsMac) {
                 var m = gesture.KeyModifiers;
                 bool hasCtrl = m.HasFlag(KeyModifiers.Control);
                 bool hasMeta = m.HasFlag(KeyModifiers.Meta);
                 if (hasCtrl) {
                     m &= ~KeyModifiers.Control;
-                    m |= KeyModifiers.Meta; 
+                    m |= KeyModifiers.Meta;
                 }
                 if (hasMeta) {
                     m &= ~KeyModifiers.Meta;
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 93585ecc6..67d972b16 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -11,6 +11,7 @@
 using OpenUtau.Audio;
 using OpenUtau.Classic;
 using OpenUtau.Core;
+using OpenUtau.Core.Editing;
 using OpenUtau.Core.Render;
 using OpenUtau.Core.Util;
 using ReactiveUI;
@@ -40,9 +41,9 @@ public class ShortcutItemViewModel : ViewModelBase {
 
         public string DisplayString {
             get {
-                if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening") ?? "Press keys...";
+                if (IsListening) return ThemeManager.GetString("prefs.shortcuts.listening");
                 var text = string.Join(", ", Gestures.Select(g => KeyTranslator.GetFriendlyName(g.Key, g.KeyModifiers)));
-                return Gestures.Count == 0 ? "None" : text;
+                return Gestures.Count == 0 ? "(None)" : text;
             }
         }
 
@@ -50,24 +51,32 @@ public string DisplayString {
         public Action<ShortcutItemViewModel>? ListenForShortcut;
 
         public ShortcutItemViewModel() {}
-        public ShortcutItemViewModel(Preferences.ShortcutBinding binding, Action save, Action<ShortcutItemViewModel>? listenForShortcut) {
-            string lookupKey = "shortcut." + binding.ActionId;
+        public ShortcutItemViewModel(Preferences.ShortcutBinding binding, Action save, Action<ShortcutItemViewModel>? listenForShortcut, string prefix = "") {
+            ActionId = binding.ActionId;
+            ActionName = $"{prefix}{GetDisplayName(binding.ActionId)}";
+            Gestures = binding.Shortcuts.Select(KeyTranslator.StringToGesture).ToList();
+            Save = save;
+            ListenForShortcut = listenForShortcut;
+        }
+        public ShortcutItemViewModel(string actionId, Action save, Action<ShortcutItemViewModel>? listenForShortcut, string prefix = "") {
+            ActionId = actionId;
+            ActionName = $"{prefix}{GetDisplayName(ActionId)}";
+            Save = save;
+            ListenForShortcut = listenForShortcut;
+        }
+        private string GetDisplayName(string actionId) {
+            string lookupKey = "shortcut." + actionId;
             string displayName = ThemeManager.GetString(lookupKey);
             if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                displayName = ThemeManager.GetString(binding.ActionId);
+                displayName = ThemeManager.GetString(actionId);
             }
             if (string.IsNullOrEmpty(displayName)) {
-                displayName = binding.ActionId;
+                displayName = actionId;
             }
             if (displayName.StartsWith("shortcut.")) {
                 displayName = displayName.Substring(9);
             }
-
-            ActionId = binding.ActionId;
-            ActionName = displayName;
-            Gestures = binding.Shortcuts.Select(s => KeyTranslator.GestureConverter(KeyGesture.Parse(s))).ToList();
-            Save = save;
-            ListenForShortcut = listenForShortcut;
+            return displayName;
         }
 
         public void CreateMenuItem() {
@@ -96,7 +105,7 @@ public void Reset() {
             if (binding == null) {
                 Gestures.Clear();
             } else {
-                Gestures = binding.Shortcuts.Select(s => KeyTranslator.GestureConverter(KeyGesture.Parse(s))).ToList();
+                Gestures = binding.Shortcuts.Select(KeyTranslator.StringToGesture).ToList();
             }
             IsAdding = false;
             IsListening = false;
@@ -564,46 +573,19 @@ public void ToggleOnnxGpuDisplay(bool show) {
         private void LoadShortcuts() {
             var shortcuts = KeyTranslator.GetMergedShortcuts().Select(binding => new ShortcutItemViewModel(binding, () => SaveShortcuts(), item => ListenForShortcut(item)));
             allShortcuts.AddRange(shortcuts);
-            /* Todo
+
             // external batch edits
+            var prefix = $"{ThemeManager.GetString("pianoroll.menu.external")}: ";
             foreach (var type in DocManager.Inst.ExternalBatchEditTypes) {
-                try {
-                    if (Activator.CreateInstance(type) is BatchEdit edit) {
-                        
-                        var savedSc = Preferences.Default.Shortcuts?.FirstOrDefault(s => s.ActionId == edit.Name);
-                        Key savedKey = Key.None;
-                        KeyModifiers savedMods = KeyModifiers.None;
-                        
-                        if (savedSc != null) {
-                            Enum.TryParse(savedSc.KeyName, out savedKey);
-                            Enum.TryParse(savedSc.ModifiersName, out savedMods);
-                        }
-
-                        string pluginName = edit.Name;
-                        if (allShortcuts.Any(s => s.ActionId == pluginName)) {
-                            continue; 
-                        }
-                        
-                        string lookupKey = "shortcut." + pluginName;
-                        string displayName = ThemeManager.GetString(lookupKey);
-                        
-                        if (string.IsNullOrEmpty(displayName) || displayName == lookupKey) {
-                            displayName = pluginName;
-                        }
-                        if (displayName.StartsWith("shortcut.")) {
-                            displayName = displayName.Substring(9);
-                        }
-
-                        allShortcuts.Add(new ShortcutItemViewModel {
-                            ActionId = pluginName, 
-                            ActionName = displayName,
-                            Key = savedKey,
-                            Modifiers = savedMods
-                        });
+                if (Activator.CreateInstance(type) is BatchEdit edit) {
+                    var customized = Preferences.Default.PluginShortcuts.FirstOrDefault(pref => pref.ActionId == edit.Name);
+                    if (customized != null) {
+                        allShortcuts.Add(new ShortcutItemViewModel(customized, () => SaveShortcuts(), item => ListenForShortcut(item), prefix));
+                    } else if (!allShortcuts.Any(s => s.ActionId == edit.Name)) {
+                        allShortcuts.Add(new ShortcutItemViewModel(edit.Name, () => SaveShortcuts(), item => ListenForShortcut(item), prefix));
                     }
-                } catch { 
                 }
-            }*/
+            }
         }
 
         public void ListenForShortcut(ShortcutItemViewModel item) {
@@ -637,9 +619,9 @@ public void AssignShortcut(Key key, KeyModifiers modifiers) {
                 ActiveShortcut.IsListening = false;
                 ActiveShortcut.RefreshDisplay();
                 ActiveShortcut = null;
-                string formatString = ThemeManager.GetString("prefs.shortcuts.duplicate") ?? "The shortcut '{0}' is already assigned to '{1}'.";
-                string message = string.Format(formatString, duplicate.DisplayString, duplicate.ActionName);
-                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(message));
+
+                var e = new MessageCustomizableException("The shortcut is already assigned.", "<translate:prefs.shortcuts.duplicate>", new ArgumentException(), false, [duplicate.DisplayString, duplicate.ActionName]);
+                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(e));
                 return; 
             }
             if (!ActiveShortcut.IsAdding) {
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index eb7bd0e5c..394babcae 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -391,7 +391,8 @@
                           CommandParameter="{Binding}"
                           PointerReleased="OnShortcutRightClick"
                           ToolTip.Tip="{DynamicResource prefs.shortcut.tooltip}"
-                          Focusable="False"/>
+                          Focusable="False"
+                          MinWidth="55"/>
                     <Button Grid.Column="3" MinWidth="10"
                           Content="..."
                           Click="OnShortcutMiscClick"
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index 5c78beaf4..491eb5e36 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -18,7 +18,6 @@ public PreferencesDialog() {
             InitializeComponent();
         }
 
-        // Todo: move to another dialog
         protected override void OnKeyDown(KeyEventArgs e) {
             if (DataContext is PreferencesViewModel vm && vm.ActiveShortcut != null) {
                 // If they hit escape without modifiers, cancel listening

From 674ffb4c5a33023b6958153e6240c630e41b8575 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 31 May 2026 18:11:56 +0900
Subject: [PATCH 19/22] fix mac key name

---
 OpenUtau/ViewModels/KeyTranslator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index 3f8bde5f5..a54912f8d 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -344,9 +344,9 @@ public static string GetFriendlyName(Key key, KeyModifiers modifiers) {
         public static string GetFriendlyName(string keyName) {
             return keyName switch {
                 // Modifiers
-                "Windows" or "LWin" or "RWin" => IsMac ? "⌃" : "Win",
+                "Windows" or "LWin" or "RWin" => IsMac ? "⌘" : "Win",
                 "LeftAlt" or "RightAlt" or "Alt" => IsMac ? "⌥" : "Alt",
-                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌘" : "Ctrl",
+                "Control" or "LeftCtrl" or "RightCtrl" or "LControl" or "RControl" => IsMac ? "⌃" : "Ctrl",
                 "Shift" or "LeftShift" or "RightShift" => IsMac ? "⇧" : "Shift",
                 
                 // Navigation & Editing

From 6b6d6a5f54d0921dfc25038b25ebf1f816a35222 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 31 May 2026 19:41:59 +0900
Subject: [PATCH 20/22] Apply key binding to Main Window

---
 OpenUtau/Controls/PianoRoll.axaml          |  18 +--
 OpenUtau/Controls/PianoRoll.axaml.cs       |  18 +--
 OpenUtau/Strings/Strings.axaml             |  16 +--
 OpenUtau/ViewModels/KeyTranslator.cs       |  23 ++--
 OpenUtau/ViewModels/MainWindowViewModel.cs |  14 +++
 OpenUtau/ViewModels/PianoRollViewModel.cs  |   1 -
 OpenUtau/Views/MainWindow.axaml            |  14 +--
 OpenUtau/Views/MainWindow.axaml.cs         | 130 +++++++++------------
 8 files changed, 112 insertions(+), 122 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml b/OpenUtau/Controls/PianoRoll.axaml
index 98a90a3bd..e3a6a802c 100644
--- a/OpenUtau/Controls/PianoRoll.axaml
+++ b/OpenUtau/Controls/PianoRoll.axaml
@@ -215,14 +215,14 @@
             </Menu.Styles>
 
             <MenuItem Header="{DynamicResource menu.edit}">
-              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[Undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
-              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[Redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
+              <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[menu.edit.undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
+              <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[menu.edit.redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
               <MenuItem Header="-" Height="1"/>
-              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding Hotkeys[Cut]}" Command="{Binding Cut}"/>
-              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding Hotkeys[Copy]}" Command="{Binding Copy}"/>
-              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding Hotkeys[Paste]}" Command="{Binding Paste}"/>
+              <MenuItem Header="{DynamicResource menu.edit.copy}" InputGesture="{Binding Hotkeys[menu.edit.copy]}" Command="{Binding Copy}"/>
+              <MenuItem Header="{DynamicResource menu.edit.cut}" InputGesture="{Binding Hotkeys[menu.edit.cut]}" Command="{Binding Cut}"/>
+              <MenuItem Header="{DynamicResource menu.edit.paste}" InputGesture="{Binding Hotkeys[menu.edit.paste]}" Command="{Binding Paste}"/>
               <MenuItem Header="{DynamicResource menu.edit.pasteplainnotes}" InputGesture="{Binding Hotkeys[PastePlain]}" Command="{Binding PastePlain}"/>
-              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding Hotkeys[DeleteNotes]}" Command="{Binding Delete}"/>
+              <MenuItem Header="{DynamicResource menu.edit.delete}" InputGesture="{Binding Hotkeys[menu.edit.delete]}" Command="{Binding Delete}"/>
               <MenuItem Header="-" Height="1"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.searchnote}" InputGesture="{Binding Hotkeys[SearchNote]}" Click="OnMenuSearchNote"/>
               <MenuItem Header="{DynamicResource menu.edit.selectall}" InputGesture="{Binding Hotkeys[SelectAll]}" Command="{Binding SelectAll}"/>
@@ -268,7 +268,7 @@
                   <CheckBox IsChecked="{Binding UseTrackColor}" />
                 </MenuItem.Icon>
               </MenuItem>
-              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[FullScreen]}" Click="OnMenuFullScreen"/>
+              <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[menu.tools.fullscreen]}" Click="OnMenuFullScreen"/>
               <MenuItem Header="{DynamicResource prefs.appearance.degree}">
                 <MenuItem Header="{DynamicResource prefs.appearance.degree.off}" Click="OnMenuDegreeStyle" Tag="0">
                   <MenuItem.Icon>
@@ -326,7 +326,7 @@
                     <CheckBox IsChecked="{Binding PianoRollDetached}" />
                   </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="{DynamicResource pianoroll.menu.view.pianoroll.hide}" Click="OnMenuHidePianoRoll"/>
+                <MenuItem Header="{DynamicResource pianoroll.menu.view.pianoroll.hide}" InputGesture="{Binding Hotkeys[CloseWindow]}" Click="OnMenuHidePianoRoll"/>
               </MenuItem>
             </MenuItem>
 
@@ -340,7 +340,7 @@
               <MenuItem Header="{DynamicResource pianoroll.menu.lyrics}" ItemsSource="{Binding LyricBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.reset}" ItemsSource="{Binding ResetBatchEdits}" Classes="MenuItemWithSubMenu"/>
               <MenuItem Header="{DynamicResource pianoroll.menu.external}" ItemsSource="{Binding ExternalBatchEdits}" Classes="MenuItemWithSubMenu"/>
-              <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" Classes="MenuItemWithSubMenu"/>
+              <MenuItem Header="{DynamicResource pianoroll.menu.part.legacypluginexp}" ItemsSource="{Binding LegacyPlugins}" Name="PluginMenu" InputGesture="{Binding Hotkeys[OpenPluginMenu]}" Classes="MenuItemWithSubMenu"/>
             </MenuItem>
             <MenuItem Header="{DynamicResource pianoroll.menu.lyrics.edit}" InputGesture="{Binding Hotkeys[EditLyrics]}" Click="OnMenuEditLyrics"/>
             <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index aeec53f0e..ebe20c33d 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -1403,8 +1403,8 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 case "DeselectAll": notesVm.DeselectNotes(); return true;
 
                 // UI & Windows
-                case "HideDetachedWindow": if (RootWindow is PianoRollDetachedWindow) RootWindow.Hide(); return true;
-                case "FullScreen": OnMenuFullScreen(this, new RoutedEventArgs()); return true;
+                case "CloseWindow": if (RootWindow is PianoRollDetachedWindow) RootWindow.Hide(); return true;
+                case "menu.tools.fullscreen": OnMenuFullScreen(this, new RoutedEventArgs()); return true;
                 case "OpenPluginMenu": if (PluginMenu.Parent is MenuItem batch) { batch.Open(); PluginMenu.Open(); } return true;
 
                 // Lyrics
@@ -1474,15 +1474,15 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 case "ExtendSelectionRight": notesVm.ExtendSelection(1); return true;
 
                 // Edit Operations
-                case "Undo": ViewModel.Undo(); return true;
-                case "Redo": ViewModel.Redo(); return true;
-                case "Copy": ViewModel.Copy(); return true;
-                case "Cut": ViewModel.Cut(); return true;
-                case "Paste": ViewModel.Paste(); return true;
+                case "menu.edit.undo": ViewModel.Undo(); return true;
+                case "menu.edit.redo": ViewModel.Redo(); return true;
+                case "menu.edit.copy": ViewModel.Copy(); return true;
+                case "menu.edit.cut": ViewModel.Cut(); return true;
+                case "menu.edit.paste": ViewModel.Paste(); return true;
                 case "PastePlain": notesVm.PastePlainNotes(); return true;
                 case "PasteParameters": notesVm.PasteSelectedParams(RootWindow); return true;
                 case "InsertNote": notesVm.InsertNote(); return true;
-                case "DeleteNotes": notesVm.DeleteSelectedNotes(); return true;
+                case "menu.edit.delete": notesVm.DeleteSelectedNotes(); return true;
                 case "MergeNotes": notesVm.MergeSelectedNotes(); return true;
 
                 // Playhead & Timeline Navigation
@@ -1522,6 +1522,8 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     if (notesVm.Selection.FirstOrDefault() is UNote focusNote) DocManager.Inst.ExecuteCmd(new FocusNoteNotification(notesVm.Part, focusNote)); 
                     return true;
                 case "SearchNote": SearchNote(); return true;
+                case "MoveToNextPart": MoveToNextPart(true); return true;
+                case "MoveToPrevPart": MoveToNextPart(false); return true;
 
                 // others
                 case "Quantize Notes": QuantizeNotes(); return true;
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 902ae867e..b00625fb8 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -568,8 +568,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="shortcut.ClearSelection">Clear Selection</system:String>
   <system:String x:Key="shortcut.SelectAll">Select All</system:String>
   <system:String x:Key="shortcut.DeselectAll">Deselect All</system:String>
-  <system:String x:Key="shortcut.HideDetachedWindow">Hide Detached Window</system:String>
-  <system:String x:Key="shortcut.FullScreen">Toggle Full Screen</system:String>
+  <system:String x:Key="shortcut.CloseWindow">Close Window</system:String>
   <system:String x:Key="shortcut.OpenPluginMenu">Open Plugin Menu</system:String>
   <system:String x:Key="shortcut.EditLyrics">Edit Lyrics</system:String>
   <system:String x:Key="shortcut.ToolSelect1">Selection Tool</system:String>
@@ -614,15 +613,9 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="shortcut.ResizeNotesRight">Resize Notes Right</system:String>
   <system:String x:Key="shortcut.MoveNotesRight">Move Notes Right</system:String>
   <system:String x:Key="shortcut.ExtendSelectionRight">Extend Selection Right</system:String>
-  <system:String x:Key="shortcut.Undo">Undo</system:String>
-  <system:String x:Key="shortcut.Redo">Redo</system:String>
-  <system:String x:Key="shortcut.Copy">Copy</system:String>
-  <system:String x:Key="shortcut.Cut">Cut</system:String>
-  <system:String x:Key="shortcut.Paste">Paste</system:String>
   <system:String x:Key="shortcut.PastePlain">Paste as Plain Notes</system:String>
   <system:String x:Key="shortcut.PasteParameters">Paste Parameters</system:String>
   <system:String x:Key="shortcut.InsertNote">Insert Note</system:String>
-  <system:String x:Key="shortcut.DeleteNotes">Delete Notes</system:String>
   <system:String x:Key="shortcut.MergeNotes">Merge Selected Notes</system:String>
   <system:String x:Key="shortcut.PlayheadHome">Move Playhead to Start</system:String>
   <system:String x:Key="shortcut.SelectToStart">Extend Selection to Start</system:String>
@@ -641,12 +634,15 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="shortcut.ZoomIn">Zoom In</system:String>
   <system:String x:Key="shortcut.ZoomOut">Zoom Out</system:String>
   <system:String x:Key="shortcut.SaveProject">Save Project</system:String>
+  <system:String x:Key="shortcut.SaveProjectAs">Save Project As</system:String>
+  <system:String x:Key="shortcut.NewProject">New Project</system:String>
+  <system:String x:Key="shortcut.OpenProject">Open Project</system:String>
   <system:String x:Key="shortcut.SoloTrack">Solo Track</system:String>
   <system:String x:Key="shortcut.MuteTrack">Mute Track</system:String>
   <system:String x:Key="shortcut.FocusSelection">Focus Selection</system:String>
   <system:String x:Key="shortcut.SearchNote">Search Note</system:String>
-  <system:String x:Key="shortcut.MoveToNextPartUp">Move to Next Part (Up)</system:String>
-  <system:String x:Key="shortcut.MoveToNextPartDown">Move to Next Part (Down)</system:String>
+  <system:String x:Key="shortcut.MoveToNextPart">Move to Next Track's Part</system:String>
+  <system:String x:Key="shortcut.MoveToPrevPart">Move to Previous Track's Part</system:String>
   <system:String x:Key="prefs.shortcut.tooltip">Left click to change. Right click to reset.</system:String>
   <system:String x:Key="prefs.shortcut.search.watermark">Search by name or key...</system:String>
   <system:String x:Key="prefs.shortcuts.duplicate">The shortcut '{0}' is already assigned to '{1}'.</system:String>
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index a54912f8d..c33d8a53a 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -35,8 +35,8 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("DeselectAll", ["Ctrl+D"]),
 
                 // UI & Windows
-                new Preferences.ShortcutBinding("HideDetachedWindow", ["Alt+F4"]),
-                new Preferences.ShortcutBinding("FullScreen", ["F11"]),
+                new Preferences.ShortcutBinding("CloseWindow", ["Alt+F4"]),
+                new Preferences.ShortcutBinding("menu.tools.fullscreen", ["F11"]),
                 new Preferences.ShortcutBinding("OpenPluginMenu", ["N"]),
 
                 // Lyrics
@@ -95,15 +95,15 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("ExtendSelectionRight", ["Shift+Right"]),
 
                 // Edit Operations
-                new Preferences.ShortcutBinding("Undo", ["Ctrl+Z"]),
-                new Preferences.ShortcutBinding("Redo", ["Ctrl+Y", "Ctrl+Shift+Z"]),
-                new Preferences.ShortcutBinding("Copy", ["Ctrl+C"]),
-                new Preferences.ShortcutBinding("Cut", ["Ctrl+X"]),
-                new Preferences.ShortcutBinding("Paste", ["Ctrl+V"]),
+                new Preferences.ShortcutBinding("menu.edit.undo", ["Ctrl+Z"]),
+                new Preferences.ShortcutBinding("menu.edit.redo", ["Ctrl+Y", "Ctrl+Shift+Z"]),
+                new Preferences.ShortcutBinding("menu.edit.copy", ["Ctrl+C"]),
+                new Preferences.ShortcutBinding("menu.edit.cut", ["Ctrl+X"]),
+                new Preferences.ShortcutBinding("menu.edit.paste", ["Ctrl+V"]),
                 new Preferences.ShortcutBinding("PastePlain", ["Ctrl+Shift+V"]),
                 new Preferences.ShortcutBinding("PasteParameters", ["Alt+V"]),
                 new Preferences.ShortcutBinding("InsertNote", ["Insert"]),
-                new Preferences.ShortcutBinding("DeleteNotes", ["Delete"]),
+                new Preferences.ShortcutBinding("menu.edit.delete", ["Delete"]),
                 new Preferences.ShortcutBinding("MergeNotes", ["Ctrl+U"]),
 
                 // Playhead & Timeline Navigation
@@ -127,15 +127,18 @@ static KeyTranslator() {
                 new Preferences.ShortcutBinding("ZoomOut", ["Q"]),
 
                 // Track & Project Operations
+                new Preferences.ShortcutBinding("NewProject", ["Ctrl+N"]),
+                new Preferences.ShortcutBinding("OpenProject", ["Ctrl+O"]),
                 new Preferences.ShortcutBinding("SaveProject", ["Ctrl+S"]),
+                new Preferences.ShortcutBinding("SaveProjectAs", ["Ctrl+Shift+S"]),
                 new Preferences.ShortcutBinding("SoloTrack", ["Shift+S"]),
                 new Preferences.ShortcutBinding("MuteTrack", ["Shift+M"]),
                 new Preferences.ShortcutBinding("FocusSelection", ["F"]),
                 new Preferences.ShortcutBinding("SearchNote", ["Ctrl+F"]),
 
                 // Parts Navigation
-                new Preferences.ShortcutBinding("MoveToNextPartUp", ["PageUp"]),
-                new Preferences.ShortcutBinding("MoveToNextPartDown", ["PageDown"]),
+                new Preferences.ShortcutBinding("MoveToNextPart", ["PageDown"]),
+                new Preferences.ShortcutBinding("MoveToPrevPart", ["PageUp"]),
 
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.loadrenderedpitch", ["Ctrl+R"]),
                 new Preferences.ShortcutBinding("pianoroll.menu.notes.refreshrealcurves", ["Ctrl+Shift+R"]),
diff --git a/OpenUtau/ViewModels/MainWindowViewModel.cs b/OpenUtau/ViewModels/MainWindowViewModel.cs
index d3090673f..2ad75cfe9 100644
--- a/OpenUtau/ViewModels/MainWindowViewModel.cs
+++ b/OpenUtau/ViewModels/MainWindowViewModel.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reactive;
 using System.Threading.Tasks;
+using Avalonia.Input;
 using Avalonia.Threading;
 using DynamicData.Binding;
 using OpenUtau.App.Views;
@@ -87,16 +88,27 @@ public class MainWindowViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public bool CanRedo { get; set; } = false;
         [Reactive] public string UndoText { get; set; } = ThemeManager.GetString("menu.edit.undo");
         [Reactive] public string RedoText { get; set; } = ThemeManager.GetString("menu.edit.redo");
+        [Reactive] public Dictionary<string, KeyGesture> Hotkeys { get; set; } = new Dictionary<string, KeyGesture>();
 
         private ObservableCollectionExtended<MenuItemViewModel> openRecentMenuItems
             = new ObservableCollectionExtended<MenuItemViewModel>();
         private ObservableCollectionExtended<MenuItemViewModel> openTemplatesMenuItems
             = new ObservableCollectionExtended<MenuItemViewModel>();
 
+        public void ReloadShortcuts() {
+            KeyTranslator.LoadShortcuts();
+            var newHotkeys = new Dictionary<string, KeyGesture>();
+            foreach (var sc in KeyTranslator.Shortcuts) {
+                newHotkeys.TryAdd(sc.ActionId, sc.Gesture);
+            }
+            Hotkeys = newHotkeys;
+        }
+
         // view will set this to the real AskIfSaveAndContinue implementation
         public Func<Task<bool>>? AskIfSaveAndContinue { get; set; }
 
         public MainWindowViewModel() {
+            ReloadShortcuts();
             PlaybackViewModel = new PlaybackViewModel();
             TracksViewModel = new TracksViewModel();
             ClearCacheHeader = string.Empty;
@@ -136,6 +148,8 @@ public MainWindowViewModel() {
                     PianoRollMaxHeight = x ? double.PositiveInfinity : 0;
                     PianoRollMinHeight = x ? ViewConstants.PianoRollMinHeight : 0;
                 });
+            MessageBus.Current.Listen<ShortcutsRefreshEvent>()
+                .Subscribe(_ => ReloadShortcuts());
         }
 
         public void Undo() {
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index a52640fdc..84ce24d4d 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -114,7 +114,6 @@ public bool ShowPhonemizerTags {
         private ReactiveCommand<Classic.Plugin, Unit> legacyPluginCommand;
 
         public void ReloadShortcuts() {
-            KeyTranslator.LoadShortcuts();
             var newHotkeys = new Dictionary<string, KeyGesture>();
             foreach (var sc in KeyTranslator.Shortcuts) {
                 newHotkeys.TryAdd(sc.ActionId, sc.Gesture);
diff --git a/OpenUtau/Views/MainWindow.axaml b/OpenUtau/Views/MainWindow.axaml
index 1e16d445c..37bdfaa32 100644
--- a/OpenUtau/Views/MainWindow.axaml
+++ b/OpenUtau/Views/MainWindow.axaml
@@ -21,16 +21,16 @@
                 Opened="OnMainMenuOpened" Closed="OnMainMenuClosed" PointerExited="OnMainMenuPointerLeave"
                 ZIndex="1">
           <MenuItem Header="{DynamicResource menu.file}" IsEnabled="{Binding Page}">
-            <MenuItem Header="{DynamicResource menu.file.new}" InputGesture="Ctrl+N" Click="OnMenuNew"/>
+            <MenuItem Header="{DynamicResource menu.file.new}" InputGesture="{Binding Hotkeys[NewProject]}" Click="OnMenuNew"/>
             <MenuItem Header="{DynamicResource menu.file.newfromtemplate}" ItemsSource="{Binding OpenTemplatesMenuItems}" Classes="MenuItemWithSubMenu"/>
             <MenuItem Header="{DynamicResource menu.file.savetemplate}" Click="OnMenuSaveTemplate"/>
             <MenuItem Header="-" Height="1"/>
-            <MenuItem Header="{DynamicResource menu.file.open}" InputGesture="Ctrl+O" Click="OnMenuOpen"/>
+            <MenuItem Header="{DynamicResource menu.file.open}" InputGesture="{Binding Hotkeys[OpenProject]}" Click="OnMenuOpen"/>
             <MenuItem Header="{DynamicResource menu.file.openrecent}" ItemsSource="{Binding OpenRecentMenuItems}" Classes="MenuItemWithSubMenu"/>
             <MenuItem Header="{DynamicResource menu.file.openprojectlocation}" Click="OnMenuOpenProjectLocation"/>
             <MenuItem Header="-" Height="1"/>
-            <MenuItem Header="{DynamicResource menu.file.save}" InputGesture="Ctrl+S" Click="OnMenuSave"/>
-            <MenuItem Header="{DynamicResource menu.file.saveas}"  InputGesture="Ctrl+Shift+S" Click="OnMenuSaveAs"/>
+            <MenuItem Header="{DynamicResource menu.file.save}" InputGesture="{Binding Hotkeys[SaveProject]}" Click="OnMenuSave"/>
+            <MenuItem Header="{DynamicResource menu.file.saveas}"  InputGesture="{Binding Hotkeys[SaveProjectAs]}" Click="OnMenuSaveAs"/>
             <MenuItem Header="-" Height="1"/>
             <MenuItem Header="{DynamicResource menu.file.importtracks}" Click="OnMenuImportTracks"/>
             <MenuItem Header="{DynamicResource menu.file.importaudio}" Click="OnMenuImportAudio"/>
@@ -49,8 +49,8 @@
             <MenuItem Header="{DynamicResource menu.file.openexportlocation}" Click="OnMenuOpenProjectLocation"/>
           </MenuItem>
           <MenuItem Header="{DynamicResource menu.edit}" IsEnabled="{Binding Page}">
-            <MenuItem Header="{Binding UndoText}" InputGesture="Ctrl+Z" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
-            <MenuItem Header="{Binding RedoText}" InputGesture="Ctrl+Y" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
+            <MenuItem Header="{Binding UndoText}" InputGesture="{Binding Hotkeys[menu.edit.undo]}" Command="{Binding Undo}" IsEnabled="{Binding CanUndo}"/>
+            <MenuItem Header="{Binding RedoText}" InputGesture="{Binding Hotkeys[menu.edit.redo]}" Command="{Binding Redo}" IsEnabled="{Binding CanRedo}"/>
           </MenuItem>
           <MenuItem Header="{DynamicResource menu.project}" IsEnabled="{Binding Page}">
             <MenuItem Header="{DynamicResource menu.project.expressions}" Click="OnMenuExpressionss"/>
@@ -66,7 +66,7 @@
               <MenuItem Header="{DynamicResource menu.tools.layout.hsplit12}" Click="OnMenuLayoutHSplit12"/>
               <MenuItem Header="{DynamicResource menu.tools.layout.hsplit13}" Click="OnMenuLayoutHSplit13"/>
             </MenuItem>
-            <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="F11" Click="OnMenuFullScreen"/>
+            <MenuItem Header="{DynamicResource menu.tools.fullscreen}" InputGesture="{Binding Hotkeys[menu.tools.fullscreen]}" Click="OnMenuFullScreen"/>
             <MenuItem Header="{Binding ClearCacheHeader}" Click="OnMenuClearCache"/>
             <MenuItem Header="{DynamicResource menu.tools.debugwindow}" Click="OnMenuDebugWindow"/>
             <MenuItem Header="{DynamicResource phoneticassistant.caption}" Click="OnMenuPhoneticAssistant"/>
diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
index de894d09f..179cc47df 100644
--- a/OpenUtau/Views/MainWindow.axaml.cs
+++ b/OpenUtau/Views/MainWindow.axaml.cs
@@ -778,86 +778,62 @@ void OnKeyDown(object sender, KeyEventArgs args) {
                 args.Handled = false;
                 return;
             }
-
+            args.Handled = OnKeyExtendedHandler(args);
+        }
+        bool OnKeyExtendedHandler(KeyEventArgs args) {
             var tracksVm = viewModel.TracksViewModel;
 
-            if (args.KeyModifiers == KeyModifiers.None) {
-                args.Handled = true;
-                switch (args.Key) {
-                    case Key.Delete: viewModel.TracksViewModel.DeleteSelectedParts(); break;
-                    case Key.Space: PlayOrPause(); break;
-                    case Key.Home: viewModel.PlaybackViewModel.MovePlayPos(0); break;
-                    case Key.End:
-                        if (viewModel.TracksViewModel.Parts.Count > 0) {
-                            int endTick = viewModel.TracksViewModel.Parts.Max(part => part.End);
-                            viewModel.PlaybackViewModel.MovePlayPos(endTick);
-                        }
-                        break;
-                    case Key.F11:
-                        OnMenuFullScreen(this, new RoutedEventArgs());
-                        break;
-                    default:
-                        args.Handled = false;
-                        break;
-                }
-            } else if (args.KeyModifiers == KeyModifiers.Alt) {
-                args.Handled = true;
-                switch (args.Key) {
-                    case Key.F4:
-                        (Application.Current?.ApplicationLifetime as IControlledApplicationLifetime)?.Shutdown();
-                        break;
-                    default:
-                        args.Handled = false;
-                        break;
-                }
-            } else if (args.KeyModifiers == cmdKey) {
-                args.Handled = true;
-                switch (args.Key) {
-                    case Key.A: viewModel.TracksViewModel.SelectAllParts(); break;
-                    case Key.N: NewProject(); break;
-                    case Key.O: Open(); break;
-                    case Key.S: _ = Save(); break;
-                    case Key.Z: viewModel.Undo(); break;
-                    case Key.Y: viewModel.Redo(); break;
-                    case Key.C: tracksVm.CopyParts(); break;
-                    case Key.X: tracksVm.CutParts(); break;
-                    case Key.V: tracksVm.PasteParts(); break;
-                    default:
-                        args.Handled = false;
-                        break;
-                }
-            } else if (args.KeyModifiers == KeyModifiers.Shift) {
-                args.Handled = true;
-                switch (args.Key) {
-                    // solo
-                    case Key.S:
-                        if (viewModel.TracksViewModel.SelectedParts.Count > 0) {
-                            var part = viewModel.TracksViewModel.SelectedParts.First();
-                            var track = DocManager.Inst.Project.tracks[part.trackNo];
-                            MessageBus.Current.SendMessage(new TracksSoloEvent(part.trackNo, !track.Solo, false));
-                        }
-                        break;
-                    // mute
-                    case Key.M:
-                        if (viewModel.TracksViewModel.SelectedParts.Count > 0) {
-                            var part = viewModel.TracksViewModel.SelectedParts.First();
-                            MessageBus.Current.SendMessage(new TracksMuteEvent(part.trackNo, false));
-                        }
-                        break;
-                    default:
-                        args.Handled = false;
-                        break;
-                }
-            } else if (args.KeyModifiers == (cmdKey | KeyModifiers.Shift)) {
-                args.Handled = true;
-                switch (args.Key) {
-                    case Key.Z: viewModel.Redo(); break;
-                    case Key.S: _ = SaveAs(); break;
-                    default:
-                        args.Handled = false;
-                        break;
-                }
+            string? action = KeyTranslator.GetActionIdFromKey(args.Key, args.KeyModifiers);
+            if (action == null) return false;
+
+            switch (action) {
+                // Playback & Selection
+                case "PlayOrPause": PlayOrPause(); return true;
+                case "SelectAll": viewModel.TracksViewModel.SelectAllParts(); return true;
+
+                // UI & Windows
+                case "CloseWindow":
+                    (Application.Current?.ApplicationLifetime as IControlledApplicationLifetime)?.Shutdown();
+                    return true;
+                case "menu.tools.fullscreen": OnMenuFullScreen(this, new RoutedEventArgs()); return true;
+
+                // Playhead & Timeline Navigation
+                case "PlayheadHome": viewModel.PlaybackViewModel.MovePlayPos(0); return true;
+                case "PlayheadEnd":
+                    if (viewModel.TracksViewModel.Parts.Count > 0) {
+                        int endTick = viewModel.TracksViewModel.Parts.Max(part => part.End);
+                        viewModel.PlaybackViewModel.MovePlayPos(endTick);
+                    }
+                    return true;
+
+                // Track & Project Operations
+                case "NewProject": NewProject(); return true;
+                case "OpenProject": Open(); return true;
+                case "SaveProject": _ = Save(); return true;
+                case "SaveProjectAs": _ = SaveAs(); return true;
+                case "SoloTrack":
+                    if (viewModel.TracksViewModel.SelectedParts.Count > 0) {
+                        var part = viewModel.TracksViewModel.SelectedParts.First();
+                        var track = DocManager.Inst.Project.tracks[part.trackNo];
+                        MessageBus.Current.SendMessage(new TracksSoloEvent(part.trackNo, !track.Solo, false));
+                    }
+                    return true;
+                case "MuteTrack":
+                    if (viewModel.TracksViewModel.SelectedParts.Count > 0) {
+                        var part = viewModel.TracksViewModel.SelectedParts.First();
+                        MessageBus.Current.SendMessage(new TracksMuteEvent(part.trackNo, false));
+                    }
+                    return true;
+
+                // Edit Operations
+                case "menu.edit.undo": viewModel.Undo(); return true;
+                case "menu.edit.redo": viewModel.Redo(); return true;
+                case "menu.edit.copy": tracksVm.CopyParts(); return true;
+                case "menu.edit.cut": tracksVm.CutParts(); return true;
+                case "menu.edit.paste": tracksVm.PasteParts(); return true;
+                case "menu.edit.delete": viewModel.TracksViewModel.DeleteSelectedParts(); return true;
             }
+            return false;
         }
 
         void OnPointerPressed(object? sender, PointerPressedEventArgs args) {

From eb7b942c8470baea3278ba428eff901cb5e7bf59 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 31 May 2026 20:28:55 +0900
Subject: [PATCH 21/22] support legacy plugin

---
 OpenUtau/Controls/PianoRoll.axaml.cs        | 12 +++++++++---
 OpenUtau/ViewModels/KeyTranslator.cs        |  7 ++++++-
 OpenUtau/ViewModels/PianoRollViewModel.cs   |  1 +
 OpenUtau/ViewModels/PreferencesViewModel.cs | 10 ++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/OpenUtau/Controls/PianoRoll.axaml.cs b/OpenUtau/Controls/PianoRoll.axaml.cs
index ebe20c33d..a20926f2f 100644
--- a/OpenUtau/Controls/PianoRoll.axaml.cs
+++ b/OpenUtau/Controls/PianoRoll.axaml.cs
@@ -817,13 +817,13 @@ private void NotesCanvasRightPointerPressed(Control control, PointerPoint point,
                             Header = ThemeManager.GetString("context.note.copy"),
                             Command = ViewModel.NoteCopyCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = KeyTranslator.GetGestureForMenu("Copy"),
+                            InputGesture = KeyTranslator.GetGestureForMenu("menu.edit.copy"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.delete"),
                             Command = ViewModel.NoteDeleteCommand,
                             CommandParameter = hitInfo,
-                            InputGesture = KeyTranslator.GetGestureForMenu("DeleteNotes"),
+                            InputGesture = KeyTranslator.GetGestureForMenu("menu.edit.delete"),
                         });
                         ViewModel.NotesContextMenuItems.Add(new MenuItemViewModel() {
                             Header = ThemeManager.GetString("context.note.pasteparameters"),
@@ -1555,7 +1555,13 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     return true;
                 }
             }
-
+            // Legacy plugins
+            foreach (var menu in ViewModel.LegacyPlugins) {
+                if (menu.Header?.ToString() == action) {
+                    menu.Command?.Execute(menu.CommandParameter);
+                    return true;
+                }
+            }
             return false;
         }
 
diff --git a/OpenUtau/ViewModels/KeyTranslator.cs b/OpenUtau/ViewModels/KeyTranslator.cs
index c33d8a53a..a7bf7154b 100644
--- a/OpenUtau/ViewModels/KeyTranslator.cs
+++ b/OpenUtau/ViewModels/KeyTranslator.cs
@@ -223,6 +223,11 @@ public static void LoadShortcuts() {
                 .Where(key => edits.Any(edit => edit.Name == s.ActionId))
                 .Select(key => new ShortcutKey(s.ActionId, key)))
                 .Where(key => key.Gesture.Key != Key.None));
+            // legacy plugins
+            Shortcuts.AddRange(Preferences.Default.PluginShortcuts.SelectMany(s => s.Shortcuts
+                .Where(key => DocManager.Inst.Plugins.Any(plugin => plugin.Name == s.ActionId))
+                .Select(key => new ShortcutKey(s.ActionId, key)))
+                .Where(key => key.Gesture.Key != Key.None));
         }
 
         public static List<Preferences.ShortcutBinding> GetMergedShortcuts() {
@@ -255,7 +260,7 @@ public static void SaveShortcuts(IEnumerable<ShortcutItemViewModel> items) {
                     } else if (!defKey.Shortcuts.OrderBy(x => x).SequenceEqual(gestures.OrderBy(x => x))) {
                         diff.Add(new Preferences.ShortcutBinding(item.ActionId, gestures));
                     }
-                } else if (edits.Any(edit => edit.Name == item.ActionId)) {
+                } else if (edits.Any(edit => edit.Name == item.ActionId) || DocManager.Inst.Plugins.Any(plugin => plugin.Name == item.ActionId)) {
                     item.Gestures.RemoveAll(g => g.Key == Key.None);
                     if (item.Gestures.Count == 0) continue;
                     var gestures = item.Gestures.Select(GestureToString).ToArray();
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 84ce24d4d..a3109d45d 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -235,6 +235,7 @@ private void LoadLegacyPlugins() {
             LegacyPlugins.Clear();
             LegacyPlugins.AddRange(DocManager.Inst.Plugins.Select(plugin => new MenuItemViewModel() {
                 Header = plugin.Name,
+                InputGesture = KeyTranslator.GetGestureForMenu(plugin.Name),
                 Command = legacyPluginCommand,
                 CommandParameter = plugin,
             }));
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 67d972b16..610b9257e 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -586,6 +586,16 @@ private void LoadShortcuts() {
                     }
                 }
             }
+            // legacy plugins
+            prefix = $"{ThemeManager.GetString("pianoroll.menu.part.legacypluginexp")}: ";
+            foreach (var plugin in DocManager.Inst.Plugins) {
+                var customized = Preferences.Default.PluginShortcuts.FirstOrDefault(pref => pref.ActionId == plugin.Name);
+                if (customized != null) {
+                    allShortcuts.Add(new ShortcutItemViewModel(customized, () => SaveShortcuts(), item => ListenForShortcut(item), prefix));
+                } else if (!allShortcuts.Any(s => s.ActionId == plugin.Name)) {
+                    allShortcuts.Add(new ShortcutItemViewModel(plugin.Name, () => SaveShortcuts(), item => ListenForShortcut(item), prefix));
+                }
+            }
         }
 
         public void ListenForShortcut(ShortcutItemViewModel item) {

From b7fcfb2fdc194744a5ed66782ab6e911d7b05ea4 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 31 May 2026 20:49:49 +0900
Subject: [PATCH 22/22] fix key event

---
 OpenUtau/Views/PreferencesDialog.axaml    | 2 +-
 OpenUtau/Views/PreferencesDialog.axaml.cs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index 394babcae..52a7eb9b3 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -379,7 +379,7 @@
             <ItemsControl ItemsSource="{Binding FilteredShortcuts}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                  <Grid ColumnDefinitions="*, Auto, 5, Auto" Margin="5">
+                  <Grid ColumnDefinitions="*, Auto, 5, Auto" Margin="5" KeyDown="OnKeyDown" Focusable="True">
                     <TextBlock Grid.Column="0" 
                           Text="{Binding ActionName}" 
                           VerticalAlignment="Center" 
diff --git a/OpenUtau/Views/PreferencesDialog.axaml.cs b/OpenUtau/Views/PreferencesDialog.axaml.cs
index 491eb5e36..203e2b2a9 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml.cs
+++ b/OpenUtau/Views/PreferencesDialog.axaml.cs
@@ -18,7 +18,7 @@ public PreferencesDialog() {
             InitializeComponent();
         }
 
-        protected override void OnKeyDown(KeyEventArgs e) {
+        void OnKeyDown(object sender, KeyEventArgs e) {
             if (DataContext is PreferencesViewModel vm && vm.ActiveShortcut != null) {
                 // If they hit escape without modifiers, cancel listening
                 if (e.Key == Key.Escape && e.KeyModifiers == KeyModifiers.None) {
@@ -34,7 +34,6 @@ protected override void OnKeyDown(KeyEventArgs e) {
                 e.Handled = true;
                 return;
             }
-            base.OnKeyDown(e);
         }
 
         public void OnShortcutRightClick(object sender, PointerReleasedEventArgs e) {