From df6ea4e96937e90da100f7f4da9ecde8484e3eea Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Wed, 25 Jun 2025 20:33:28 +0100
Subject: [PATCH 01/11] Add customizable shift key mappings and enhance
 keyboard settings UI.

---
 .../Controls/GamepadControlsMapping.axaml     |  29 ++-
 src/Spectron/Input/KeyboardHook.cs            | 167 +++++++++--------
 src/Spectron/Settings/KeyboardSettings.cs     |   9 +
 src/Spectron/Settings/Preferences.cs          |   2 +
 .../ViewModels/MainWindowViewModel.Dialogs.cs |   1 +
 .../ViewModels/MainWindowViewModel.Input.cs   |   5 +
 .../ViewModels/MainWindowViewModel.Window.cs  |   1 +
 .../ViewModels/PreferencesViewModel.cs        |  81 +++++++-
 src/Spectron/Views/PreferencesView.axaml      | 176 ++++++++++++------
 9 files changed, 327 insertions(+), 144 deletions(-)
 create mode 100644 src/Spectron/Settings/KeyboardSettings.cs

diff --git a/src/Spectron/Controls/GamepadControlsMapping.axaml b/src/Spectron/Controls/GamepadControlsMapping.axaml
index 2edde903..facff02e 100644
--- a/src/Spectron/Controls/GamepadControlsMapping.axaml
+++ b/src/Spectron/Controls/GamepadControlsMapping.axaml
@@ -12,7 +12,7 @@
         <converters:TypeMatchConverter x:Key="TypeMatchConverter"/>
     </UserControl.Resources>
 
-    <Grid RowDefinitions="*,50">
+    <Grid ColumnDefinitions="*,100">
         <DataGrid Name="DataGrid"
                   ItemsSource="{Binding Mappings}"
                   Margin="10"
@@ -30,11 +30,11 @@
 
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Button" Binding="{Binding Name}" Width="200"/>
-                <DataGridTemplateColumn Header="Action" >
+                <DataGridTemplateColumn Header="Action" Width="*">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <TextBlock
-                                Width="250"
+                                HorizontalAlignment="Stretch"
                                 Padding="10 0 0 0"
                                 Text="{Binding SelectedAction.Name}" VerticalAlignment="Center" />
                         </DataTemplate>
@@ -42,7 +42,7 @@
                     <DataGridTemplateColumn.CellEditingTemplate>
                         <DataTemplate>
                             <ComboBox
-                                Width="250"
+                                HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Padding="10 0 0 0"
                                 ItemsSource="{Binding Actions}"
@@ -75,7 +75,24 @@
             </DataGrid.Columns>
         </DataGrid>
 
-        <TextBlock Grid.Row="1" TextAlignment="Left" Margin="10 0 0 0" Text="Press a button to locate the mapping" FontSize="10" VerticalAlignment="Top"/>
-        <Button Grid.Row="1" HorizontalAlignment="Right" Margin="0 0 10 0" Content="Defaults" Command="{Binding SetDefaultMappingCommand}"/>
+        <StackPanel
+            Grid.Column="1"
+            Margin="0 0 0 10"
+            VerticalAlignment="Bottom">
+
+            <TextBlock
+                Text="Press gamepad button to find the mapping"
+                TextWrapping="Wrap"
+                HorizontalAlignment="Center"
+                TextAlignment="Center"
+                Margin="0 0 0 20"
+                Opacity=".6"
+                FontSize="12"/>
+
+            <Button
+                Content="Defaults"
+                HorizontalAlignment="Center"
+                Command="{Binding SetDefaultMappingCommand}"/>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Spectron/Input/KeyboardHook.cs b/src/Spectron/Input/KeyboardHook.cs
index c473500a..3f7fe358 100644
--- a/src/Spectron/Input/KeyboardHook.cs
+++ b/src/Spectron/Input/KeyboardHook.cs
@@ -14,6 +14,9 @@ public sealed class KeyboardHook : IDisposable
     private readonly SimpleReactiveGlobalHook _hook = new();
     private readonly EventSimulator _simulator = new();
 
+    private KeyCode _capsShift = KeyCode.VcLeftShift;
+    private KeyCode _symbolShift = KeyCode.VcRightAlt;
+
     private bool _isShiftPressed;
 
     public event EventHandler<SpectrumKeyEventArgs>? SpectrumKeyPressed;
@@ -99,12 +102,12 @@ private void KeyReleased(KeyboardHookEventArgs e)
     private void SendExtendedModeKey(KeyCode keyCode)
     {
         // Enable Extended mode
-        _simulator.SimulateKeyPress(KeyCode.VcLeftShift);
-        _simulator.SimulateKeyPress(KeyCode.VcRightAlt);
+        _simulator.SimulateKeyPress(_capsShift);
+        _simulator.SimulateKeyPress(_symbolShift);
 
         Task.Delay(30).ContinueWith(_ =>
         {
-            _simulator.SimulateKeyRelease(KeyCode.VcLeftShift);
+            _simulator.SimulateKeyRelease(_capsShift);
 
             Task.Delay(5).ContinueWith(_ =>
                 _simulator.SimulateKeyPress(keyCode));
@@ -119,78 +122,94 @@ private void HandleShiftState(KeyboardHookEventArgs e, bool isPressed)
         }
     }
 
-    private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode) => keyCode switch
+    private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode)
     {
-        KeyCode.Vc0 => [SpectrumKey.D0],
-        KeyCode.Vc1 => [SpectrumKey.D1],
-        KeyCode.Vc2 => [SpectrumKey.D2],
-        KeyCode.Vc3 => [SpectrumKey.D3],
-        KeyCode.Vc4 => [SpectrumKey.D4],
-        KeyCode.Vc5 => [SpectrumKey.D5],
-        KeyCode.Vc6 => [SpectrumKey.D6],
-        KeyCode.Vc7 => [SpectrumKey.D7],
-        KeyCode.Vc8 => [SpectrumKey.D8],
-        KeyCode.Vc9 => [SpectrumKey.D9],
-        KeyCode.VcA => [SpectrumKey.A],
-        KeyCode.VcB => [SpectrumKey.B],
-        KeyCode.VcC => [SpectrumKey.C],
-        KeyCode.VcD => [SpectrumKey.D],
-        KeyCode.VcE => [SpectrumKey.E],
-        KeyCode.VcF => [SpectrumKey.F],
-        KeyCode.VcG => [SpectrumKey.G],
-        KeyCode.VcH => [SpectrumKey.H],
-        KeyCode.VcI => [SpectrumKey.I],
-        KeyCode.VcJ => [SpectrumKey.J],
-        KeyCode.VcK => [SpectrumKey.K],
-        KeyCode.VcL => [SpectrumKey.L],
-        KeyCode.VcM => [SpectrumKey.M],
-        KeyCode.VcN => [SpectrumKey.N],
-        KeyCode.VcO => [SpectrumKey.O],
-        KeyCode.VcP => [SpectrumKey.P],
-        KeyCode.VcQ => [SpectrumKey.Q],
-        KeyCode.VcR => [SpectrumKey.R],
-        KeyCode.VcS => [SpectrumKey.S],
-        KeyCode.VcT => [SpectrumKey.T],
-        KeyCode.VcU => [SpectrumKey.U],
-        KeyCode.VcV => [SpectrumKey.V],
-        KeyCode.VcW => [SpectrumKey.W],
-        KeyCode.VcX => [SpectrumKey.X],
-        KeyCode.VcY => [SpectrumKey.Y],
-        KeyCode.VcZ => [SpectrumKey.Z],
-        KeyCode.VcEnter => [SpectrumKey.Enter],
-        KeyCode.VcSpace => [SpectrumKey.Space],
-        KeyCode.VcLeftShift => [SpectrumKey.CapsShift],
-        KeyCode.VcRightShift => [SpectrumKey.CapsShift],
-        KeyCode.VcRightAlt => [SpectrumKey.SymbolShift],
-        KeyCode.VcBackspace => [SpectrumKey.None, SpectrumKey.CapsShift, SpectrumKey.D0],
-        KeyCode.VcEscape => [SpectrumKey.None],
-        KeyCode.VcComma => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.N]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.R],
-        KeyCode.VcPeriod => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.M]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.T],
-        KeyCode.VcSemicolon => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.O]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.Z],
-        KeyCode.VcSlash => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.V]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.C],
-        KeyCode.VcQuote => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.P]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D7],
-        KeyCode.VcEquals => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.L]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.K],
-        KeyCode.VcMinus => !_isShiftPressed
-            ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.J]
-            : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D0],
-        KeyCode.VcLeft => [SpectrumKey.CapsShift, SpectrumKey.D5],
-        KeyCode.VcDown => [SpectrumKey.CapsShift, SpectrumKey.D6],
-        KeyCode.VcUp => [SpectrumKey.CapsShift, SpectrumKey.D7],
-        KeyCode.VcRight => [SpectrumKey.CapsShift, SpectrumKey.D8],
-        _ => []
-    };
+        if (keyCode == _capsShift)
+        {
+            return [SpectrumKey.CapsShift];
+        }
+
+        if (keyCode == _symbolShift)
+        {
+            return [SpectrumKey.SymbolShift];
+        }
+
+        return keyCode switch
+        {
+            KeyCode.Vc0 => [SpectrumKey.D0],
+            KeyCode.Vc1 => [SpectrumKey.D1],
+            KeyCode.Vc2 => [SpectrumKey.D2],
+            KeyCode.Vc3 => [SpectrumKey.D3],
+            KeyCode.Vc4 => [SpectrumKey.D4],
+            KeyCode.Vc5 => [SpectrumKey.D5],
+            KeyCode.Vc6 => [SpectrumKey.D6],
+            KeyCode.Vc7 => [SpectrumKey.D7],
+            KeyCode.Vc8 => [SpectrumKey.D8],
+            KeyCode.Vc9 => [SpectrumKey.D9],
+            KeyCode.VcA => [SpectrumKey.A],
+            KeyCode.VcB => [SpectrumKey.B],
+            KeyCode.VcC => [SpectrumKey.C],
+            KeyCode.VcD => [SpectrumKey.D],
+            KeyCode.VcE => [SpectrumKey.E],
+            KeyCode.VcF => [SpectrumKey.F],
+            KeyCode.VcG => [SpectrumKey.G],
+            KeyCode.VcH => [SpectrumKey.H],
+            KeyCode.VcI => [SpectrumKey.I],
+            KeyCode.VcJ => [SpectrumKey.J],
+            KeyCode.VcK => [SpectrumKey.K],
+            KeyCode.VcL => [SpectrumKey.L],
+            KeyCode.VcM => [SpectrumKey.M],
+            KeyCode.VcN => [SpectrumKey.N],
+            KeyCode.VcO => [SpectrumKey.O],
+            KeyCode.VcP => [SpectrumKey.P],
+            KeyCode.VcQ => [SpectrumKey.Q],
+            KeyCode.VcR => [SpectrumKey.R],
+            KeyCode.VcS => [SpectrumKey.S],
+            KeyCode.VcT => [SpectrumKey.T],
+            KeyCode.VcU => [SpectrumKey.U],
+            KeyCode.VcV => [SpectrumKey.V],
+            KeyCode.VcW => [SpectrumKey.W],
+            KeyCode.VcX => [SpectrumKey.X],
+            KeyCode.VcY => [SpectrumKey.Y],
+            KeyCode.VcZ => [SpectrumKey.Z],
+            KeyCode.VcEnter => [SpectrumKey.Enter],
+            KeyCode.VcSpace => [SpectrumKey.Space],
+            KeyCode.VcBackspace => [SpectrumKey.None, SpectrumKey.CapsShift, SpectrumKey.D0],
+            KeyCode.VcEscape => [SpectrumKey.None],
+            KeyCode.VcComma => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.N]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.R],
+            KeyCode.VcPeriod => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.M]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.T],
+            KeyCode.VcSemicolon => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.O]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.Z],
+            KeyCode.VcSlash => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.V]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.C],
+            KeyCode.VcQuote => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.P]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D7],
+            KeyCode.VcEquals => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.L]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.K],
+            KeyCode.VcMinus => !_isShiftPressed
+                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.J]
+                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D0],
+            KeyCode.VcLeft => [SpectrumKey.CapsShift, SpectrumKey.D5],
+            KeyCode.VcDown => [SpectrumKey.CapsShift, SpectrumKey.D6],
+            KeyCode.VcUp => [SpectrumKey.CapsShift, SpectrumKey.D7],
+            KeyCode.VcRight => [SpectrumKey.CapsShift, SpectrumKey.D8],
+            _ => []
+        };
+    }
+
+    public void UpdateShiftKeys(KeyCode capsShift, KeyCode symbolShift)
+    {
+        _capsShift = capsShift;
+        _symbolShift = symbolShift;
+    }
 
     public static JoystickInput ToJoystickAction(KeyCode keyCode, KeyCode fireKey) => keyCode switch
     {
diff --git a/src/Spectron/Settings/KeyboardSettings.cs b/src/Spectron/Settings/KeyboardSettings.cs
new file mode 100644
index 00000000..8e77b644
--- /dev/null
+++ b/src/Spectron/Settings/KeyboardSettings.cs
@@ -0,0 +1,9 @@
+using SharpHook.Data;
+
+namespace OldBit.Spectron.Settings;
+
+public record KeyboardSettings
+{
+    public KeyCode CapsShiftKey { get; init; } = KeyCode.VcLeftShift;
+    public KeyCode SymbolShiftKey { get; init; } = KeyCode.VcRightAlt;
+}
\ No newline at end of file
diff --git a/src/Spectron/Settings/Preferences.cs b/src/Spectron/Settings/Preferences.cs
index d3fda064..5831f75d 100644
--- a/src/Spectron/Settings/Preferences.cs
+++ b/src/Spectron/Settings/Preferences.cs
@@ -24,6 +24,8 @@ public class Preferences
 
     public RomType RomType { get; init; } = RomType.Original;
 
+    public KeyboardSettings Keyboard { get; init; } = new();
+
     public JoystickSettings Joystick { get; init; } = new();
 
     public MouseSettings Mouse { get; init; } = new();
diff --git a/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs b/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
index 6debbc6a..df6300ba 100644
--- a/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
+++ b/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
@@ -43,6 +43,7 @@ public async Task OpenPreferencesWindow()
             MouseType = preferences.Mouse.MouseType;
             SetMouseCursor();
 
+            UpdateShiftKeys(_preferences.Keyboard);
             ConfigureEmulatorSettings();
         }
 
diff --git a/src/Spectron/ViewModels/MainWindowViewModel.Input.cs b/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
index 4d3f3500..6cf37423 100644
--- a/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
+++ b/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
@@ -6,6 +6,7 @@
 using OldBit.Spectron.Emulation.Devices.Joystick;
 using OldBit.Spectron.Emulation.Devices.Mouse;
 using OldBit.Spectron.Input;
+using OldBit.Spectron.Settings;
 
 namespace OldBit.Spectron.ViewModels;
 
@@ -67,6 +68,10 @@ private void HandleSpectrumKeyReleased(object? sender, SpectrumKeyEventArgs e)
         Emulator?.KeyboardState.KeyUp(e.Keys);
     }
 
+    private void UpdateShiftKeys(KeyboardSettings settings) => _keyboardHook.UpdateShiftKeys(
+        settings.CapsShiftKey,
+        settings.SymbolShiftKey);
+
     private bool JoystickHandled(SpectrumKeyEventArgs e)
     {
         if (!IsKeyboardJoystickEmulationEnabled)
diff --git a/src/Spectron/ViewModels/MainWindowViewModel.Window.cs b/src/Spectron/ViewModels/MainWindowViewModel.Window.cs
index eae5c2b2..c45c8692 100644
--- a/src/Spectron/ViewModels/MainWindowViewModel.Window.cs
+++ b/src/Spectron/ViewModels/MainWindowViewModel.Window.cs
@@ -22,6 +22,7 @@ private async Task WindowOpenedAsync()
 
         await RecentFilesViewModel.LoadAsync();
 
+        UpdateShiftKeys(_preferences.Keyboard);
         HandleChangeBorderSize(_preferences.BorderSize);
 
         if (_preferences.Resume.IsResumeEnabled)
diff --git a/src/Spectron/ViewModels/PreferencesViewModel.cs b/src/Spectron/ViewModels/PreferencesViewModel.cs
index 117e4882..b3987c66 100644
--- a/src/Spectron/ViewModels/PreferencesViewModel.cs
+++ b/src/Spectron/ViewModels/PreferencesViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -32,7 +33,7 @@ public partial class PreferencesViewModel : ObservableValidator, IDisposable
 {
     private readonly GamepadManager _gamepadManager;
     private readonly GamepadSettings _gamepadSettings;
-    private Guid _previousGamepadControllerId = Guid.Empty;
+    private Guid _previousGamepadControllerId;
 
     public GamepadMappingViewModel GamepadMappingViewModel { get; }
 
@@ -61,6 +62,9 @@ public PreferencesViewModel(Preferences preferences, GamepadManager gamepadManag
         _previousGamepadControllerId = GamepadControllerId;
         FireKey = preferences.Joystick.FireKey;
 
+        CapsShiftKey = preferences.Keyboard.CapsShiftKey;
+        SymbolShiftKey = preferences.Keyboard.SymbolShiftKey;
+
         MouseType = preferences.Mouse.MouseType;
         IsStandardMousePointerHidden = preferences.Mouse.IsStandardMousePointerHidden;
 
@@ -129,6 +133,13 @@ private void UpdatePreferences()
             IsFloatingBusEnabled = IsFloatingBusEnabled,
             RomType = RomType,
             IsAutoLoadPokeFilesEnabled = IsAutoLoadPokeFilesEnabled,
+
+            Keyboard = new KeyboardSettings
+            {
+                CapsShiftKey = CapsShiftKey,
+                SymbolShiftKey = SymbolShiftKey,
+            },
+
             Joystick = new JoystickSettings
             {
                 JoystickType = JoystickType,
@@ -215,7 +226,7 @@ private void ProbeFFmpeg()
     }
 
     [RelayCommand]
-    private async Task SelectSdCardImageFile(string cardId)
+    public async Task SelectSdCardImageFile(string cardId)
     {
         var file = await FileDialogs.OpenDiskImageFileAsync();
 
@@ -260,6 +271,8 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
         }
     }
 
+
+
     public static ValidationResult? ValidateCardImageFile(string fileName, ValidationContext context)
     {
         if (context.ObjectInstance is PreferencesViewModel { IsDivMmcEnabled: false })
@@ -275,6 +288,47 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
         return new ValidationResult(errorMessage, [context.MemberName ?? string.Empty]);
     }
 
+    public static ValidationResult? ValidateKeyboardMapping(KeyCode keyCode, ValidationContext context)
+    {
+        if (context.ObjectInstance is not PreferencesViewModel preferences)
+        {
+            return ValidationResult.Success;
+        }
+
+        preferences.ClearErrors(nameof(CapsShiftKey));
+        preferences.ClearErrors(nameof(SymbolShiftKey));
+
+        if (preferences.CapsShiftKey == preferences.SymbolShiftKey)
+        {
+            return new ValidationResult("Keys should be mapped differently");
+        }
+
+        if (preferences is
+            { CapsShiftKey: KeyCode.VcLeftShift, SymbolShiftKey: KeyCode.VcRightShift } or
+            { CapsShiftKey: KeyCode.VcRightShift, SymbolShiftKey: KeyCode.VcLeftShift } or
+            { CapsShiftKey: KeyCode.VcLeftAlt, SymbolShiftKey: KeyCode.VcRightAlt } or
+            { CapsShiftKey: KeyCode.VcRightAlt, SymbolShiftKey: KeyCode.VcLeftAlt } or
+            { CapsShiftKey: KeyCode.VcLeftControl, SymbolShiftKey: KeyCode.VcRightControl } or
+            { CapsShiftKey: KeyCode.VcRightControl, SymbolShiftKey: KeyCode.VcLeftControl })
+        {
+            return new ValidationResult("Using both left and right Shift, Alt or Control may not work correctly");
+        }
+
+        return ValidationResult.Success;
+    }
+
+    protected override void OnPropertyChanged(PropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+
+        var errors = GetErrors();
+        var validationResults = errors as ValidationResult[] ?? errors.ToArray();
+
+        ValidationSummary = validationResults.Length == 0
+            ? string.Empty
+            : validationResults.Aggregate(string.Empty, (current, error) => current + error + Environment.NewLine);
+    }
+
     public List<NameValuePair<ComputerType>> ComputerTypes { get; } =
     [
         new("ZX Spectrum 16k", ComputerType.Spectrum16K),
@@ -308,6 +362,16 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
         new("Kempston", MouseType.Kempston),
     ];
 
+    public List<NameValuePair<KeyCode>> ShiftKeys { get; } =
+    [
+        new("Left Shift", KeyCode.VcLeftShift),
+        new("Right Shift", KeyCode.VcRightShift),
+        new("Left Alt", KeyCode.VcLeftAlt),
+        new("Right Alt", KeyCode.VcRightAlt),
+        new("Left Control", KeyCode.VcLeftControl),
+        new("Right Control", KeyCode.VcRightControl),
+    ];
+
     public List<NameValuePair<StereoMode>> StereoModes { get; } =
     [
         new("Mono", StereoMode.Mono),
@@ -433,6 +497,16 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
     [ObservableProperty]
     private bool _emulateUsingKeyboard;
 
+    [ObservableProperty]
+    [NotifyDataErrorInfo]
+    [CustomValidation(typeof(PreferencesViewModel), nameof(ValidateKeyboardMapping))]
+    private KeyCode _symbolShiftKey = KeyCode.VcRightAlt;
+
+    [ObservableProperty]
+    [NotifyDataErrorInfo]
+    [CustomValidation(typeof(PreferencesViewModel), nameof(ValidateKeyboardMapping))]
+    private KeyCode _capsShiftKey = KeyCode.VcLeftShift;
+
     [ObservableProperty]
     private KeyCode _fireKey = KeyCode.VcSpace;
 
@@ -531,6 +605,9 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
     [ObservableProperty]
     private bool _isAutoLoadPokeFilesEnabled;
 
+    [ObservableProperty]
+    private string _validationSummary = string.Empty;
+
     public void Dispose()
     {
         GC.SuppressFinalize(this);
diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index b2f15e0c..0dc57bcf 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -164,9 +164,118 @@
 
             <TabItem Header="Input">
                 <Border Classes="Tab">
-                    <Grid RowDefinitions="Auto,*">
-                        <StackPanel>
-                            <controls:HeaderSeparator Text="Mouse"/>
+                    <TabControl TabStripPlacement="Top">
+                        <TabItem Header="Keyboard">
+                            <StackPanel>
+                                <Grid ColumnDefinitions="140,*" RowDefinitions="40,40,*">
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Text="Caps Shift"
+                                        VerticalAlignment="Center"
+                                        Classes="Center"/>
+
+                                    <ComboBox
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="5 0 0 0"
+                                        Width="150"
+                                        ItemsSource="{Binding ShiftKeys}"
+                                        SelectedValue="{Binding CapsShiftKey}"
+                                        DisplayMemberBinding="{Binding Name}"
+                                        SelectedValueBinding="{Binding Value}"/>
+
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Text="Symbol Shift"
+                                        VerticalAlignment="Center"
+                                        Classes="Center"/>
+
+                                    <ComboBox
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="5 0 0 0"
+                                        Width="150"
+                                        ItemsSource="{Binding ShiftKeys}"
+                                        SelectedValue="{Binding SymbolShiftKey}"
+                                        DisplayMemberBinding="{Binding Name}"
+                                        SelectedValueBinding="{Binding Value}"/>
+
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Margin="10"
+                                        Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                                        VerticalAlignment="Stretch"
+                                        TextWrapping="Wrap"
+                                        Text="{Binding ValidationSummary}"/>
+                                </Grid>
+                            </StackPanel>
+                        </TabItem>
+                        <TabItem Header="Joystick">
+                            <Grid RowDefinitions="Auto,*">
+                                <Grid ColumnDefinitions="140,300" RowDefinitions="40,40,40">
+                                    <TextBlock
+                                        Text="Device"
+                                        VerticalAlignment="Center"
+                                        Classes="Center"/>
+                                    <ComboBox
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Name="Gamepad"
+                                        Margin="5 0 10 0"
+                                        Width="250"
+                                        ItemsSource="{Binding GamepadControllers}"
+                                        SelectedValue="{Binding GamepadControllerId}"
+                                        DisplayMemberBinding="{Binding Name}"
+                                        SelectedValueBinding="{Binding ControllerId}"/>
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Text="Emulated Joystick"
+                                        VerticalAlignment="Center"
+                                        Classes="Center"/>
+                                    <ComboBox
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Name="Joystick"
+                                        Margin="5 0 0 0"
+                                        Width="250"
+                                        ItemsSource="{Binding JoystickTypes}"
+                                        SelectedValue="{Binding JoystickType}"
+                                        DisplayMemberBinding="{Binding Name}"
+                                        SelectedValueBinding="{Binding Value}"/>
+                                    <StackPanel
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Orientation="Horizontal">
+                                        <CheckBox
+                                            Content="Use keyboard (← ↑ ↓ →). Fire key:"
+                                            Margin="5 0 0 0"
+                                            VerticalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            IsChecked="{Binding EmulateUsingKeyboard}"
+                                            IsEnabled="{Binding #Joystick.SelectedIndex}"/>
+                                        <ComboBox
+                                            Margin="15 0 0 0"
+                                            Width="120"
+                                            ItemsSource="{Binding FireKeys}"
+                                            SelectedValue="{Binding FireKey}"
+                                            DisplayMemberBinding="{Binding Name}"
+                                            SelectedValueBinding="{Binding Value}"
+                                            IsEnabled="{Binding #Joystick.SelectedIndex}"/>
+                                    </StackPanel>
+                                </Grid>
+                                <Grid Grid.Row="1">
+                                    <controls:GamepadControlsMapping
+                                        HorizontalAlignment="Stretch"
+                                        DataContext="{Binding GamepadMappingViewModel}"
+                                        IsVisible="{Binding #Gamepad.SelectedIndex}"/>
+                                </Grid>
+                            </Grid>
+                        </TabItem>
+                        <TabItem Header="Mouse">
                             <Grid ColumnDefinitions="140,300" RowDefinitions="40,40">
                                 <TextBlock
                                     Grid.Row="0"
@@ -193,65 +302,8 @@
                                     IsChecked="{Binding IsStandardMousePointerHidden}"
                                     IsEnabled="{Binding #Mouse.SelectedIndex}"/>
                             </Grid>
-
-                            <controls:HeaderSeparator Text="Joystick"/>
-                            <Grid ColumnDefinitions="140,300" RowDefinitions="40,40,40">
-                                <TextBlock
-                                    Text="Device"
-                                    VerticalAlignment="Center"
-                                    Classes="Center"/>
-                                <ComboBox
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Name="Gamepad"
-                                    Margin="5 0 10 0"
-                                    Width="250"
-                                    ItemsSource="{Binding GamepadControllers}"
-                                    SelectedValue="{Binding GamepadControllerId}"
-                                    DisplayMemberBinding="{Binding Name}"
-                                    SelectedValueBinding="{Binding ControllerId}"/>
-                                <TextBlock
-                                    Grid.Row="1"
-                                    Grid.Column="0"
-                                    Text="Emulated Joystick"
-                                    VerticalAlignment="Center"
-                                    Classes="Center"/>
-                                <ComboBox
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    Name="Joystick"
-                                    Margin="5 0 0 0"
-                                    Width="250"
-                                    ItemsSource="{Binding JoystickTypes}"
-                                    SelectedValue="{Binding JoystickType}"
-                                    DisplayMemberBinding="{Binding Name}"
-                                    SelectedValueBinding="{Binding Value}"/>
-                                <StackPanel
-                                    Grid.Row="2"
-                                    Grid.Column="1"
-                                    Orientation="Horizontal">
-                                    <CheckBox
-                                        Content="Use keyboard (← ↑ ↓ →). Fire key:"
-                                        Margin="5 0 0 0"
-                                        VerticalAlignment="Center"
-                                        VerticalContentAlignment="Center"
-                                        IsChecked="{Binding EmulateUsingKeyboard}"
-                                        IsEnabled="{Binding #Joystick.SelectedIndex}"/>
-                                    <ComboBox
-                                        Margin="15 0 0 0"
-                                        Width="120"
-                                        ItemsSource="{Binding FireKeys}"
-                                        SelectedValue="{Binding FireKey}"
-                                        DisplayMemberBinding="{Binding Name}"
-                                        SelectedValueBinding="{Binding Value}"
-                                        IsEnabled="{Binding #Joystick.SelectedIndex}"/>
-                                </StackPanel>
-                            </Grid>
-                        </StackPanel>
-                        <Grid Grid.Row="1">
-                            <controls:GamepadControlsMapping DataContext="{Binding GamepadMappingViewModel}" IsVisible="{Binding #Gamepad.SelectedIndex}"/>
-                        </Grid>
-                    </Grid>
+                        </TabItem>
+                    </TabControl>
                 </Border>
             </TabItem>
 

From 04e02a548fb14d0c6420265a2827f6be987c148d Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Wed, 25 Jun 2025 20:42:33 +0100
Subject: [PATCH 02/11] Improve key labels for Alt/Option on macOS and
 validation messages.

---
 src/Spectron/ViewModels/PreferencesViewModel.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Spectron/ViewModels/PreferencesViewModel.cs b/src/Spectron/ViewModels/PreferencesViewModel.cs
index b3987c66..d31e9175 100644
--- a/src/Spectron/ViewModels/PreferencesViewModel.cs
+++ b/src/Spectron/ViewModels/PreferencesViewModel.cs
@@ -311,7 +311,9 @@ private void GamepadManagerOnControllerChanged(object? sender, ControllerChanged
             { CapsShiftKey: KeyCode.VcLeftControl, SymbolShiftKey: KeyCode.VcRightControl } or
             { CapsShiftKey: KeyCode.VcRightControl, SymbolShiftKey: KeyCode.VcLeftControl })
         {
-            return new ValidationResult("Using both left and right Shift, Alt or Control may not work correctly");
+            var altKeyName = OperatingSystem.IsMacOS() ? "Option" : "Alt";
+
+            return new ValidationResult($"Using both left and right Shift, {altKeyName} or Control may not work correctly");
         }
 
         return ValidationResult.Success;
@@ -366,8 +368,8 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
     [
         new("Left Shift", KeyCode.VcLeftShift),
         new("Right Shift", KeyCode.VcRightShift),
-        new("Left Alt", KeyCode.VcLeftAlt),
-        new("Right Alt", KeyCode.VcRightAlt),
+        new(OperatingSystem.IsMacOS() ? "Left Option" : "Left Alt", KeyCode.VcLeftAlt),
+        new(OperatingSystem.IsMacOS() ? "Right Option" : "Right Alt", KeyCode.VcRightAlt),
         new("Left Control", KeyCode.VcLeftControl),
         new("Right Control", KeyCode.VcRightControl),
     ];

From 825b9b0a709c9beb2ba8f07182527873bc29372b Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Wed, 25 Jun 2025 20:50:44 +0100
Subject: [PATCH 03/11] Update label: Rename "Device" to "Gamepad" in
 PreferencesView.

---
 src/Spectron/Views/PreferencesView.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index 0dc57bcf..10c27143 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -217,7 +217,7 @@
                             <Grid RowDefinitions="Auto,*">
                                 <Grid ColumnDefinitions="140,300" RowDefinitions="40,40,40">
                                     <TextBlock
-                                        Text="Device"
+                                        Text="Gamepad"
                                         VerticalAlignment="Center"
                                         Classes="Center"/>
                                     <ComboBox

From 85be1e94fd5bd16047f74a76b116c5abab66ab18 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Wed, 25 Jun 2025 20:57:43 +0100
Subject: [PATCH 04/11] Update `Light` theme color palette for improved
 contrast and consistency.

---
 src/Spectron/App.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Spectron/App.axaml b/src/Spectron/App.axaml
index ff2ea6e0..208ede6a 100644
--- a/src/Spectron/App.axaml
+++ b/src/Spectron/App.axaml
@@ -16,7 +16,7 @@
     <Application.Styles>
         <FluentTheme>
             <FluentTheme.Palettes>
-                <ColorPaletteResources x:Key="Light" Accent="#ff0073cf" AltHigh="White" AltLow="White" AltMedium="White" AltMediumHigh="White" AltMediumLow="White" BaseHigh="Black" BaseLow="#ffcccccc" BaseMedium="#ff898989" BaseMediumHigh="#ff5d5d5d" BaseMediumLow="#ff737373" ChromeAltLow="#ff5d5d5d" ChromeBlackHigh="Black" ChromeBlackLow="#ffcccccc" ChromeBlackMedium="#ff5d5d5d" ChromeBlackMediumLow="#ff898989" ChromeDisabledHigh="#ffcccccc" ChromeDisabledLow="#ff898989" ChromeGray="#ff737373" ChromeHigh="#ffcccccc" ChromeLow="#ffececec" ChromeMedium="#ffe6e6e6" ChromeMediumLow="#ffececec" ChromeWhite="White" ListLow="#ffe6e6e6" ListMedium="#ffcccccc" RegionColor="White" />
+                <ColorPaletteResources x:Key="Light" Accent="#ff0073cf" AltHigh="White" AltLow="White" AltMedium="White" AltMediumHigh="White" AltMediumLow="White" BaseHigh="Black" BaseLow="#ffc8c8c8" BaseMedium="#ff878787" BaseMediumHigh="#ff5b5b5b" BaseMediumLow="#ff717171" ChromeAltLow="#ff5b5b5b" ChromeBlackHigh="Black" ChromeBlackLow="#ffc8c8c8" ChromeBlackMedium="#ff5b5b5b" ChromeBlackMediumLow="#ff878787" ChromeDisabledHigh="#ffc8c8c8" ChromeDisabledLow="#ff878787" ChromeGray="#ff717171" ChromeHigh="#ffc8c8c8" ChromeLow="#ffebebeb" ChromeMedium="#ffe4e4e4" ChromeMediumLow="#ffebebeb" ChromeWhite="White" ListLow="#ffe4e4e4" ListMedium="#ffc8c8c8" RegionColor="#ffd8d8d8" />
                 <ColorPaletteResources x:Key="Dark" Accent="#ffcc4d11" AltHigh="Black" AltLow="Black" AltMedium="Black" AltMediumHigh="Black" AltMediumLow="Black" BaseHigh="White" BaseLow="#ff2f7bad" BaseMedium="#ff8dbfdf" BaseMediumHigh="#ffa5d0ec" BaseMediumLow="#ff5e9dc6" ChromeAltLow="#ffa5d0ec" ChromeBlackHigh="Black" ChromeBlackLow="#ffa5d0ec" ChromeBlackMedium="Black" ChromeBlackMediumLow="Black" ChromeDisabledHigh="#ff2f7bad" ChromeDisabledLow="#ff8dbfdf" ChromeGray="#ff76aed3" ChromeHigh="#ff76aed3" ChromeLow="#ff093b73" ChromeMedium="#ff134b82" ChromeMediumLow="#ff266b9f" ChromeWhite="White" ListLow="#ff134b82" ListMedium="#ff2f7bad" RegionColor="#ff030a12" />
             </FluentTheme.Palettes>
         </FluentTheme>

From c9a4f29cdfe2ac3007bdc2aa218b8e9233231f33 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 19:10:18 +0100
Subject: [PATCH 05/11] Handle meta key state in `KeyboardHook` to prevent
 unintended key processing.

---
 src/Spectron/Input/KeyboardHook.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Spectron/Input/KeyboardHook.cs b/src/Spectron/Input/KeyboardHook.cs
index 3f7fe358..b095b109 100644
--- a/src/Spectron/Input/KeyboardHook.cs
+++ b/src/Spectron/Input/KeyboardHook.cs
@@ -18,6 +18,7 @@ public sealed class KeyboardHook : IDisposable
     private KeyCode _symbolShift = KeyCode.VcRightAlt;
 
     private bool _isShiftPressed;
+    private bool _isMetaKeyPressed;
 
     public event EventHandler<SpectrumKeyEventArgs>? SpectrumKeyPressed;
     public event EventHandler<SpectrumKeyEventArgs>? SpectrumKeyReleased;
@@ -32,6 +33,17 @@ public KeyboardHook()
 
     private void KeyPressed(KeyboardHookEventArgs e)
     {
+        if (_isMetaKeyPressed)
+        {
+            return;
+        }
+
+        if (IsMetaKey(e.Data.KeyCode))
+        {
+            _isMetaKeyPressed = true;
+            return;
+        }
+
         HandleShiftState(e, isPressed: true);
 
         var spectrumKeys = ToSpectrumKeySequence(e.Data.KeyCode);
@@ -65,6 +77,12 @@ private void KeyPressed(KeyboardHookEventArgs e)
 
     private void KeyReleased(KeyboardHookEventArgs e)
     {
+        if (IsMetaKey(e.Data.KeyCode))
+        {
+            _isMetaKeyPressed = false;
+            return;
+        }
+
         HandleShiftState(e, isPressed: false);
 
         var spectrumKeys = ToSpectrumKeySequence(e.Data.KeyCode);
@@ -205,6 +223,8 @@ private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode)
         };
     }
 
+    private static bool IsMetaKey(KeyCode keyCode) => keyCode == KeyCode.VcLeftMeta || keyCode == KeyCode.VcRightMeta;
+
     public void UpdateShiftKeys(KeyCode capsShift, KeyCode symbolShift)
     {
         _capsShift = capsShift;

From a3a02118e3b75c25ca030c5ad6a531107541ca91 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 19:29:24 +0100
Subject: [PATCH 06/11] Add support for handling extended keyboard keys in
 emulator settings and input processing.

---
 src/Spectron/Input/KeyboardHook.cs            | 79 ++++++++-------
 src/Spectron/Settings/KeyboardSettings.cs     |  3 +
 .../ViewModels/MainWindowViewModel.Input.cs   |  4 +-
 .../ViewModels/PreferencesViewModel.cs        |  5 +
 src/Spectron/Views/MainWindow.axaml           |  1 +
 src/Spectron/Views/PreferencesView.axaml      | 95 ++++++++++---------
 6 files changed, 108 insertions(+), 79 deletions(-)

diff --git a/src/Spectron/Input/KeyboardHook.cs b/src/Spectron/Input/KeyboardHook.cs
index b095b109..444633e0 100644
--- a/src/Spectron/Input/KeyboardHook.cs
+++ b/src/Spectron/Input/KeyboardHook.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using OldBit.Spectron.Emulation.Devices.Joystick;
 using OldBit.Spectron.Emulation.Devices.Keyboard;
+using OldBit.Spectron.Settings;
 using SharpHook;
 using SharpHook.Data;
 using SharpHook.Reactive;
@@ -16,6 +17,7 @@ public sealed class KeyboardHook : IDisposable
 
     private KeyCode _capsShift = KeyCode.VcLeftShift;
     private KeyCode _symbolShift = KeyCode.VcRightAlt;
+    private bool _shouldHandleExtendedKeys;
 
     private bool _isShiftPressed;
     private bool _isMetaKeyPressed;
@@ -52,7 +54,7 @@ private void KeyPressed(KeyboardHookEventArgs e)
         {
             SpectrumKeyPressed?.Invoke(this, new SpectrumKeyEventArgs(spectrumKeys, e.Data.KeyCode, isKeyPressed: true));
         }
-        else
+        else if (_shouldHandleExtendedKeys)
         {
             switch (e.Data.KeyCode)
             {
@@ -91,7 +93,7 @@ private void KeyReleased(KeyboardHookEventArgs e)
         {
             SpectrumKeyReleased?.Invoke(this, new SpectrumKeyEventArgs(spectrumKeys, e.Data.KeyCode, isKeyPressed: false));
         }
-        else
+        else if (_shouldHandleExtendedKeys)
         {
             switch (e.Data.KeyCode)
             {
@@ -152,7 +154,7 @@ private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode)
             return [SpectrumKey.SymbolShift];
         }
 
-        return keyCode switch
+        List<SpectrumKey> keys = keyCode switch
         {
             KeyCode.Vc0 => [SpectrumKey.D0],
             KeyCode.Vc1 => [SpectrumKey.D1],
@@ -192,43 +194,54 @@ private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode)
             KeyCode.VcZ => [SpectrumKey.Z],
             KeyCode.VcEnter => [SpectrumKey.Enter],
             KeyCode.VcSpace => [SpectrumKey.Space],
-            KeyCode.VcBackspace => [SpectrumKey.None, SpectrumKey.CapsShift, SpectrumKey.D0],
-            KeyCode.VcEscape => [SpectrumKey.None],
-            KeyCode.VcComma => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.N]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.R],
-            KeyCode.VcPeriod => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.M]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.T],
-            KeyCode.VcSemicolon => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.O]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.Z],
-            KeyCode.VcSlash => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.V]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.C],
-            KeyCode.VcQuote => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.P]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D7],
-            KeyCode.VcEquals => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.L]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.K],
-            KeyCode.VcMinus => !_isShiftPressed
-                ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.J]
-                : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D0],
-            KeyCode.VcLeft => [SpectrumKey.CapsShift, SpectrumKey.D5],
-            KeyCode.VcDown => [SpectrumKey.CapsShift, SpectrumKey.D6],
-            KeyCode.VcUp => [SpectrumKey.CapsShift, SpectrumKey.D7],
-            KeyCode.VcRight => [SpectrumKey.CapsShift, SpectrumKey.D8],
             _ => []
         };
+
+        if (keys.Count == 0 && _shouldHandleExtendedKeys)
+        {
+            keys = keyCode switch
+            {
+                KeyCode.VcBackspace => [SpectrumKey.None, SpectrumKey.CapsShift, SpectrumKey.D0],
+                KeyCode.VcEscape => [SpectrumKey.None],
+                KeyCode.VcComma => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.N]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.R],
+                KeyCode.VcPeriod => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.M]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.T],
+                KeyCode.VcSemicolon => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.O]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.Z],
+                KeyCode.VcSlash => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.V]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.C],
+                KeyCode.VcQuote => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.P]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D7],
+                KeyCode.VcEquals => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.L]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.K],
+                KeyCode.VcMinus => !_isShiftPressed
+                    ? [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.J]
+                    : [SpectrumKey.None, SpectrumKey.SymbolShift, SpectrumKey.D0],
+                KeyCode.VcLeft => [SpectrumKey.CapsShift, SpectrumKey.D5],
+                KeyCode.VcDown => [SpectrumKey.CapsShift, SpectrumKey.D6],
+                KeyCode.VcUp => [SpectrumKey.CapsShift, SpectrumKey.D7],
+                KeyCode.VcRight => [SpectrumKey.CapsShift, SpectrumKey.D8],
+                _ => []
+            };
+        }
+
+        return keys;
     }
 
     private static bool IsMetaKey(KeyCode keyCode) => keyCode == KeyCode.VcLeftMeta || keyCode == KeyCode.VcRightMeta;
 
-    public void UpdateShiftKeys(KeyCode capsShift, KeyCode symbolShift)
+    public void UpdateSettings(KeyboardSettings  keyboardSettings)
     {
-        _capsShift = capsShift;
-        _symbolShift = symbolShift;
+        _capsShift = keyboardSettings.CapsShiftKey;
+        _symbolShift = keyboardSettings.SymbolShiftKey;
+        _shouldHandleExtendedKeys  = keyboardSettings.ShouldHandleExtendedKeys;
     }
 
     public static JoystickInput ToJoystickAction(KeyCode keyCode, KeyCode fireKey) => keyCode switch
diff --git a/src/Spectron/Settings/KeyboardSettings.cs b/src/Spectron/Settings/KeyboardSettings.cs
index 8e77b644..f454f615 100644
--- a/src/Spectron/Settings/KeyboardSettings.cs
+++ b/src/Spectron/Settings/KeyboardSettings.cs
@@ -5,5 +5,8 @@ namespace OldBit.Spectron.Settings;
 public record KeyboardSettings
 {
     public KeyCode CapsShiftKey { get; init; } = KeyCode.VcLeftShift;
+
     public KeyCode SymbolShiftKey { get; init; } = KeyCode.VcRightAlt;
+
+    public bool ShouldHandleExtendedKeys  { get; init; } = true;
 }
\ No newline at end of file
diff --git a/src/Spectron/ViewModels/MainWindowViewModel.Input.cs b/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
index 6cf37423..eccfc914 100644
--- a/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
+++ b/src/Spectron/ViewModels/MainWindowViewModel.Input.cs
@@ -68,9 +68,7 @@ private void HandleSpectrumKeyReleased(object? sender, SpectrumKeyEventArgs e)
         Emulator?.KeyboardState.KeyUp(e.Keys);
     }
 
-    private void UpdateShiftKeys(KeyboardSettings settings) => _keyboardHook.UpdateShiftKeys(
-        settings.CapsShiftKey,
-        settings.SymbolShiftKey);
+    private void UpdateShiftKeys(KeyboardSettings settings) => _keyboardHook.UpdateSettings(settings);
 
     private bool JoystickHandled(SpectrumKeyEventArgs e)
     {
diff --git a/src/Spectron/ViewModels/PreferencesViewModel.cs b/src/Spectron/ViewModels/PreferencesViewModel.cs
index d31e9175..8a0cc746 100644
--- a/src/Spectron/ViewModels/PreferencesViewModel.cs
+++ b/src/Spectron/ViewModels/PreferencesViewModel.cs
@@ -64,6 +64,7 @@ public PreferencesViewModel(Preferences preferences, GamepadManager gamepadManag
 
         CapsShiftKey = preferences.Keyboard.CapsShiftKey;
         SymbolShiftKey = preferences.Keyboard.SymbolShiftKey;
+        ShouldHandleExtendedKeys  = preferences.Keyboard.ShouldHandleExtendedKeys;
 
         MouseType = preferences.Mouse.MouseType;
         IsStandardMousePointerHidden = preferences.Mouse.IsStandardMousePointerHidden;
@@ -138,6 +139,7 @@ private void UpdatePreferences()
             {
                 CapsShiftKey = CapsShiftKey,
                 SymbolShiftKey = SymbolShiftKey,
+                ShouldHandleExtendedKeys = ShouldHandleExtendedKeys,
             },
 
             Joystick = new JoystickSettings
@@ -509,6 +511,9 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
     [CustomValidation(typeof(PreferencesViewModel), nameof(ValidateKeyboardMapping))]
     private KeyCode _capsShiftKey = KeyCode.VcLeftShift;
 
+    [ObservableProperty]
+    private bool _shouldHandleExtendedKeys = true;
+
     [ObservableProperty]
     private KeyCode _fireKey = KeyCode.VcSpace;
 
diff --git a/src/Spectron/Views/MainWindow.axaml b/src/Spectron/Views/MainWindow.axaml
index f5cc6a0e..641d18d1 100644
--- a/src/Spectron/Views/MainWindow.axaml
+++ b/src/Spectron/Views/MainWindow.axaml
@@ -63,6 +63,7 @@
         <Grid ColumnDefinitions="40,*,40"
             RowDefinitions="*,Auto"
             Focusable="True"
+            IsTabStop="True"
             FocusAdorner="{x:Null}">
 
             <controls:MainToolbar
diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index 10c27143..fd717f9a 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -56,12 +56,14 @@
                             <RadioButton Content="Dark" IsChecked="{Binding Theme, Converter={StaticResource ValueEqualityConverter}, ConverterParameter={x:Static theming:Theme.Dark}}"/>
                             <RadioButton Content="Light" IsChecked="{Binding Theme, Converter={StaticResource ValueEqualityConverter}, ConverterParameter={x:Static theming:Theme.Light}}" Margin="10 0 0 0"/>
                         </StackPanel>
+
                         <controls:HeaderSeparator Text="Startup"/>
                         <CheckBox x:Name="SaveState" Content="Save / Load state on exit" ToolTip.Tip="Saves emulator state as a snapshot on exit and loads it when application starts" Classes="Center" Margin="10 0 0 0" IsChecked="{Binding IsResumeEnabled}"/>
                         <CheckBox Content="Include current tape" ToolTip.Tip="When saving current state, tape contents will be also saved and restored" Classes="Center" Margin="35 0 0 0" IsEnabled="{Binding #SaveState.IsChecked}" IsChecked="{Binding ShouldIncludeTapeInResume}"/>
                         <CheckBox Content="Include time machine state" ToolTip.Tip="When saving current state, time machine state will be also saved and restored" Classes="Center" Margin="35 0 0 0" IsEnabled="{Binding #SaveState.IsChecked}" IsChecked="{Binding ShouldIncludeTimeMachineInResume}"/>
+
                         <controls:HeaderSeparator Text="Misc"/>
-                        <CheckBox Content="Automatically load .POK file" ToolTip.Tip="If matching .POK file is present, it will be loaded automatically" Classes="Center" Margin="10 0 0 0"  IsChecked="{Binding IsAutoLoadPokeFilesEnabled}"/>
+                        <CheckBox Content="Automatically load trainer .POK file" ToolTip.Tip="If matching .POK file is present, it will be loaded automatically" Classes="Center" Margin="10 0 0 0"  IsChecked="{Binding IsAutoLoadPokeFilesEnabled}"/>
                     </StackPanel>
                 </Border>
             </TabItem>
@@ -166,52 +168,59 @@
                 <Border Classes="Tab">
                     <TabControl TabStripPlacement="Top">
                         <TabItem Header="Keyboard">
-                            <StackPanel>
-                                <Grid ColumnDefinitions="140,*" RowDefinitions="40,40,*">
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Text="Caps Shift"
-                                        VerticalAlignment="Center"
-                                        Classes="Center"/>
+                            <Grid ColumnDefinitions="140,*" RowDefinitions="40,40,40,*">
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Text="Caps Shift"
+                                    VerticalAlignment="Center"
+                                    Classes="Center"/>
 
-                                    <ComboBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="5 0 0 0"
-                                        Width="150"
-                                        ItemsSource="{Binding ShiftKeys}"
-                                        SelectedValue="{Binding CapsShiftKey}"
-                                        DisplayMemberBinding="{Binding Name}"
-                                        SelectedValueBinding="{Binding Value}"/>
+                                <ComboBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="5 0 0 0"
+                                    Width="150"
+                                    ItemsSource="{Binding ShiftKeys}"
+                                    SelectedValue="{Binding CapsShiftKey}"
+                                    DisplayMemberBinding="{Binding Name}"
+                                    SelectedValueBinding="{Binding Value}"/>
 
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Text="Symbol Shift"
-                                        VerticalAlignment="Center"
-                                        Classes="Center"/>
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Text="Symbol Shift"
+                                    VerticalAlignment="Center"
+                                    Classes="Center"/>
 
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="5 0 0 0"
-                                        Width="150"
-                                        ItemsSource="{Binding ShiftKeys}"
-                                        SelectedValue="{Binding SymbolShiftKey}"
-                                        DisplayMemberBinding="{Binding Name}"
-                                        SelectedValueBinding="{Binding Value}"/>
+                                <ComboBox
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="5 0 0 0"
+                                    Width="150"
+                                    ItemsSource="{Binding ShiftKeys}"
+                                    SelectedValue="{Binding SymbolShiftKey}"
+                                    DisplayMemberBinding="{Binding Name}"
+                                    SelectedValueBinding="{Binding Value}"/>
 
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Margin="10"
-                                        Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
-                                        VerticalAlignment="Stretch"
-                                        TextWrapping="Wrap"
-                                        Text="{Binding ValidationSummary}"/>
-                                </Grid>
-                            </StackPanel>
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Margin="10"
+                                    Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                                    VerticalAlignment="Stretch"
+                                    TextWrapping="Wrap"
+                                    Text="{Binding ValidationSummary}"/>
+
+                                <CheckBox
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Content="Simulate standard keyboard keys as Spectrum keys"
+                                    ToolTip.Tip="Keys like cursor arrows, backspace, brackets, comma, period etc will be translated to corresponding Spectrum key combination"
+                                    Margin="5 0 0 0"
+                                    Classes="Center"
+                                    IsChecked="{Binding ShouldHandleExtendedKeys}"/>
+                            </Grid>
                         </TabItem>
                         <TabItem Header="Joystick">
                             <Grid RowDefinitions="Auto,*">

From a9de65b239792a14a7c77ec9eacd7d10b84f18c0 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 20:15:38 +0100
Subject: [PATCH 07/11] Remove unused Settings menu item and related event
 handler.

---
 src/Spectron/App.axaml    |  2 --
 src/Spectron/App.axaml.cs | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/src/Spectron/App.axaml b/src/Spectron/App.axaml
index 208ede6a..cd8d3809 100644
--- a/src/Spectron/App.axaml
+++ b/src/Spectron/App.axaml
@@ -8,8 +8,6 @@
     <NativeMenu.Menu>
         <NativeMenu>
             <NativeMenuItem Header="About Spectron" Click="AboutMenuItem_OnClick" />
-            <NativeMenuItemSeparator/>
-            <NativeMenuItem Header="Settings..." Gesture="Cmd+," Click="SettingsMenuItem_OnClick"/>
         </NativeMenu>
     </NativeMenu.Menu>
 
diff --git a/src/Spectron/App.axaml.cs b/src/Spectron/App.axaml.cs
index 50b1b1b7..64590769 100644
--- a/src/Spectron/App.axaml.cs
+++ b/src/Spectron/App.axaml.cs
@@ -60,14 +60,4 @@ private void AboutMenuItem_OnClick(object? sender, EventArgs e)
         var aboutView = new AboutView();
         aboutView.ShowDialog(MainWindow);
     }
-
-    private void SettingsMenuItem_OnClick(object? sender, EventArgs e)
-    {
-        if (MainWindow == null)
-        {
-            return;
-        }
-
-        MainWindowViewModel?.OpenPreferencesWindow();
-    }
 }
\ No newline at end of file

From 0c7947729c72eef69543c486deadb9d2b6bf985c Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 20:27:57 +0100
Subject: [PATCH 08/11] Set minimum dimensions for MainWindow and adjust layout
 for improved alignment.

---
 src/Spectron/Views/MainWindow.axaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Spectron/Views/MainWindow.axaml b/src/Spectron/Views/MainWindow.axaml
index 641d18d1..2ac1b471 100644
--- a/src/Spectron/Views/MainWindow.axaml
+++ b/src/Spectron/Views/MainWindow.axaml
@@ -11,6 +11,8 @@
         x:DataType="viewModels:MainWindowViewModel"
         Icon="/Assets/spectron.ico"
         Title="{Binding Title}"
+        MinHeight="500"
+        MinWidth="650"
         Width="1024" Height="768"
         WindowStartupLocation="CenterScreen"
         WindowState="{Binding WindowState}"
@@ -32,12 +34,6 @@
         <converters:ValueInequalityConverter x:Key="ValueInequalityConverter"/>
     </Window.Resources>
 
-    <Window.Styles>
-        <Style Selector="MenuItem">
-            <Setter Property="Padding" Value="10 8 10 8"/>
-        </Style>
-    </Window.Styles>
-
     <Window.KeyBindings>
         <KeyBinding Gesture="{OnPlatform Ctrl+O, macOS=Cmd+O}" Command="{Binding LoadFileCommand}"/>
         <KeyBinding Gesture="{OnPlatform Ctrl+S, macOS=Cmd+S}" Command="{Binding SaveFileCommand}"/>
@@ -72,13 +68,13 @@
                 DockPanel.Dock="Top"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Margin="6 10 0 0"
+                Margin="6 0 6 0"
                 DataContext="{Binding}"
                 Width="30"/>
 
             <Border Grid.Row="0" Grid.Column="1">
                 <Grid>
-                    <Border CornerRadius="15" HorizontalAlignment="Center" ClipToBounds="True">
+                    <Border CornerRadius="15" HorizontalAlignment="Center" VerticalAlignment="Center" ClipToBounds="True">
                         <Grid>
                             <Image
                                 x:Name="ScreenImage"

From 3d56a3f0cd1a365ce29add37c1540934c5f2e2f3 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 20:51:31 +0100
Subject: [PATCH 09/11] Update MainMenu padding, refactor pointer event
 handlers, and remove unused PreferencesView property.

---
 src/Spectron/Controls/MainMenu.axaml     | 6 ++++++
 src/Spectron/Views/MainWindow.axaml      | 6 +++---
 src/Spectron/Views/MainWindow.axaml.cs   | 6 +++---
 src/Spectron/Views/PreferencesView.axaml | 1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Spectron/Controls/MainMenu.axaml b/src/Spectron/Controls/MainMenu.axaml
index 60ecfebf..3dcc9e18 100644
--- a/src/Spectron/Controls/MainMenu.axaml
+++ b/src/Spectron/Controls/MainMenu.axaml
@@ -18,6 +18,12 @@
         <converters:ValueEqualityConverter x:Key="ValueEqualityConverter"/>
     </UserControl.Resources>
 
+    <UserControl.Styles>
+        <Style Selector="MenuItem">
+            <Setter Property="Padding" Value="10 6 10 6"/>
+        </Style>
+    </UserControl.Styles>
+
     <Menu Focusable="False">
         <MenuItem Header="File" Padding="10 0 10 0" IsTabStop="False" Focusable="False">
             <MenuItem Header="Load..." InputGesture="{OnPlatform Ctrl+O, macOS=Cmd+O}" Command="{Binding LoadFileCommand}"/>
diff --git a/src/Spectron/Views/MainWindow.axaml b/src/Spectron/Views/MainWindow.axaml
index 2ac1b471..2974f8e3 100644
--- a/src/Spectron/Views/MainWindow.axaml
+++ b/src/Spectron/Views/MainWindow.axaml
@@ -81,9 +81,9 @@
                                 Source="{Binding SpectrumScreen}"
                                 Stretch="Uniform"
                                 Cursor="{Binding MouseCursor}"
-                                PointerMoved="InputElement_OnPointerMoved"
-                                PointerPressed="InputElement_OnPointerPressed"
-                                PointerReleased="InputElement_OnPointerReleased"
+                                PointerMoved="Screen_OnPointerMoved"
+                                PointerPressed="Screen_OnPointerPressed"
+                                PointerReleased="Screen_OnPointerReleased"
                                 Classes.IsPaused="{Binding IsPauseOverlayVisible}">
                                 <Image.Styles>
                                     <Style Selector="Image.IsPaused">
diff --git a/src/Spectron/Views/MainWindow.axaml.cs b/src/Spectron/Views/MainWindow.axaml.cs
index 6d0b5959..1baf0c1a 100644
--- a/src/Spectron/Views/MainWindow.axaml.cs
+++ b/src/Spectron/Views/MainWindow.axaml.cs
@@ -148,7 +148,7 @@ protected override void OnDataContextChanged(EventArgs e)
         viewModel.NotificationManager = NotificationManager;
     }
 
-    private void InputElement_OnPointerMoved(object? sender, PointerEventArgs e)
+    private void Screen_OnPointerMoved(object? sender, PointerEventArgs e)
     {
         var position = e.GetCurrentPoint(ScreenImage).Position;
         var bounds = ScreenImage.Bounds;
@@ -156,7 +156,7 @@ private void InputElement_OnPointerMoved(object? sender, PointerEventArgs e)
         _viewModel?.HandleMouseMoved(position, bounds);
     }
 
-    private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    private void Screen_OnPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         var point = e.GetCurrentPoint(ScreenImage);
         var bounds = ScreenImage.Bounds;
@@ -164,7 +164,7 @@ private void InputElement_OnPointerPressed(object? sender, PointerPressedEventAr
         _viewModel?.HandleMouseButtonStateChanged(point, bounds);
     }
 
-    private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
+    private void Screen_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
     {
         var point = e.GetCurrentPoint(ScreenImage);
         var bounds = ScreenImage.Bounds;
diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index fd717f9a..a06c7548 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -14,7 +14,6 @@
         Width="850"
         Height="600"
         WindowStartupLocation="CenterOwner"
-        Focusable="True"
         CanResize="False"
         Title="Preferences">
 

From 69b1c25a53c448a3f3a4a0acdeeefd242f6e09a8 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Thu, 26 Jun 2025 21:17:29 +0100
Subject: [PATCH 10/11] Change `OpenPreferencesWindow` method from public to
 private in `MainWindowViewModel`.

---
 src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs b/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
index df6300ba..8716b621 100644
--- a/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
+++ b/src/Spectron/ViewModels/MainWindowViewModel.Dialogs.cs
@@ -10,7 +10,7 @@ namespace OldBit.Spectron.ViewModels;
 
 partial class MainWindowViewModel
 {
-    public async Task OpenPreferencesWindow()
+    private async Task OpenPreferencesWindow()
     {
         var resumeAfter = false;
 

From e48ff8b56e041fd8d9a7d860b456f597b0ea0220 Mon Sep 17 00:00:00 2001
From: voytas <voytas@outlook.com>
Date: Fri, 27 Jun 2025 21:44:06 +0100
Subject: [PATCH 11/11] Refactor PreferencesView layout and enhance keyboard
 handling logic in KeyboardHook.

---
 src/Spectron/Input/KeyboardHook.cs            | 92 +++++++++++++------
 .../ViewModels/PreferencesViewModel.cs        |  6 ++
 src/Spectron/Views/MainWindow.axaml.cs        | 15 ++-
 src/Spectron/Views/PreferencesView.axaml      | 30 ++++--
 4 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/src/Spectron/Input/KeyboardHook.cs b/src/Spectron/Input/KeyboardHook.cs
index 444633e0..23d247dc 100644
--- a/src/Spectron/Input/KeyboardHook.cs
+++ b/src/Spectron/Input/KeyboardHook.cs
@@ -47,16 +47,62 @@ private void KeyPressed(KeyboardHookEventArgs e)
         }
 
         HandleShiftState(e, isPressed: true);
+        HandleKeyEvent(e, isPressed: true);
+    }
 
+    private void KeyReleased(KeyboardHookEventArgs e)
+    {
+        if (IsMetaKey(e.Data.KeyCode))
+        {
+            _isMetaKeyPressed = false;
+            return;
+        }
+
+        HandleShiftState(e, isPressed: false);
+        HandleKeyEvent(e, isPressed: false);
+    }
+
+    private void HandleKeyEvent(KeyboardHookEventArgs e, bool isPressed)
+    {
         var spectrumKeys = ToSpectrumKeySequence(e.Data.KeyCode);
 
         if (spectrumKeys.Count > 0)
         {
-            SpectrumKeyPressed?.Invoke(this, new SpectrumKeyEventArgs(spectrumKeys, e.Data.KeyCode, isKeyPressed: true));
+            var eventArgs = new SpectrumKeyEventArgs(spectrumKeys, e.Data.KeyCode, isPressed);
+
+            if (isPressed)
+            {
+                SpectrumKeyPressed?.Invoke(this, eventArgs);
+            }
+            else
+            {
+                SpectrumKeyReleased?.Invoke(this, eventArgs);
+            }
         }
         else if (_shouldHandleExtendedKeys)
         {
-            switch (e.Data.KeyCode)
+            HandleExtendedKey(e.Data.KeyCode, isPressed);
+        }
+        else
+        {
+            var eventArgs = new SpectrumKeyEventArgs([], e.Data.KeyCode, isPressed);
+
+            if (isPressed)
+            {
+                SpectrumKeyPressed?.Invoke(this, eventArgs);
+            }
+            else
+            {
+                SpectrumKeyReleased?.Invoke(this, eventArgs);
+            }
+        }
+    }
+
+    private void HandleExtendedKey(KeyCode keyCode, bool isPressed)
+    {
+        if (isPressed)
+        {
+            switch (keyCode)
             {
                 case KeyCode.VcOpenBracket:
                     SendExtendedModeKey(!_isShiftPressed ? KeyCode.VcY : KeyCode.VcF);
@@ -73,29 +119,15 @@ private void KeyPressed(KeyboardHookEventArgs e)
                 case KeyCode.VcBackslash:
                     SendExtendedModeKey(!_isShiftPressed ? KeyCode.VcD : KeyCode.VcS);
                     break;
-            }
-        }
-    }
-
-    private void KeyReleased(KeyboardHookEventArgs e)
-    {
-        if (IsMetaKey(e.Data.KeyCode))
-        {
-            _isMetaKeyPressed = false;
-            return;
-        }
-
-        HandleShiftState(e, isPressed: false);
 
-        var spectrumKeys = ToSpectrumKeySequence(e.Data.KeyCode);
-
-        if (spectrumKeys.Count > 0)
-        {
-            SpectrumKeyReleased?.Invoke(this, new SpectrumKeyEventArgs(spectrumKeys, e.Data.KeyCode, isKeyPressed: false));
+                default:
+                    SpectrumKeyPressed?.Invoke(this, new SpectrumKeyEventArgs([], keyCode, isPressed));
+                    break;
+            }
         }
-        else if (_shouldHandleExtendedKeys)
+        else
         {
-            switch (e.Data.KeyCode)
+            switch (keyCode)
             {
                 case KeyCode.VcOpenBracket:
                     _simulator.SimulateKeyRelease(KeyCode.VcY);
@@ -115,6 +147,10 @@ private void KeyReleased(KeyboardHookEventArgs e)
                     _simulator.SimulateKeyRelease(KeyCode.VcD);
                     _simulator.SimulateKeyRelease(KeyCode.VcS);
                     break;
+
+                default:
+                    SpectrumKeyReleased?.Invoke(this, new SpectrumKeyEventArgs([], keyCode, isPressed));
+                    break;
             }
         }
     }
@@ -129,8 +165,12 @@ private void SendExtendedModeKey(KeyCode keyCode)
         {
             _simulator.SimulateKeyRelease(_capsShift);
 
-            Task.Delay(5).ContinueWith(_ =>
-                _simulator.SimulateKeyPress(keyCode));
+            Task.Delay(5)
+                .ContinueWith(_ =>
+                {
+                    _simulator.SimulateKeyPress(keyCode);
+                    Task.Delay(30).ContinueWith(_ => _simulator.SimulateKeyRelease(_symbolShift));
+                });
         });
     }
 
@@ -235,7 +275,7 @@ private List<SpectrumKey> ToSpectrumKeySequence(KeyCode keyCode)
         return keys;
     }
 
-    private static bool IsMetaKey(KeyCode keyCode) => keyCode == KeyCode.VcLeftMeta || keyCode == KeyCode.VcRightMeta;
+    private static bool IsMetaKey(KeyCode keyCode) => keyCode is KeyCode.VcLeftMeta or KeyCode.VcRightMeta;
 
     public void UpdateSettings(KeyboardSettings  keyboardSettings)
     {
@@ -244,7 +284,7 @@ public void UpdateSettings(KeyboardSettings  keyboardSettings)
         _shouldHandleExtendedKeys  = keyboardSettings.ShouldHandleExtendedKeys;
     }
 
-    public static JoystickInput ToJoystickAction(KeyCode keyCode, KeyCode fireKey) => keyCode switch
+    public static JoystickInput ToJoystickAction(KeyCode keyCode, KeyCode fireKey) =>keyCode switch
     {
         KeyCode.VcLeft => JoystickInput.Left,
         KeyCode.VcRight => JoystickInput.Right,
diff --git a/src/Spectron/ViewModels/PreferencesViewModel.cs b/src/Spectron/ViewModels/PreferencesViewModel.cs
index 8a0cc746..319fdbe7 100644
--- a/src/Spectron/ViewModels/PreferencesViewModel.cs
+++ b/src/Spectron/ViewModels/PreferencesViewModel.cs
@@ -385,6 +385,12 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
 
     public List<NameValuePair<KeyCode>> FireKeys { get; } =
     [
+        new("Left Shift", KeyCode.VcLeftShift),
+        new("Right Shift", KeyCode.VcRightShift),
+        new("Left Control", KeyCode.VcLeftControl),
+        new("Right Control", KeyCode.VcRightControl),
+        new(OperatingSystem.IsMacOS() ? "Left Option" : "Left Alt", KeyCode.VcLeftAlt),
+        new(OperatingSystem.IsMacOS() ? "Right Option" : "Right Alt", KeyCode.VcRightAlt),
         new("Space", KeyCode.VcSpace),
         new("Tab", KeyCode.VcTab),
         new("Enter", KeyCode.VcEnter),
diff --git a/src/Spectron/Views/MainWindow.axaml.cs b/src/Spectron/Views/MainWindow.axaml.cs
index 1baf0c1a..24cecb3c 100644
--- a/src/Spectron/Views/MainWindow.axaml.cs
+++ b/src/Spectron/Views/MainWindow.axaml.cs
@@ -78,9 +78,22 @@ public MainWindow()
 
     private static async Task<TResponse?> ShowDialog<TView, TResponse>(Window owner, object? viewModel = null) where TView : Window, new()
     {
+        // Workaround for tooltips not always showing in the opened dialog window
+        owner.IsHitTestVisible = false;
+
         var view = new TView { DataContext = viewModel };
 
-        var result = await view.ShowDialog<TResponse?>(owner);
+        TResponse? result;
+
+        try
+        {
+            result = await view.ShowDialog<TResponse?>(owner);
+        }
+        finally
+        {
+            owner.IsHitTestVisible = true;
+        }
+
 
         if (viewModel is IDisposable disposable)
         {
diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index a06c7548..d8fd6c6b 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -214,8 +214,8 @@
                                 <CheckBox
                                     Grid.Row="2"
                                     Grid.Column="1"
-                                    Content="Simulate standard keyboard keys as Spectrum keys"
-                                    ToolTip.Tip="Keys like cursor arrows, backspace, brackets, comma, period etc will be translated to corresponding Spectrum key combination"
+                                    Content="Enable extra keys in the emulator"
+                                    ToolTip.Tip="Keys like arrows, backspace, brackets, comma, period etc will be translated to the corresponding Spectrum key"
                                     Margin="5 0 0 0"
                                     Classes="Center"
                                     IsChecked="{Binding ShouldHandleExtendedKeys}"/>
@@ -223,7 +223,7 @@
                         </TabItem>
                         <TabItem Header="Joystick">
                             <Grid RowDefinitions="Auto,*">
-                                <Grid ColumnDefinitions="140,300" RowDefinitions="40,40,40">
+                                <Grid ColumnDefinitions="140,300" RowDefinitions="40,40,40,40">
                                     <TextBlock
                                         Text="Gamepad"
                                         VerticalAlignment="Center"
@@ -254,17 +254,27 @@
                                         SelectedValue="{Binding JoystickType}"
                                         DisplayMemberBinding="{Binding Name}"
                                         SelectedValueBinding="{Binding Value}"/>
-                                    <StackPanel
+
+                                    <CheckBox
                                         Grid.Row="2"
                                         Grid.Column="1"
+                                        Content="Use keyboard (← ↑ ↓ →)"
+                                        Margin="5 0 0 0"
+                                        VerticalAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        IsChecked="{Binding EmulateUsingKeyboard}"
+                                        IsEnabled="{Binding #Joystick.SelectedIndex}"/>
+
+                                    <StackPanel
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        Margin="35 0 0 0"
                                         Orientation="Horizontal">
-                                        <CheckBox
-                                            Content="Use keyboard (← ↑ ↓ →). Fire key:"
-                                            Margin="5 0 0 0"
+
+                                        <TextBlock
                                             VerticalAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            IsChecked="{Binding EmulateUsingKeyboard}"
-                                            IsEnabled="{Binding #Joystick.SelectedIndex}"/>
+                                            Text="Fire"/>
+
                                         <ComboBox
                                             Margin="15 0 0 0"
                                             Width="120"