From 30598d0e8710f687d4f9b5ce545321543b8139c4 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 15 Oct 2025 13:00:06 -0700
Subject: [PATCH 01/44] Add DevWinUI

---
 FluentAutoClicker/FluentAutoClicker.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FluentAutoClicker/FluentAutoClicker.csproj b/FluentAutoClicker/FluentAutoClicker.csproj
index c57ef56a..5456d789 100644
--- a/FluentAutoClicker/FluentAutoClicker.csproj
+++ b/FluentAutoClicker/FluentAutoClicker.csproj
@@ -36,6 +36,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DevWinUI.Controls" Version="9.1.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.213">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 31719ccfa9bc11318260cbcef7257a235e141ac4 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 15 Oct 2025 13:06:14 -0700
Subject: [PATCH 02/44] Remove preset hotkey logic

---
 FluentAutoClicker/MainPage.xaml.cs | 41 ------------------------------
 1 file changed, 41 deletions(-)

diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index 93aa81bd..868d6a53 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -50,11 +50,6 @@ public MainPage()
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the hotkey is registered.
-    /// </summary>
-    private bool IsHotKeyRegistered { get; set; }
-
     /// <summary>
     /// Handles the Loaded event of the MainPage control.
     /// </summary>
@@ -64,42 +59,6 @@ private async void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
-
-        // Prevent registering multiple hotkeys
-        if (IsHotKeyRegistered)
-        {
-            return;
-        }
-
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
-
-        // Set up window message monitor
-        WindowMessageMonitor monitor = new(window);
-        monitor.WindowMessageReceived += OnWindowMessageReceived;
-
-        // Register hotkey
-        bool success = PInvoke.RegisterHotKey(hWnd, 0x0000, HOT_KEY_MODIFIERS.MOD_NOREPEAT, 0x75); // F6
-        if (success)
-        {
-            IsHotKeyRegistered = true;
-        }
-        else
-        {
-            ContentDialog dialog = new()
-            {
-                // XamlRoot must be set in the case of a ContentDialog running in a Desktop app
-                XamlRoot = XamlRoot,
-                Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style,
-                Title = "Failed to register hotkey",
-                Content = "Please modify the hotkey setting.",
-                CloseButtonText = "OK",
-                DefaultButton = ContentDialogButton.Primary
-            };
-
-            _ = await dialog.ShowAsync();
-        }
     }
 
     /// <summary>

From b0ea013b5453d691efe077750fa29d28636eda83 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 15 Oct 2025 13:12:03 -0700
Subject: [PATCH 03/44] Use DevWinUI.Controls IsEnabledTextBlock

---
 .../IsEnabledTextBlock/IsEnabledTextBlock.cs  | 89 -------------------
 .../IsEnabledTextBlock.xaml                   | 35 --------
 FluentAutoClicker/MainPage.xaml               |  5 +-
 FluentAutoClicker/Themes/Generic.xaml         |  6 --
 4 files changed, 3 insertions(+), 132 deletions(-)
 delete mode 100644 FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
 delete mode 100644 FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
 delete mode 100644 FluentAutoClicker/Themes/Generic.xaml

diff --git a/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs b/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
deleted file mode 100644
index a7a56ccc..00000000
--- a/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (C) 2025 Ryan Luu
-//
-// This file is part of Fluent Auto Clicker.
-//
-// Fluent Auto Clicker is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Fluent Auto Clicker is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with Fluent Auto Clicker. If not, see <https://www.gnu.org/licenses/>.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using System.ComponentModel;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace FluentAutoClicker.Controls;
-
-/// <summary>
-/// A custom control that displays text and changes its visual state based on its enabled state.
-/// </summary>
-[TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
-[TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
-public partial class IsEnabledTextBlock : Control
-{
-    /// <summary>
-    /// Identifies the <see cref="Text" /> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-        "Text",
-        typeof(string),
-        typeof(IsEnabledTextBlock),
-        null);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="IsEnabledTextBlock" /> class.
-    /// </summary>
-    public IsEnabledTextBlock()
-    {
-        DefaultStyleKey = typeof(IsEnabledTextBlock);
-    }
-
-    /// <summary>
-    /// Gets or sets the text content of the control.
-    /// </summary>
-    [Localizable(true)]
-    public string Text
-    {
-        get => (string)GetValue(TextProperty);
-        set => SetValue(TextProperty, value);
-    }
-
-    /// <summary>
-    /// Applies the control template and sets up the initial visual state.
-    /// </summary>
-    protected override void OnApplyTemplate()
-    {
-        IsEnabledChanged -= IsEnabledTextBlock_IsEnabledChanged;
-        SetEnabledState();
-        IsEnabledChanged += IsEnabledTextBlock_IsEnabledChanged;
-        base.OnApplyTemplate();
-    }
-
-    /// <summary>
-    /// Handles the IsEnabledChanged event and updates the visual state.
-    /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
-    private void IsEnabledTextBlock_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
-    {
-        SetEnabledState();
-    }
-
-    /// <summary>
-    /// Sets the visual state of the control based on its enabled state.
-    /// </summary>
-    private void SetEnabledState()
-    {
-        _ = VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
-    }
-}
\ No newline at end of file
diff --git a/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml b/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
deleted file mode 100644
index ec41958d..00000000
--- a/FluentAutoClicker/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:FluentAutoClicker.Controls">
-
-    <Style TargetType="local:IsEnabledTextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:IsEnabledTextBlock">
-                    <Grid>
-                        <TextBlock
-                            x:Name="Label"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Text="{TemplateBinding Text}"
-                            TextWrapping="WrapWholeWords" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="Label.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 3499ce1c..638b9b78 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -7,6 +7,7 @@
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:controls="using:FluentAutoClicker.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
     xmlns:helpers="using:FluentAutoClicker.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -40,7 +41,7 @@
 
         <!--  Click Interval  -->
         <StackPanel Grid.ColumnSpan="2" Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock x:Name="ClickIntervalTextBlock" x:Uid="TextBlockClickInterval" />
+            <dev:IsEnabledTextBlock x:Name="ClickIntervalTextBlock" x:Uid="TextBlockClickInterval" />
             <Grid ColumnSpacing="{StaticResource NumberBoxColumnSpacing}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
@@ -103,7 +104,7 @@
             Grid.Row="2"
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
+            <dev:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
             <Button Content="F6" IsEnabled="False" />
         </StackPanel>
 
diff --git a/FluentAutoClicker/Themes/Generic.xaml b/FluentAutoClicker/Themes/Generic.xaml
deleted file mode 100644
index d7756fcf..00000000
--- a/FluentAutoClicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>

From 15fe1468b332a52aa39a2078d300850f078b03ad Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 15 Oct 2025 13:15:10 -0700
Subject: [PATCH 04/44] Remove control namespace

---
 FluentAutoClicker/MainPage.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 638b9b78..737c83a1 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -5,7 +5,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:controls="using:FluentAutoClicker.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dev="using:DevWinUI"
     xmlns:helpers="using:FluentAutoClicker.Helpers"

From 8f592bff158ac2aff985f7585fabaf07fff466bb Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 16 Oct 2025 15:40:14 -0700
Subject: [PATCH 05/44] Add shortcut control

---
 FluentAutoClicker/App.xaml         | 1 +
 FluentAutoClicker/MainPage.xaml    | 2 +-
 FluentAutoClicker/MainPage.xaml.cs | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FluentAutoClicker/App.xaml b/FluentAutoClicker/App.xaml
index b1603bdf..95d8f9c6 100644
--- a/FluentAutoClicker/App.xaml
+++ b/FluentAutoClicker/App.xaml
@@ -9,6 +9,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="/Styles.xaml" />
+                <ResourceDictionary Source="ms-appx:///DevWinUI.Controls/Themes/Generic.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->
diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 737c83a1..f911be86 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -104,7 +104,7 @@
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
             <dev:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
-            <Button Content="F6" IsEnabled="False" />
+            <dev:Shortcut x:Name="ToggleShortcut" />
         </StackPanel>
 
         <!--  Click Repeat  -->
diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index 868d6a53..8841b640 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -20,10 +20,6 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.UI.Input.KeyboardAndMouse;
-using WinRT.Interop;
 using WinUIEx.Messaging;
 
 namespace FluentAutoClicker;
@@ -46,6 +42,9 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
+        // Set shortcut keys
+        ToggleShortcut.Keys = ["F6"];
+
         // Set tooltip
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }

From c011e0fb4b5c4d46883b677d3723e000f72debef Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 17 Oct 2025 14:10:42 -0700
Subject: [PATCH 06/44] Fix alignment

---
 FluentAutoClicker/MainPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index f911be86..08fcf507 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -104,7 +104,7 @@
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
             <dev:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
-            <dev:Shortcut x:Name="ToggleShortcut" />
+            <dev:Shortcut x:Name="ToggleShortcut" HorizontalAlignment="Left" />
         </StackPanel>
 
         <!--  Click Repeat  -->

From 930be177274fa0ec2fbed0f547e9ce0ca4a224c0 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 17 Oct 2025 17:08:23 -0700
Subject: [PATCH 07/44] Fix sizing

---
 FluentAutoClicker/MainWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FluentAutoClicker/MainWindow.xaml b/FluentAutoClicker/MainWindow.xaml
index b56848ff..a92a5099 100644
--- a/FluentAutoClicker/MainWindow.xaml
+++ b/FluentAutoClicker/MainWindow.xaml
@@ -8,9 +8,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:windowex="using:WinUIEx"
     Width="400"
-    Height="340"
+    Height="360"
     MinWidth="400"
-    MinHeight="340"
+    MinHeight="360"
     mc:Ignorable="d">
 
     <Grid>

From a5ccb12378c149f4f25d558f58ef811aeb3ff54d Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 19 Oct 2025 21:05:51 -0700
Subject: [PATCH 08/44] Add hotkey debug

---
 FluentAutoClicker/MainPage.xaml    | 2 +-
 FluentAutoClicker/MainPage.xaml.cs | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 08fcf507..24543d27 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -104,7 +104,7 @@
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
             <dev:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
-            <dev:Shortcut x:Name="ToggleShortcut" HorizontalAlignment="Left" />
+            <dev:Shortcut x:Name="ToggleShortcut" HorizontalAlignment="Left" PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->
diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index 8841b640..320a3590 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -20,6 +20,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
+using System.Diagnostics;
 using WinUIEx.Messaging;
 
 namespace FluentAutoClicker;
@@ -180,4 +181,12 @@ private void SettingsButton_Click(object sender, RoutedEventArgs e)
     {
         _ = Frame.Navigate(typeof(SettingsPage), null, new SuppressNavigationTransitionInfo());
     }
+
+    private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    {
+        ToggleShortcut.UpdatePreviewKeys();
+        ToggleShortcut.CloseContentDialog();
+
+        Debug.WriteLine("New hotkey saved: " + string.Join(" + ", ToggleShortcut.Keys));
+    }
 }

From 3fec6cb0af932c819ce401da4181fe1a7ad832c6 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 19 Oct 2025 21:19:11 -0700
Subject: [PATCH 09/44] Update DevWinUI.Controls version to 9.2.0

---
 FluentAutoClicker/FluentAutoClicker.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FluentAutoClicker/FluentAutoClicker.csproj b/FluentAutoClicker/FluentAutoClicker.csproj
index 5456d789..c225e0ec 100644
--- a/FluentAutoClicker/FluentAutoClicker.csproj
+++ b/FluentAutoClicker/FluentAutoClicker.csproj
@@ -36,7 +36,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DevWinUI.Controls" Version="9.1.0" />
+    <PackageReference Include="DevWinUI.Controls" Version="9.2.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.213">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 47ba12a9773acb8fc970abcef5cfee823c8000ad Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 19 Oct 2025 21:29:17 -0700
Subject: [PATCH 10/44] Remove alignment

---
 FluentAutoClicker/MainPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 24543d27..6022427f 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -104,7 +104,7 @@
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
             <dev:IsEnabledTextBlock x:Name="HotkeyTextBlock" x:Uid="TextBlockHotkey" />
-            <dev:Shortcut x:Name="ToggleShortcut" HorizontalAlignment="Left" PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
+            <dev:Shortcut x:Name="ToggleShortcut" PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->

From 8b720101476f6bfd2b33a5a8c3437d1562e57881 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 21 Oct 2025 22:13:20 -0700
Subject: [PATCH 11/44] Disable shortcut

---
 FluentAutoClicker/MainPage.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index 320a3590..1b2dc766 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -110,6 +110,7 @@ private void SetControlsEnabled(bool isEnabled)
         NumberBoxMilliseconds.IsEnabled = isEnabled;
         MouseButtonTypeComboBox.IsEnabled = isEnabled;
         HotkeyTextBlock.IsEnabled = isEnabled;
+        ToggleShortcut.IsEnabled = isEnabled;
         ClickRepeatCheckBox.IsEnabled = isEnabled;
         ClickOffsetCheckBox.IsEnabled = isEnabled;
         ClickOffsetAmount.IsEnabled = isEnabled && ClickOffsetCheckBox.IsChecked == true;

From 33271a2b7eae75b26482a285cd2f7b5f84689146 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 21 Oct 2025 22:14:00 -0700
Subject: [PATCH 12/44] Remove extra native method

---
 FluentAutoClicker/NativeMethods.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FluentAutoClicker/NativeMethods.txt b/FluentAutoClicker/NativeMethods.txt
index 44852877..b3ee903d 100644
--- a/FluentAutoClicker/NativeMethods.txt
+++ b/FluentAutoClicker/NativeMethods.txt
@@ -1,6 +1,5 @@
 RegisterHotKey
 UnregisterHotKey
-CallWindowProc
 SendInput
 SetProcessInformation
 GetCurrentProcess

From 91b61c395aebf347c3269b797877ce158042f974 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 21 Oct 2025 22:48:17 -0700
Subject: [PATCH 13/44] Fix window monitor

---
 FluentAutoClicker/MainPage.xaml.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index 1b2dc766..7968db16 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -59,6 +59,13 @@ private async void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
+
+        // Get window handle
+        MainWindow window = App.MainWindow;
+
+        // Set up window message monitor
+        WindowMessageMonitor monitor = new(window);
+        monitor.WindowMessageReceived += OnWindowMessageReceived;
     }
 
     /// <summary>

From e2fe84e237cd48b17df1a05174fb9664d5d67db5 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 21 Oct 2025 23:23:43 -0700
Subject: [PATCH 14/44] Add hotkey manager

---
 FluentAutoClicker/Helpers/HotkeyManager.cs | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 FluentAutoClicker/Helpers/HotkeyManager.cs

diff --git a/FluentAutoClicker/Helpers/HotkeyManager.cs b/FluentAutoClicker/Helpers/HotkeyManager.cs
new file mode 100644
index 00000000..1b0d0c31
--- /dev/null
+++ b/FluentAutoClicker/Helpers/HotkeyManager.cs
@@ -0,0 +1,53 @@
+// Copyright (C) 2025 Ryan Luu
+//
+// This file is part of Fluent Auto Clicker.
+//
+// Fluent Auto Clicker is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Fluent Auto Clicker is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with Fluent Auto Clicker. If not, see <https://www.gnu.org/licenses/>.
+
+using Windows.System;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.Input.KeyboardAndMouse;
+using WinRT.Interop;
+
+namespace FluentAutoClicker.Helpers;
+
+internal class HotkeyManager
+{
+    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
+    {
+        // Get window handle
+        MainWindow window = App.MainWindow;
+        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+
+        UnregisterHotkey(hotkeyId);
+
+        // Register hotkey
+        BOOL success = PInvoke.RegisterHotKey(hWnd, hotkeyId, HOT_KEY_MODIFIERS.MOD_NOREPEAT | (HOT_KEY_MODIFIERS)modifiers, (uint)virtualKey);
+
+        return success;
+    }
+
+    public static bool UnregisterHotkey(int hotkeyId)
+    {
+        // Get window handle
+        MainWindow window = App.MainWindow;
+        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+
+        // Unregister hotkey
+        BOOL success = PInvoke.UnregisterHotKey(hWnd, hotkeyId);
+
+        return success;
+    }
+}

From b9eb1da32fc144f6d18878370e27331756a1bce9 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 23 Oct 2025 13:52:17 -0700
Subject: [PATCH 15/44] Disable shortcut on toggle

---
 FluentAutoClicker/MainPage.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index d159a18b..fe60e068 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -114,7 +114,10 @@
                 x:Name="HotkeyTextBlock"
                 x:Uid="TextBlockHotkey"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked.Value, Converter={StaticResource BoolNegationConverter}}" />
-            <dev:Shortcut x:Name="ToggleShortcut" PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
+            <dev:Shortcut
+                x:Name="ToggleShortcut"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked.Value, Converter={StaticResource BoolNegationConverter}}"
+                PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->

From f8a434fa32f972d15b73897ebf107c1bbb1d55b1 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 23 Oct 2025 22:46:23 -0700
Subject: [PATCH 16/44] Update DevWinUI

---
 FluentAutoClicker/FluentAutoClicker.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FluentAutoClicker/FluentAutoClicker.csproj b/FluentAutoClicker/FluentAutoClicker.csproj
index 2a845b6f..6c0abe75 100644
--- a/FluentAutoClicker/FluentAutoClicker.csproj
+++ b/FluentAutoClicker/FluentAutoClicker.csproj
@@ -36,7 +36,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DevWinUI.Controls" Version="9.2.0" />
+    <PackageReference Include="DevWinUI.Controls" Version="9.3.0" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.213">
       <PrivateAssets>all</PrivateAssets>

From ee8e1a4967208126d955bbf5a9036587b152618a Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 9 Nov 2025 11:54:41 -0800
Subject: [PATCH 17/44] Update DevWinUI

---
 AuraClick/AuraClick.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AuraClick/AuraClick.csproj b/AuraClick/AuraClick.csproj
index 92ddf49a..ed5fee1b 100644
--- a/AuraClick/AuraClick.csproj
+++ b/AuraClick/AuraClick.csproj
@@ -32,7 +32,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DevWinUI.Controls" Version="9.3.0" />
+    <PackageReference Include="DevWinUI.Controls" Version="9.4.2" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.228">
       <PrivateAssets>all</PrivateAssets>

From e51e38bdcb97a1de39db3f6de1a3af6c62984b2b Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 9 Nov 2025 11:59:12 -0800
Subject: [PATCH 18/44] Add DevWinUI dependency to settings

---
 AuraClick/SettingsPage.xaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AuraClick/SettingsPage.xaml b/AuraClick/SettingsPage.xaml
index 47b36af4..41ea3385 100644
--- a/AuraClick/SettingsPage.xaml
+++ b/AuraClick/SettingsPage.xaml
@@ -139,6 +139,10 @@
                                     Margin="{StaticResource HyperlinkButtonNegativeMargin}"
                                     Content="CsWin32"
                                     NavigateUri="https://github.com/Microsoft/CsWin32" />
+                                <HyperlinkButton
+                                    Margin="{StaticResource HyperlinkButtonNegativeMargin}"
+                                    Content="DevWinUI"
+                                    NavigateUri="https://github.com/ghost1372/DevWinUI" />
                             </StackPanel>
                         </controls:SettingsCard>
 

From b18d31a90638ae961e751a9fe901fa84439806f5 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sat, 15 Nov 2025 13:44:18 -0800
Subject: [PATCH 19/44] Update packages

---
 AuraClick/AuraClick.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AuraClick/AuraClick.csproj b/AuraClick/AuraClick.csproj
index 035a7b2d..e15885f1 100644
--- a/AuraClick/AuraClick.csproj
+++ b/AuraClick/AuraClick.csproj
@@ -32,9 +32,9 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DevWinUI.Controls" Version="9.4.2" />
+    <PackageReference Include="DevWinUI.Controls" Version="9.5.0" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.242">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.248">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From ad798d16ab0fba428dccbf05b93bcf77f5a5ea32 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 18 Nov 2025 10:08:04 -0800
Subject: [PATCH 20/44] Reset to default key

---
 AuraClick/Pages/MainPage.xaml    | 3 ++-
 AuraClick/Pages/MainPage.xaml.cs | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/AuraClick/Pages/MainPage.xaml b/AuraClick/Pages/MainPage.xaml
index a679f8c9..a7441b54 100644
--- a/AuraClick/Pages/MainPage.xaml
+++ b/AuraClick/Pages/MainPage.xaml
@@ -117,7 +117,8 @@
             <dev:Shortcut
                 x:Name="ToggleShortcut"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked.Value, Converter={StaticResource BoolNegationConverter}}"
-                PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick" />
+                PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick"
+                SecondaryButtonClick="ToggleShortcut_SecondaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 19198f14..335c7aa7 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -167,4 +167,11 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
 
         Debug.WriteLine("New hotkey saved: " + string.Join(" + ", ToggleShortcut.Keys));
     }
+
+    private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    {
+        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.UpdatePreviewKeys();
+        ToggleShortcut.CloseContentDialog();
+    }
 }

From b1d1e2008558b97c0b45d6b41a506e7e73c20c77 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Tue, 18 Nov 2025 10:45:58 -0800
Subject: [PATCH 21/44] Add default hotkey

---
 AuraClick/Pages/MainPage.xaml.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 335c7aa7..65d86030 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -22,6 +22,7 @@
 using Microsoft.Windows.BadgeNotifications;
 using System.Diagnostics;
 using WinUIEx.Messaging;
+using Windows.System;
 
 namespace AuraClick;
 
@@ -77,6 +78,8 @@ private async void MainPage_Loaded(object sender, RoutedEventArgs e)
         // Set up window message monitor
         WindowMessageMonitor monitor = new(window);
         monitor.WindowMessageReceived += OnWindowMessageReceived;
+
+        HotkeyManager.RegisterHotkey(1, VirtualKeyModifiers.None, VirtualKey.F6);
     }
 
     /// <summary>
@@ -88,6 +91,8 @@ private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
         if (e.Message.MessageId == 0x0312) // WM_HOTKEY event
         {
+            Debug.WriteLine(e.Message);
+
             if (ToggleButtonStart.IsEnabled)
             {
                 ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;

From 09c85378da55b32a15cb4b9a171235f7fcb3853b Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 29 Apr 2026 21:59:11 -0700
Subject: [PATCH 22/44] Fix build

---
 AuraClick/AuraClick.csproj       |  4 ++--
 AuraClick/Pages/MainPage.xaml.cs | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/AuraClick/AuraClick.csproj b/AuraClick/AuraClick.csproj
index ae5a617c..13be7c23 100644
--- a/AuraClick/AuraClick.csproj
+++ b/AuraClick/AuraClick.csproj
@@ -32,7 +32,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DevWinUI.Controls" Version="9.5.0" />
+    <PackageReference Include="DevWinUI.Controls" Version="9.9.4" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.3.260402-preview2" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.275">
       <PrivateAssets>all</PrivateAssets>
@@ -40,7 +40,7 @@
     </PackageReference>
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.3.260402-preview2" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1839" />
-    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="2.0.12" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.1" />
     <PackageReference Include="WinUIEx" Version="2.9.0" />
   </ItemGroup>
 
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 0c9572f2..139ab390 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -36,6 +36,17 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
+    /// <summary>
+    /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
+    /// </summary>
+    /// <param name="isChecked">The state of the enabling CheckBox.</param>
+    /// <param name="isRunning">The state of the start/running toggle.</param>
+    /// <returns> <c>true</c> to enable the control when the checkbox is checked and the running toggle is off; otherwise, <c>false</c>.</returns>
+    private bool IsControlEnabled(bool? isChecked, bool? isRunning)
+    {
+        return (isChecked ?? false) && !(isRunning ?? false);
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
     /// </summary>

From 9a55ea2d99140573fdbf74f8ae681dcdae89027f Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Wed, 29 Apr 2026 22:01:15 -0700
Subject: [PATCH 23/44] Fix or

---
 AuraClick/Pages/MainPage.xaml.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 139ab390..f196e7ea 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -36,17 +36,6 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
-    /// <summary>
-    /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
-    /// </summary>
-    /// <param name="isChecked">The state of the enabling CheckBox.</param>
-    /// <param name="isRunning">The state of the start/running toggle.</param>
-    /// <returns> <c>true</c> to enable the control when the checkbox is checked and the running toggle is off; otherwise, <c>false</c>.</returns>
-    private bool IsControlEnabled(bool? isChecked, bool? isRunning)
-    {
-        return (isChecked ?? false) && !(isRunning ?? false);
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
     /// </summary>
@@ -62,6 +51,17 @@ public MainPage()
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
+    /// <summary>
+    /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
+    /// </summary>
+    /// <param name="isChecked">The state of the enabling CheckBox.</param>
+    /// <param name="isRunning">The state of the start/running toggle.</param>
+    /// <returns> <c>true</c> to enable the control when the checkbox is checked and the running toggle is off; otherwise, <c>false</c>.</returns>
+    private bool IsControlEnabled(bool? isChecked, bool? isRunning)
+    {
+        return (isChecked ?? false) && !(isRunning ?? false);
+    }
+
     /// <summary>
     /// Handles the Loaded event of the MainPage control.
     /// </summary>

From f9f41881639eebe848ed51c283db01c51bdd3dde Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:14:06 -0700
Subject: [PATCH 24/44] Add basic hotkey implementation

---
 AuraClick/Helpers/HotkeyManager.cs | 153 ++++++++++++++++++++++++++---
 AuraClick/Pages/MainPage.xaml.cs   |  70 ++++++-------
 2 files changed, 168 insertions(+), 55 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index eb20531b..8694e6f9 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -8,7 +8,7 @@
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY without even the implied warranty of
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU Affero General Public License for more details.
 //
@@ -23,31 +23,152 @@
 
 namespace AuraClick.Helpers;
 
-internal class HotkeyManager
+internal static class HotkeyManager
 {
-    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
+    public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
     {
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+        if (!TryGetHotkey(keys, out var modifiers, out var virtualKey))
+        {
+            return false;
+        }
+
+        return RegisterHotkey(hotkeyId, modifiers, virtualKey);
+    }
 
+    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
+    {
+        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
         UnregisterHotkey(hotkeyId);
+        return PInvoke.RegisterHotKey(hWnd, hotkeyId, ToWin32Modifiers(modifiers) | HOT_KEY_MODIFIERS.MOD_NOREPEAT, (uint)virtualKey);
+    }
 
-        // Register hotkey
-        BOOL success = PInvoke.RegisterHotKey(hWnd, hotkeyId, HOT_KEY_MODIFIERS.MOD_NOREPEAT | (HOT_KEY_MODIFIERS)modifiers, (uint)virtualKey);
+    public static bool UnregisterHotkey(int hotkeyId)
+    {
+        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
+        return PInvoke.UnregisterHotKey(hWnd, hotkeyId);
+    }
 
-        return success;
+    public static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    {
+        modifiers = VirtualKeyModifiers.None;
+        virtualKey = VirtualKey.F6;
+
+        if (keys is null)
+        {
+            return false;
+        }
+
+        foreach (var keyItem in keys)
+        {
+            var keyString = keyItem?.ToString();
+            if (string.IsNullOrWhiteSpace(keyString))
+            {
+                continue;
+            }
+
+            if (TryAddModifier(keyString, ref modifiers))
+            {
+                continue;
+            }
+
+            if (TryParseVirtualKey(keyString, out var key))
+            {
+                virtualKey = key;
+            }
+        }
+
+        return modifiers != VirtualKeyModifiers.None || virtualKey != VirtualKey.F6;
     }
 
-    public static bool UnregisterHotkey(int hotkeyId)
+    private static bool TryAddModifier(string keyString, ref VirtualKeyModifiers modifiers)
     {
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+        if (keyString.Equals("Ctrl", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Control", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Control;
+            return true;
+        }
+
+        if (keyString.Equals("Shift", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Shift;
+            return true;
+        }
 
-        // Unregister hotkey
-        BOOL success = PInvoke.UnregisterHotKey(hWnd, hotkeyId);
+        if (keyString.Equals("Alt", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Menu", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Menu;
+            return true;
+        }
 
-        return success;
+        if (keyString.Equals("Win", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Windows", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Windows;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static HOT_KEY_MODIFIERS ToWin32Modifiers(VirtualKeyModifiers modifiers)
+    {
+        HOT_KEY_MODIFIERS result = 0;
+
+        if ((modifiers & VirtualKeyModifiers.Control) != 0) result |= HOT_KEY_MODIFIERS.MOD_CONTROL;
+        if ((modifiers & VirtualKeyModifiers.Menu) != 0) result |= HOT_KEY_MODIFIERS.MOD_ALT;
+        if ((modifiers & VirtualKeyModifiers.Shift) != 0) result |= HOT_KEY_MODIFIERS.MOD_SHIFT;
+        if ((modifiers & VirtualKeyModifiers.Windows) != 0) result |= HOT_KEY_MODIFIERS.MOD_WIN;
+
+        return result;
+    }
+
+    private static bool TryParseVirtualKey(string keyString, out VirtualKey key)
+    {
+        key = VirtualKey.F6;
+        var trimmed = keyString.Trim();
+
+        if (trimmed.Length == 0)
+        {
+            return false;
+        }
+
+        if (Enum.TryParse(trimmed, ignoreCase: true, out VirtualKey parsedKey))
+        {
+            key = parsedKey;
+            return true;
+        }
+
+        if (trimmed.Length == 1 && char.IsLetterOrDigit(trimmed[0]) && Enum.TryParse(char.ToUpperInvariant(trimmed[0]).ToString(), ignoreCase: true, out parsedKey))
+        {
+            key = parsedKey;
+            return true;
+        }
+
+        return trimmed.Equals("Space", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Space)
+            : trimmed.Equals("Enter", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Return", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Enter)
+            : trimmed.Equals("Escape", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Esc", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Escape)
+            : trimmed.Equals("Tab", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Tab)
+            : trimmed.Equals("Backspace", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Back", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Back)
+            : trimmed.Equals("Delete", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Del", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Delete)
+            : trimmed.Equals("Insert", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Ins", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Insert)
+            : trimmed.Equals("Home", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Home)
+            : trimmed.Equals("End", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.End)
+            : trimmed.Equals("PageUp", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageUp)
+            : trimmed.Equals("PageDown", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageDown)
+            : trimmed.Equals("Up", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Up)
+            : trimmed.Equals("Down", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Down)
+            : trimmed.Equals("Left", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Left)
+            : trimmed.Equals("Right", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Right)
+            : trimmed.Equals("Pause", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Pause)
+            : trimmed.Equals("PrintScreen", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Print", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Snapshot)
+            : trimmed.Equals("NumLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.NumberKeyLock)
+            : trimmed.Equals("CapsLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.CapitalLock)
+            : trimmed.Equals("ScrollLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Scroll)
+            : false;
+    }
+
+    private static bool Set(out VirtualKey key, VirtualKey value)
+    {
+        key = value;
+        return true;
     }
 }
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index f196e7ea..0b979662 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -20,9 +20,9 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
-using System.Diagnostics;
+using Windows.Win32.Foundation;
+using WinRT.Interop;
 using WinUIEx.Messaging;
-using Windows.System;
 
 namespace AuraClick;
 
@@ -36,6 +36,11 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
+    /// <summary>
+    /// Current hotkey ID for the toggle shortcut.
+    /// </summary>
+    private int _currentHotKeyId = 1;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
     /// </summary>
@@ -44,19 +49,21 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        // Set shortcut keys
-        ToggleShortcut.Keys = ["F6"];
-
-        // Set tooltip
+        ToggleShortcut.Keys = new List<object> { "F6" };
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
+    /// <summary>
+    /// Registers a hotkey based on the current shortcut keys.
+    /// </summary>
+    private void RegisterHotkey()
+    {
+        HotkeyManager.RegisterHotkey(_currentHotKeyId, ToggleShortcut.Keys);
+    }
+
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
-    /// <param name="isChecked">The state of the enabling CheckBox.</param>
-    /// <param name="isRunning">The state of the start/running toggle.</param>
-    /// <returns> <c>true</c> to enable the control when the checkbox is checked and the running toggle is off; otherwise, <c>false</c>.</returns>
     private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     {
         return (isChecked ?? false) && !(isRunning ?? false);
@@ -65,38 +72,30 @@ private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     /// <summary>
     /// Handles the Loaded event of the MainPage control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
-    private async void MainPage_Loaded(object sender, RoutedEventArgs e)
+    private void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
-        // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
         // Get window handle
         MainWindow window = App.MainWindow;
+        HWND hWnd = new(WindowNative.GetWindowHandle(window));
 
         // Set up window message monitor
         WindowMessageMonitor monitor = new(window);
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
-        HotkeyManager.RegisterHotkey(1, VirtualKeyModifiers.None, VirtualKey.F6);
+        // Register hotkey
+        RegisterHotkey();
     }
 
     /// <summary>
     /// Handles the WindowMessageReceived event of the WindowMessageMonitor control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312) // WM_HOTKEY event
+        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == _currentHotKeyId && ToggleButtonStart.IsEnabled)
         {
-            Debug.WriteLine(e.Message);
-
-            if (ToggleButtonStart.IsEnabled)
-            {
-                ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
-            }
+            ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
     }
 
@@ -111,7 +110,6 @@ public static void RefreshNotificationBadge()
     /// <summary>
     /// Sets the notification badge.
     /// </summary>
-    /// <param name="glyph">The badge notification glyph.</param>
     private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     {
         if (glyph == BadgeNotificationGlyph.Paused && settingsPage.NotificationBadgePaused)
@@ -131,18 +129,13 @@ private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     /// <summary>
     /// Handles the Checked event of the ToggleButtonStart control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     {
-        // Update controls
         ToggleButtonStart.IsEnabled = false;
         await Task.Delay(1000);
         FontIconStart.Glyph = "\uEDB4";
         SetNotificationBadge(BadgeNotificationGlyph.Playing);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStop".GetLocalized());
-
-        // Start auto clicker
         AutoClicker.Start();
         ToggleButtonStart.IsEnabled = true;
     }
@@ -150,41 +143,40 @@ private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     /// <summary>
     /// Handles the Unchecked event of the ToggleButtonStart control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void ToggleButtonStart_OnUnchecked(object sender, RoutedEventArgs e)
     {
-        // Update controls
         FontIconStart.Glyph = "\uEE4A";
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
-
-        // Stop auto clicker
         AutoClicker.Stop();
     }
 
     /// <summary>
     /// Handles the Click event of the SettingsButton control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void SettingsButton_Click(object sender, RoutedEventArgs e)
     {
         _ = Frame.Navigate(typeof(SettingsPage), null, new SuppressNavigationTransitionInfo());
     }
 
+    /// <summary>
+    /// Handles the PrimaryButtonClick event of the Shortcut control.
+    /// </summary>
     private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-
-        Debug.WriteLine("New hotkey saved: " + string.Join(" + ", ToggleShortcut.Keys));
+        RegisterHotkey();
     }
 
+    /// <summary>
+    /// Handles the SecondaryButtonClick event of the Shortcut control.
+    /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = new List<object> { "F6" };
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
+        RegisterHotkey();
     }
 }

From 719345c36c0488544268b3edc2fd3782c15fd64e Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:19:38 -0700
Subject: [PATCH 25/44] Cleanup structure

---
 AuraClick/Helpers/HotkeyManager.cs |  3 ++-
 AuraClick/Pages/MainPage.xaml.cs   | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 8694e6f9..78177611 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -8,7 +8,7 @@
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// but WITHOUT ANY WARRANTY without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU Affero General Public License for more details.
 //
@@ -23,6 +23,7 @@
 
 namespace AuraClick.Helpers;
 
+// TODO: Cleanup this code to be more maintainable
 internal static class HotkeyManager
 {
     public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 0b979662..aa24a986 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -37,9 +37,9 @@ public sealed partial class MainPage
     private static readonly SettingsPage settingsPage = new();
 
     /// <summary>
-    /// Current hotkey ID for the toggle shortcut.
+    /// Hotkey ID for the toggle shortcut.
     /// </summary>
-    private int _currentHotKeyId = 1;
+    private const int ToggleHotkeyId = 1;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
@@ -49,18 +49,10 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        ToggleShortcut.Keys = new List<object> { "F6" };
+        ToggleShortcut.Keys = ["F6"];
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
-    /// <summary>
-    /// Registers a hotkey based on the current shortcut keys.
-    /// </summary>
-    private void RegisterHotkey()
-    {
-        HotkeyManager.RegisterHotkey(_currentHotKeyId, ToggleShortcut.Keys);
-    }
-
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
@@ -74,6 +66,7 @@ private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     /// </summary>
     private void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
+        // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
         // Get window handle
@@ -85,7 +78,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
         // Register hotkey
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 
     /// <summary>
@@ -93,7 +86,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == _currentHotKeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
@@ -166,7 +159,7 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     {
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 
     /// <summary>
@@ -174,9 +167,9 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = new List<object> { "F6" };
+        ToggleShortcut.Keys = ["F6"];
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 }

From 6c66fa48739cd1767254fee64b3119a5a5e5c6c5 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:27:50 -0700
Subject: [PATCH 26/44] Use PInvoke for message m

---
 AuraClick/NativeMethods.txt      | 3 ++-
 AuraClick/Pages/MainPage.xaml.cs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AuraClick/NativeMethods.txt b/AuraClick/NativeMethods.txt
index b3ee903d..c5975d20 100644
--- a/AuraClick/NativeMethods.txt
+++ b/AuraClick/NativeMethods.txt
@@ -6,4 +6,5 @@ GetCurrentProcess
 SetPriorityClass
 PROCESS_POWER_THROTTLING_CURRENT_VERSION
 PROCESS_POWER_THROTTLING_EXECUTION_SPEED
-PROCESS_POWER_THROTTLING_STATE
\ No newline at end of file
+PROCESS_POWER_THROTTLING_STATE
+WM_HOTKEY
\ No newline at end of file
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index aa24a986..accec515 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -20,6 +20,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
+using Windows.Win32;
 using Windows.Win32.Foundation;
 using WinRT.Interop;
 using WinUIEx.Messaging;
@@ -86,7 +87,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }

From 204bc011b18a2c2613f4456efeb3e3644558261a Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:52:09 -0700
Subject: [PATCH 27/44] Keep monitor alive

---
 AuraClick/Pages/MainPage.xaml.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index accec515..b81e4969 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -37,6 +37,11 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
+    /// <summary>
+    /// Window message monitor for hotkey handling.
+    /// </summary>
+    private WindowMessageMonitor? monitor;
+
     /// <summary>
     /// Hotkey ID for the toggle shortcut.
     /// </summary>
@@ -70,12 +75,9 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
-
         // Set up window message monitor
-        WindowMessageMonitor monitor = new(window);
+        MainWindow window = App.MainWindow;
+        monitor = new(window);
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
         // Register hotkey
@@ -87,7 +89,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }

From f491550171f68ad72827303ab361521cf72f9d90 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 20:02:46 -0700
Subject: [PATCH 28/44] Remove start delay

---
 AuraClick/Pages/MainPage.xaml.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index b81e4969..d022dc36 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -89,7 +89,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == PInvoke.WM_HOTKEY && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
@@ -128,11 +128,13 @@ private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     {
         ToggleButtonStart.IsEnabled = false;
-        await Task.Delay(1000);
+
         FontIconStart.Glyph = "\uEDB4";
         SetNotificationBadge(BadgeNotificationGlyph.Playing);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStop".GetLocalized());
         AutoClicker.Start();
+
+        await Task.Delay(1000);
         ToggleButtonStart.IsEnabled = true;
     }
 
@@ -141,6 +143,7 @@ private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     /// </summary>
     private void ToggleButtonStart_OnUnchecked(object sender, RoutedEventArgs e)
     {
+        ToggleButtonStart.IsEnabled = true;
         FontIconStart.Glyph = "\uEE4A";
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());

From 23889ca7d7dbe1e86bf4c32d6b4df02e1e85c904 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 1 May 2026 01:36:20 -0700
Subject: [PATCH 29/44] Disable toggling auto clicker in settings

---
 AuraClick/Pages/MainPage.xaml    | 3 ++-
 AuraClick/Pages/MainPage.xaml.cs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/AuraClick/Pages/MainPage.xaml b/AuraClick/Pages/MainPage.xaml
index 766bbf87..e466bc94 100644
--- a/AuraClick/Pages/MainPage.xaml
+++ b/AuraClick/Pages/MainPage.xaml
@@ -182,7 +182,8 @@
                 x:Uid="ButtonSettings"
                 Grid.Column="1"
                 Height="32"
-                Click="SettingsButton_Click">
+                Click="SettingsButton_Click"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}">
                 <AnimatedIcon FallbackIconSource="{ui:FontIconSource Glyph=&#xE713;}">
                     <AnimatedIcon.Source>
                         <animatedvisuals:AnimatedSettingsVisualSource />
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index d022dc36..014eb6a1 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -89,6 +89,12 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
+        // Allow hotkey only on main page
+        if (Frame.Content is not MainPage)
+        {
+            return;
+        }
+
         if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;

From 60038cf89e177de3da6ea0d381296ab7919fa630 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 1 May 2026 01:53:37 -0700
Subject: [PATCH 30/44] Cleanup codr

---
 AuraClick/Helpers/HotkeyManager.cs | 8 ++++----
 AuraClick/Pages/MainPage.xaml.cs   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 78177611..8fd48934 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -1,18 +1,18 @@
-// Copyright (C) 2025 Ryan Luu
+// Copyright (C) 2026 Ryan Luu
 //
 // This file is part of Aura Click.
 //
 // Aura Click is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
+// it under the terms of the GNU General Public License as published
 // by the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
+// GNU General Public License for more details.
 //
-// You should have received a copy of the GNU Affero General Public License
+// You should have received a copy of the GNU General Public License
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
 using Windows.System;
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 014eb6a1..e7e45bea 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -21,8 +21,6 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
 using Windows.Win32;
-using Windows.Win32.Foundation;
-using WinRT.Interop;
 using WinUIEx.Messaging;
 
 namespace AuraClick;

From fbdef6f4dad8437ba040a62b92cfc80a03f09b56 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sat, 2 May 2026 02:41:13 -0700
Subject: [PATCH 31/44] Remove hard coded hotk

---
 AuraClick/Helpers/HotkeyManager.cs | 119 +++++------------------------
 AuraClick/Pages/MainPage.xaml.cs   |  14 +++-
 2 files changed, 32 insertions(+), 101 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 8fd48934..2e4be8d5 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
+using DevWinUI;
 using Windows.System;
 using Windows.Win32;
 using Windows.Win32.Foundation;
@@ -23,7 +24,6 @@
 
 namespace AuraClick.Helpers;
 
-// TODO: Cleanup this code to be more maintainable
 internal static class HotkeyManager
 {
     public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
@@ -33,143 +33,66 @@ public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
             return false;
         }
 
-        return RegisterHotkey(hotkeyId, modifiers, virtualKey);
-    }
-
-    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
-    {
         var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
         UnregisterHotkey(hotkeyId);
         return PInvoke.RegisterHotKey(hWnd, hotkeyId, ToWin32Modifiers(modifiers) | HOT_KEY_MODIFIERS.MOD_NOREPEAT, (uint)virtualKey);
     }
 
     public static bool UnregisterHotkey(int hotkeyId)
-    {
-        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
-        return PInvoke.UnregisterHotKey(hWnd, hotkeyId);
-    }
+        => PInvoke.UnregisterHotKey(new HWND(WindowNative.GetWindowHandle(App.MainWindow)), hotkeyId);
 
-    public static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    private static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
     {
         modifiers = VirtualKeyModifiers.None;
-        virtualKey = VirtualKey.F6;
+        virtualKey = VirtualKey.None;
 
         if (keys is null)
         {
             return false;
         }
 
-        foreach (var keyItem in keys)
+        foreach (var key in keys)
         {
-            var keyString = keyItem?.ToString();
-            if (string.IsNullOrWhiteSpace(keyString))
+            if (key is not KeyVisualInfo keyInfo || keyInfo.Key is not VirtualKey keyCode)
             {
                 continue;
             }
 
-            if (TryAddModifier(keyString, ref modifiers))
+            if (TryGetModifier(keyCode, out var modifier))
             {
-                continue;
+                modifiers |= modifier;
             }
-
-            if (TryParseVirtualKey(keyString, out var key))
+            else
             {
-                virtualKey = key;
+                virtualKey = keyCode;
             }
         }
 
-        return modifiers != VirtualKeyModifiers.None || virtualKey != VirtualKey.F6;
+        return virtualKey != VirtualKey.None;
     }
 
-    private static bool TryAddModifier(string keyString, ref VirtualKeyModifiers modifiers)
+    private static bool TryGetModifier(VirtualKey keyCode, out VirtualKeyModifiers modifier)
     {
-        if (keyString.Equals("Ctrl", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Control", StringComparison.OrdinalIgnoreCase))
+        modifier = keyCode switch
         {
-            modifiers |= VirtualKeyModifiers.Control;
-            return true;
-        }
-
-        if (keyString.Equals("Shift", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Shift;
-            return true;
-        }
-
-        if (keyString.Equals("Alt", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Menu", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Menu;
-            return true;
-        }
-
-        if (keyString.Equals("Win", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Windows", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Windows;
-            return true;
-        }
-
-        return false;
+            VirtualKey.Control or VirtualKey.LeftControl or VirtualKey.RightControl => VirtualKeyModifiers.Control,
+            VirtualKey.Shift or VirtualKey.LeftShift or VirtualKey.RightShift => VirtualKeyModifiers.Shift,
+            VirtualKey.Menu or VirtualKey.LeftMenu or VirtualKey.RightMenu => VirtualKeyModifiers.Menu,
+            VirtualKey.LeftWindows or VirtualKey.RightWindows => VirtualKeyModifiers.Windows,
+            _ => VirtualKeyModifiers.None,
+        };
+
+        return modifier != VirtualKeyModifiers.None;
     }
 
     private static HOT_KEY_MODIFIERS ToWin32Modifiers(VirtualKeyModifiers modifiers)
     {
         HOT_KEY_MODIFIERS result = 0;
-
         if ((modifiers & VirtualKeyModifiers.Control) != 0) result |= HOT_KEY_MODIFIERS.MOD_CONTROL;
         if ((modifiers & VirtualKeyModifiers.Menu) != 0) result |= HOT_KEY_MODIFIERS.MOD_ALT;
         if ((modifiers & VirtualKeyModifiers.Shift) != 0) result |= HOT_KEY_MODIFIERS.MOD_SHIFT;
         if ((modifiers & VirtualKeyModifiers.Windows) != 0) result |= HOT_KEY_MODIFIERS.MOD_WIN;
-
         return result;
     }
 
-    private static bool TryParseVirtualKey(string keyString, out VirtualKey key)
-    {
-        key = VirtualKey.F6;
-        var trimmed = keyString.Trim();
-
-        if (trimmed.Length == 0)
-        {
-            return false;
-        }
-
-        if (Enum.TryParse(trimmed, ignoreCase: true, out VirtualKey parsedKey))
-        {
-            key = parsedKey;
-            return true;
-        }
-
-        if (trimmed.Length == 1 && char.IsLetterOrDigit(trimmed[0]) && Enum.TryParse(char.ToUpperInvariant(trimmed[0]).ToString(), ignoreCase: true, out parsedKey))
-        {
-            key = parsedKey;
-            return true;
-        }
-
-        return trimmed.Equals("Space", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Space)
-            : trimmed.Equals("Enter", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Return", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Enter)
-            : trimmed.Equals("Escape", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Esc", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Escape)
-            : trimmed.Equals("Tab", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Tab)
-            : trimmed.Equals("Backspace", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Back", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Back)
-            : trimmed.Equals("Delete", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Del", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Delete)
-            : trimmed.Equals("Insert", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Ins", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Insert)
-            : trimmed.Equals("Home", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Home)
-            : trimmed.Equals("End", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.End)
-            : trimmed.Equals("PageUp", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageUp)
-            : trimmed.Equals("PageDown", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageDown)
-            : trimmed.Equals("Up", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Up)
-            : trimmed.Equals("Down", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Down)
-            : trimmed.Equals("Left", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Left)
-            : trimmed.Equals("Right", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Right)
-            : trimmed.Equals("Pause", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Pause)
-            : trimmed.Equals("PrintScreen", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Print", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Snapshot)
-            : trimmed.Equals("NumLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.NumberKeyLock)
-            : trimmed.Equals("CapsLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.CapitalLock)
-            : trimmed.Equals("ScrollLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Scroll)
-            : false;
-    }
-
-    private static bool Set(out VirtualKey key, VirtualKey value)
-    {
-        key = value;
-        return true;
-    }
 }
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index e7e45bea..8652aac3 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -16,12 +16,15 @@
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
 using AuraClick.Helpers;
+using DevWinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
+using Windows.System;
 using Windows.Win32;
-using WinUIEx.Messaging;
+using WindowMessageEventArgs = WinUIEx.Messaging.WindowMessageEventArgs;
+using WindowMessageMonitor = WinUIEx.Messaging.WindowMessageMonitor;
 
 namespace AuraClick;
 
@@ -53,10 +56,15 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = CreateDefaultShortcut();
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
+    private static List<object> CreateDefaultShortcut()
+    {
+        return [new KeyVisualInfo { Key = VirtualKey.F6, KeyName = "F6" }];
+    }
+
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
@@ -177,7 +185,7 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = CreateDefaultShortcut();
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
         HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);

From e16969ca7abf6e6a94fc7f799e7f227620a2286d Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:14:06 -0700
Subject: [PATCH 32/44] Add basic hotkey implementation

---
 AuraClick/Helpers/HotkeyManager.cs | 153 ++++++++++++++++++++++++++---
 AuraClick/Pages/MainPage.xaml.cs   |  70 ++++++-------
 2 files changed, 168 insertions(+), 55 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index eb20531b..8694e6f9 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -8,7 +8,7 @@
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY without even the implied warranty of
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU Affero General Public License for more details.
 //
@@ -23,31 +23,152 @@
 
 namespace AuraClick.Helpers;
 
-internal class HotkeyManager
+internal static class HotkeyManager
 {
-    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
+    public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
     {
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+        if (!TryGetHotkey(keys, out var modifiers, out var virtualKey))
+        {
+            return false;
+        }
+
+        return RegisterHotkey(hotkeyId, modifiers, virtualKey);
+    }
 
+    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
+    {
+        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
         UnregisterHotkey(hotkeyId);
+        return PInvoke.RegisterHotKey(hWnd, hotkeyId, ToWin32Modifiers(modifiers) | HOT_KEY_MODIFIERS.MOD_NOREPEAT, (uint)virtualKey);
+    }
 
-        // Register hotkey
-        BOOL success = PInvoke.RegisterHotKey(hWnd, hotkeyId, HOT_KEY_MODIFIERS.MOD_NOREPEAT | (HOT_KEY_MODIFIERS)modifiers, (uint)virtualKey);
+    public static bool UnregisterHotkey(int hotkeyId)
+    {
+        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
+        return PInvoke.UnregisterHotKey(hWnd, hotkeyId);
+    }
 
-        return success;
+    public static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    {
+        modifiers = VirtualKeyModifiers.None;
+        virtualKey = VirtualKey.F6;
+
+        if (keys is null)
+        {
+            return false;
+        }
+
+        foreach (var keyItem in keys)
+        {
+            var keyString = keyItem?.ToString();
+            if (string.IsNullOrWhiteSpace(keyString))
+            {
+                continue;
+            }
+
+            if (TryAddModifier(keyString, ref modifiers))
+            {
+                continue;
+            }
+
+            if (TryParseVirtualKey(keyString, out var key))
+            {
+                virtualKey = key;
+            }
+        }
+
+        return modifiers != VirtualKeyModifiers.None || virtualKey != VirtualKey.F6;
     }
 
-    public static bool UnregisterHotkey(int hotkeyId)
+    private static bool TryAddModifier(string keyString, ref VirtualKeyModifiers modifiers)
     {
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
+        if (keyString.Equals("Ctrl", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Control", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Control;
+            return true;
+        }
+
+        if (keyString.Equals("Shift", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Shift;
+            return true;
+        }
 
-        // Unregister hotkey
-        BOOL success = PInvoke.UnregisterHotKey(hWnd, hotkeyId);
+        if (keyString.Equals("Alt", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Menu", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Menu;
+            return true;
+        }
 
-        return success;
+        if (keyString.Equals("Win", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Windows", StringComparison.OrdinalIgnoreCase))
+        {
+            modifiers |= VirtualKeyModifiers.Windows;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static HOT_KEY_MODIFIERS ToWin32Modifiers(VirtualKeyModifiers modifiers)
+    {
+        HOT_KEY_MODIFIERS result = 0;
+
+        if ((modifiers & VirtualKeyModifiers.Control) != 0) result |= HOT_KEY_MODIFIERS.MOD_CONTROL;
+        if ((modifiers & VirtualKeyModifiers.Menu) != 0) result |= HOT_KEY_MODIFIERS.MOD_ALT;
+        if ((modifiers & VirtualKeyModifiers.Shift) != 0) result |= HOT_KEY_MODIFIERS.MOD_SHIFT;
+        if ((modifiers & VirtualKeyModifiers.Windows) != 0) result |= HOT_KEY_MODIFIERS.MOD_WIN;
+
+        return result;
+    }
+
+    private static bool TryParseVirtualKey(string keyString, out VirtualKey key)
+    {
+        key = VirtualKey.F6;
+        var trimmed = keyString.Trim();
+
+        if (trimmed.Length == 0)
+        {
+            return false;
+        }
+
+        if (Enum.TryParse(trimmed, ignoreCase: true, out VirtualKey parsedKey))
+        {
+            key = parsedKey;
+            return true;
+        }
+
+        if (trimmed.Length == 1 && char.IsLetterOrDigit(trimmed[0]) && Enum.TryParse(char.ToUpperInvariant(trimmed[0]).ToString(), ignoreCase: true, out parsedKey))
+        {
+            key = parsedKey;
+            return true;
+        }
+
+        return trimmed.Equals("Space", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Space)
+            : trimmed.Equals("Enter", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Return", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Enter)
+            : trimmed.Equals("Escape", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Esc", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Escape)
+            : trimmed.Equals("Tab", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Tab)
+            : trimmed.Equals("Backspace", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Back", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Back)
+            : trimmed.Equals("Delete", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Del", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Delete)
+            : trimmed.Equals("Insert", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Ins", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Insert)
+            : trimmed.Equals("Home", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Home)
+            : trimmed.Equals("End", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.End)
+            : trimmed.Equals("PageUp", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageUp)
+            : trimmed.Equals("PageDown", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageDown)
+            : trimmed.Equals("Up", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Up)
+            : trimmed.Equals("Down", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Down)
+            : trimmed.Equals("Left", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Left)
+            : trimmed.Equals("Right", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Right)
+            : trimmed.Equals("Pause", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Pause)
+            : trimmed.Equals("PrintScreen", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Print", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Snapshot)
+            : trimmed.Equals("NumLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.NumberKeyLock)
+            : trimmed.Equals("CapsLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.CapitalLock)
+            : trimmed.Equals("ScrollLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Scroll)
+            : false;
+    }
+
+    private static bool Set(out VirtualKey key, VirtualKey value)
+    {
+        key = value;
+        return true;
     }
 }
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index f196e7ea..0b979662 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -20,9 +20,9 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
-using System.Diagnostics;
+using Windows.Win32.Foundation;
+using WinRT.Interop;
 using WinUIEx.Messaging;
-using Windows.System;
 
 namespace AuraClick;
 
@@ -36,6 +36,11 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
+    /// <summary>
+    /// Current hotkey ID for the toggle shortcut.
+    /// </summary>
+    private int _currentHotKeyId = 1;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
     /// </summary>
@@ -44,19 +49,21 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        // Set shortcut keys
-        ToggleShortcut.Keys = ["F6"];
-
-        // Set tooltip
+        ToggleShortcut.Keys = new List<object> { "F6" };
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
+    /// <summary>
+    /// Registers a hotkey based on the current shortcut keys.
+    /// </summary>
+    private void RegisterHotkey()
+    {
+        HotkeyManager.RegisterHotkey(_currentHotKeyId, ToggleShortcut.Keys);
+    }
+
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
-    /// <param name="isChecked">The state of the enabling CheckBox.</param>
-    /// <param name="isRunning">The state of the start/running toggle.</param>
-    /// <returns> <c>true</c> to enable the control when the checkbox is checked and the running toggle is off; otherwise, <c>false</c>.</returns>
     private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     {
         return (isChecked ?? false) && !(isRunning ?? false);
@@ -65,38 +72,30 @@ private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     /// <summary>
     /// Handles the Loaded event of the MainPage control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
-    private async void MainPage_Loaded(object sender, RoutedEventArgs e)
+    private void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
-        // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
         // Get window handle
         MainWindow window = App.MainWindow;
+        HWND hWnd = new(WindowNative.GetWindowHandle(window));
 
         // Set up window message monitor
         WindowMessageMonitor monitor = new(window);
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
-        HotkeyManager.RegisterHotkey(1, VirtualKeyModifiers.None, VirtualKey.F6);
+        // Register hotkey
+        RegisterHotkey();
     }
 
     /// <summary>
     /// Handles the WindowMessageReceived event of the WindowMessageMonitor control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312) // WM_HOTKEY event
+        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == _currentHotKeyId && ToggleButtonStart.IsEnabled)
         {
-            Debug.WriteLine(e.Message);
-
-            if (ToggleButtonStart.IsEnabled)
-            {
-                ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
-            }
+            ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
     }
 
@@ -111,7 +110,6 @@ public static void RefreshNotificationBadge()
     /// <summary>
     /// Sets the notification badge.
     /// </summary>
-    /// <param name="glyph">The badge notification glyph.</param>
     private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     {
         if (glyph == BadgeNotificationGlyph.Paused && settingsPage.NotificationBadgePaused)
@@ -131,18 +129,13 @@ private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     /// <summary>
     /// Handles the Checked event of the ToggleButtonStart control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     {
-        // Update controls
         ToggleButtonStart.IsEnabled = false;
         await Task.Delay(1000);
         FontIconStart.Glyph = "\uEDB4";
         SetNotificationBadge(BadgeNotificationGlyph.Playing);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStop".GetLocalized());
-
-        // Start auto clicker
         AutoClicker.Start();
         ToggleButtonStart.IsEnabled = true;
     }
@@ -150,41 +143,40 @@ private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     /// <summary>
     /// Handles the Unchecked event of the ToggleButtonStart control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void ToggleButtonStart_OnUnchecked(object sender, RoutedEventArgs e)
     {
-        // Update controls
         FontIconStart.Glyph = "\uEE4A";
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
-
-        // Stop auto clicker
         AutoClicker.Stop();
     }
 
     /// <summary>
     /// Handles the Click event of the SettingsButton control.
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The event data.</param>
     private void SettingsButton_Click(object sender, RoutedEventArgs e)
     {
         _ = Frame.Navigate(typeof(SettingsPage), null, new SuppressNavigationTransitionInfo());
     }
 
+    /// <summary>
+    /// Handles the PrimaryButtonClick event of the Shortcut control.
+    /// </summary>
     private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-
-        Debug.WriteLine("New hotkey saved: " + string.Join(" + ", ToggleShortcut.Keys));
+        RegisterHotkey();
     }
 
+    /// <summary>
+    /// Handles the SecondaryButtonClick event of the Shortcut control.
+    /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = new List<object> { "F6" };
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
+        RegisterHotkey();
     }
 }

From 14da9cf800d47420263cd595d48978dced33887f Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:19:38 -0700
Subject: [PATCH 33/44] Cleanup structure

---
 AuraClick/Helpers/HotkeyManager.cs |  3 ++-
 AuraClick/Pages/MainPage.xaml.cs   | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 8694e6f9..78177611 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -8,7 +8,7 @@
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// but WITHOUT ANY WARRANTY without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU Affero General Public License for more details.
 //
@@ -23,6 +23,7 @@
 
 namespace AuraClick.Helpers;
 
+// TODO: Cleanup this code to be more maintainable
 internal static class HotkeyManager
 {
     public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 0b979662..aa24a986 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -37,9 +37,9 @@ public sealed partial class MainPage
     private static readonly SettingsPage settingsPage = new();
 
     /// <summary>
-    /// Current hotkey ID for the toggle shortcut.
+    /// Hotkey ID for the toggle shortcut.
     /// </summary>
-    private int _currentHotKeyId = 1;
+    private const int ToggleHotkeyId = 1;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
@@ -49,18 +49,10 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        ToggleShortcut.Keys = new List<object> { "F6" };
+        ToggleShortcut.Keys = ["F6"];
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
-    /// <summary>
-    /// Registers a hotkey based on the current shortcut keys.
-    /// </summary>
-    private void RegisterHotkey()
-    {
-        HotkeyManager.RegisterHotkey(_currentHotKeyId, ToggleShortcut.Keys);
-    }
-
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
@@ -74,6 +66,7 @@ private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     /// </summary>
     private void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
+        // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
         // Get window handle
@@ -85,7 +78,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
         // Register hotkey
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 
     /// <summary>
@@ -93,7 +86,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == _currentHotKeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
@@ -166,7 +159,7 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     {
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 
     /// <summary>
@@ -174,9 +167,9 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = new List<object> { "F6" };
+        ToggleShortcut.Keys = ["F6"];
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        RegisterHotkey();
+        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
     }
 }

From df0dcdbd506d23388653b0acb71fe5666e0f9995 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:27:50 -0700
Subject: [PATCH 34/44] Use PInvoke for message m

---
 AuraClick/NativeMethods.txt      | 3 ++-
 AuraClick/Pages/MainPage.xaml.cs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AuraClick/NativeMethods.txt b/AuraClick/NativeMethods.txt
index b3ee903d..c5975d20 100644
--- a/AuraClick/NativeMethods.txt
+++ b/AuraClick/NativeMethods.txt
@@ -6,4 +6,5 @@ GetCurrentProcess
 SetPriorityClass
 PROCESS_POWER_THROTTLING_CURRENT_VERSION
 PROCESS_POWER_THROTTLING_EXECUTION_SPEED
-PROCESS_POWER_THROTTLING_STATE
\ No newline at end of file
+PROCESS_POWER_THROTTLING_STATE
+WM_HOTKEY
\ No newline at end of file
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index aa24a986..accec515 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -20,6 +20,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
+using Windows.Win32;
 using Windows.Win32.Foundation;
 using WinRT.Interop;
 using WinUIEx.Messaging;
@@ -86,7 +87,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == 0x0312 && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }

From a614c1aefa4a224d39a50f912f09e76462385c38 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 19:52:09 -0700
Subject: [PATCH 35/44] Keep monitor alive

---
 AuraClick/Pages/MainPage.xaml.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index accec515..b81e4969 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -37,6 +37,11 @@ public sealed partial class MainPage
     /// </summary>
     private static readonly SettingsPage settingsPage = new();
 
+    /// <summary>
+    /// Window message monitor for hotkey handling.
+    /// </summary>
+    private WindowMessageMonitor? monitor;
+
     /// <summary>
     /// Hotkey ID for the toggle shortcut.
     /// </summary>
@@ -70,12 +75,9 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
-        // Get window handle
-        MainWindow window = App.MainWindow;
-        HWND hWnd = new(WindowNative.GetWindowHandle(window));
-
         // Set up window message monitor
-        WindowMessageMonitor monitor = new(window);
+        MainWindow window = App.MainWindow;
+        monitor = new(window);
         monitor.WindowMessageReceived += OnWindowMessageReceived;
 
         // Register hotkey
@@ -87,7 +89,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }

From 03ba0e4f59922228a928555577a66cf52e5c518f Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Thu, 30 Apr 2026 20:02:46 -0700
Subject: [PATCH 36/44] Remove start delay

---
 AuraClick/Pages/MainPage.xaml.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index b81e4969..d022dc36 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -89,7 +89,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
-        if (e.Message.MessageId == PInvoke.WM_HOTKEY && (int)e.Message.WParam == ToggleHotkeyId && ToggleButtonStart.IsEnabled)
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
@@ -128,11 +128,13 @@ private static void SetNotificationBadge(BadgeNotificationGlyph glyph)
     private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     {
         ToggleButtonStart.IsEnabled = false;
-        await Task.Delay(1000);
+
         FontIconStart.Glyph = "\uEDB4";
         SetNotificationBadge(BadgeNotificationGlyph.Playing);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStop".GetLocalized());
         AutoClicker.Start();
+
+        await Task.Delay(1000);
         ToggleButtonStart.IsEnabled = true;
     }
 
@@ -141,6 +143,7 @@ private async void ToggleButtonStart_OnChecked(object sender, RoutedEventArgs e)
     /// </summary>
     private void ToggleButtonStart_OnUnchecked(object sender, RoutedEventArgs e)
     {
+        ToggleButtonStart.IsEnabled = true;
         FontIconStart.Glyph = "\uEE4A";
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());

From 786dbd299dc475518fb455661ada6fc6c9b31a31 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 1 May 2026 01:36:20 -0700
Subject: [PATCH 37/44] Disable toggling auto clicker in settings

---
 AuraClick/Pages/MainPage.xaml    | 3 ++-
 AuraClick/Pages/MainPage.xaml.cs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/AuraClick/Pages/MainPage.xaml b/AuraClick/Pages/MainPage.xaml
index 766bbf87..e466bc94 100644
--- a/AuraClick/Pages/MainPage.xaml
+++ b/AuraClick/Pages/MainPage.xaml
@@ -182,7 +182,8 @@
                 x:Uid="ButtonSettings"
                 Grid.Column="1"
                 Height="32"
-                Click="SettingsButton_Click">
+                Click="SettingsButton_Click"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}">
                 <AnimatedIcon FallbackIconSource="{ui:FontIconSource Glyph=&#xE713;}">
                     <AnimatedIcon.Source>
                         <animatedvisuals:AnimatedSettingsVisualSource />
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index d022dc36..014eb6a1 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -89,6 +89,12 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnWindowMessageReceived(object? sender, WindowMessageEventArgs e)
     {
+        // Allow hotkey only on main page
+        if (Frame.Content is not MainPage)
+        {
+            return;
+        }
+
         if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId)
         {
             ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;

From 80132e877c2370d373559006ba57ff4fca853ba6 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Fri, 1 May 2026 01:53:37 -0700
Subject: [PATCH 38/44] Cleanup codr

---
 AuraClick/Helpers/HotkeyManager.cs | 8 ++++----
 AuraClick/Pages/MainPage.xaml.cs   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 78177611..8fd48934 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -1,18 +1,18 @@
-// Copyright (C) 2025 Ryan Luu
+// Copyright (C) 2026 Ryan Luu
 //
 // This file is part of Aura Click.
 //
 // Aura Click is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
+// it under the terms of the GNU General Public License as published
 // by the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
 // Aura Click is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
+// GNU General Public License for more details.
 //
-// You should have received a copy of the GNU Affero General Public License
+// You should have received a copy of the GNU General Public License
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
 using Windows.System;
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 014eb6a1..e7e45bea 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -21,8 +21,6 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
 using Windows.Win32;
-using Windows.Win32.Foundation;
-using WinRT.Interop;
 using WinUIEx.Messaging;
 
 namespace AuraClick;

From 56b6e215e1b56a64203f9674b32c7a3b6b5f97d0 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sat, 2 May 2026 02:41:13 -0700
Subject: [PATCH 39/44] Remove hard coded hotk

---
 AuraClick/Helpers/HotkeyManager.cs | 119 +++++------------------------
 AuraClick/Pages/MainPage.xaml.cs   |  14 +++-
 2 files changed, 32 insertions(+), 101 deletions(-)

diff --git a/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
index 8fd48934..2e4be8d5 100644
--- a/AuraClick/Helpers/HotkeyManager.cs
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
+using DevWinUI;
 using Windows.System;
 using Windows.Win32;
 using Windows.Win32.Foundation;
@@ -23,7 +24,6 @@
 
 namespace AuraClick.Helpers;
 
-// TODO: Cleanup this code to be more maintainable
 internal static class HotkeyManager
 {
     public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
@@ -33,143 +33,66 @@ public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
             return false;
         }
 
-        return RegisterHotkey(hotkeyId, modifiers, virtualKey);
-    }
-
-    public static bool RegisterHotkey(int hotkeyId, VirtualKeyModifiers modifiers, VirtualKey virtualKey)
-    {
         var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
         UnregisterHotkey(hotkeyId);
         return PInvoke.RegisterHotKey(hWnd, hotkeyId, ToWin32Modifiers(modifiers) | HOT_KEY_MODIFIERS.MOD_NOREPEAT, (uint)virtualKey);
     }
 
     public static bool UnregisterHotkey(int hotkeyId)
-    {
-        var hWnd = new HWND(WindowNative.GetWindowHandle(App.MainWindow));
-        return PInvoke.UnregisterHotKey(hWnd, hotkeyId);
-    }
+        => PInvoke.UnregisterHotKey(new HWND(WindowNative.GetWindowHandle(App.MainWindow)), hotkeyId);
 
-    public static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    private static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
     {
         modifiers = VirtualKeyModifiers.None;
-        virtualKey = VirtualKey.F6;
+        virtualKey = VirtualKey.None;
 
         if (keys is null)
         {
             return false;
         }
 
-        foreach (var keyItem in keys)
+        foreach (var key in keys)
         {
-            var keyString = keyItem?.ToString();
-            if (string.IsNullOrWhiteSpace(keyString))
+            if (key is not KeyVisualInfo keyInfo || keyInfo.Key is not VirtualKey keyCode)
             {
                 continue;
             }
 
-            if (TryAddModifier(keyString, ref modifiers))
+            if (TryGetModifier(keyCode, out var modifier))
             {
-                continue;
+                modifiers |= modifier;
             }
-
-            if (TryParseVirtualKey(keyString, out var key))
+            else
             {
-                virtualKey = key;
+                virtualKey = keyCode;
             }
         }
 
-        return modifiers != VirtualKeyModifiers.None || virtualKey != VirtualKey.F6;
+        return virtualKey != VirtualKey.None;
     }
 
-    private static bool TryAddModifier(string keyString, ref VirtualKeyModifiers modifiers)
+    private static bool TryGetModifier(VirtualKey keyCode, out VirtualKeyModifiers modifier)
     {
-        if (keyString.Equals("Ctrl", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Control", StringComparison.OrdinalIgnoreCase))
+        modifier = keyCode switch
         {
-            modifiers |= VirtualKeyModifiers.Control;
-            return true;
-        }
-
-        if (keyString.Equals("Shift", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Shift;
-            return true;
-        }
-
-        if (keyString.Equals("Alt", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Menu", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Menu;
-            return true;
-        }
-
-        if (keyString.Equals("Win", StringComparison.OrdinalIgnoreCase) || keyString.Equals("Windows", StringComparison.OrdinalIgnoreCase))
-        {
-            modifiers |= VirtualKeyModifiers.Windows;
-            return true;
-        }
-
-        return false;
+            VirtualKey.Control or VirtualKey.LeftControl or VirtualKey.RightControl => VirtualKeyModifiers.Control,
+            VirtualKey.Shift or VirtualKey.LeftShift or VirtualKey.RightShift => VirtualKeyModifiers.Shift,
+            VirtualKey.Menu or VirtualKey.LeftMenu or VirtualKey.RightMenu => VirtualKeyModifiers.Menu,
+            VirtualKey.LeftWindows or VirtualKey.RightWindows => VirtualKeyModifiers.Windows,
+            _ => VirtualKeyModifiers.None,
+        };
+
+        return modifier != VirtualKeyModifiers.None;
     }
 
     private static HOT_KEY_MODIFIERS ToWin32Modifiers(VirtualKeyModifiers modifiers)
     {
         HOT_KEY_MODIFIERS result = 0;
-
         if ((modifiers & VirtualKeyModifiers.Control) != 0) result |= HOT_KEY_MODIFIERS.MOD_CONTROL;
         if ((modifiers & VirtualKeyModifiers.Menu) != 0) result |= HOT_KEY_MODIFIERS.MOD_ALT;
         if ((modifiers & VirtualKeyModifiers.Shift) != 0) result |= HOT_KEY_MODIFIERS.MOD_SHIFT;
         if ((modifiers & VirtualKeyModifiers.Windows) != 0) result |= HOT_KEY_MODIFIERS.MOD_WIN;
-
         return result;
     }
 
-    private static bool TryParseVirtualKey(string keyString, out VirtualKey key)
-    {
-        key = VirtualKey.F6;
-        var trimmed = keyString.Trim();
-
-        if (trimmed.Length == 0)
-        {
-            return false;
-        }
-
-        if (Enum.TryParse(trimmed, ignoreCase: true, out VirtualKey parsedKey))
-        {
-            key = parsedKey;
-            return true;
-        }
-
-        if (trimmed.Length == 1 && char.IsLetterOrDigit(trimmed[0]) && Enum.TryParse(char.ToUpperInvariant(trimmed[0]).ToString(), ignoreCase: true, out parsedKey))
-        {
-            key = parsedKey;
-            return true;
-        }
-
-        return trimmed.Equals("Space", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Space)
-            : trimmed.Equals("Enter", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Return", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Enter)
-            : trimmed.Equals("Escape", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Esc", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Escape)
-            : trimmed.Equals("Tab", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Tab)
-            : trimmed.Equals("Backspace", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Back", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Back)
-            : trimmed.Equals("Delete", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Del", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Delete)
-            : trimmed.Equals("Insert", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Ins", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Insert)
-            : trimmed.Equals("Home", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Home)
-            : trimmed.Equals("End", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.End)
-            : trimmed.Equals("PageUp", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageUp)
-            : trimmed.Equals("PageDown", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.PageDown)
-            : trimmed.Equals("Up", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Up)
-            : trimmed.Equals("Down", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Down)
-            : trimmed.Equals("Left", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Left)
-            : trimmed.Equals("Right", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Right)
-            : trimmed.Equals("Pause", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Pause)
-            : trimmed.Equals("PrintScreen", StringComparison.OrdinalIgnoreCase) || trimmed.Equals("Print", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Snapshot)
-            : trimmed.Equals("NumLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.NumberKeyLock)
-            : trimmed.Equals("CapsLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.CapitalLock)
-            : trimmed.Equals("ScrollLock", StringComparison.OrdinalIgnoreCase) ? Set(out key, VirtualKey.Scroll)
-            : false;
-    }
-
-    private static bool Set(out VirtualKey key, VirtualKey value)
-    {
-        key = value;
-        return true;
-    }
 }
diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index e7e45bea..8652aac3 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -16,12 +16,15 @@
 // along with Aura Click. If not, see <https://www.gnu.org/licenses/>.
 
 using AuraClick.Helpers;
+using DevWinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.BadgeNotifications;
+using Windows.System;
 using Windows.Win32;
-using WinUIEx.Messaging;
+using WindowMessageEventArgs = WinUIEx.Messaging.WindowMessageEventArgs;
+using WindowMessageMonitor = WinUIEx.Messaging.WindowMessageMonitor;
 
 namespace AuraClick;
 
@@ -53,10 +56,15 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = CreateDefaultShortcut();
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
+    private static List<object> CreateDefaultShortcut()
+    {
+        return [new KeyVisualInfo { Key = VirtualKey.F6, KeyName = "F6" }];
+    }
+
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
@@ -177,7 +185,7 @@ private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButto
     /// </summary>
     private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
-        ToggleShortcut.Keys = ["F6"];
+        ToggleShortcut.Keys = CreateDefaultShortcut();
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
         HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);

From 9bf349c10dfe98d8ad732d294f18d04f93db1d55 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Mon, 4 May 2026 21:12:34 -0700
Subject: [PATCH 40/44] Fix using value for bool negation

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Ryan Luu <ryan.luu@ryanluu.dev>
---
 AuraClick/Pages/MainPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml b/AuraClick/Pages/MainPage.xaml
index e466bc94..6ac3eb54 100644
--- a/AuraClick/Pages/MainPage.xaml
+++ b/AuraClick/Pages/MainPage.xaml
@@ -113,10 +113,10 @@
             <dev:IsEnabledTextBlock
                 x:Name="HotkeyTextBlock"
                 x:Uid="TextBlockHotkey"
-                IsEnabled="{x:Bind ToggleButtonStart.IsChecked.Value, Converter={StaticResource BoolNegationConverter}}" />
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}" />
             <dev:Shortcut
                 x:Name="ToggleShortcut"
-                IsEnabled="{x:Bind ToggleButtonStart.IsChecked.Value, Converter={StaticResource BoolNegationConverter}}"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}"
                 PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick"
                 SecondaryButtonClick="ToggleShortcut_SecondaryButtonClick" />
         </StackPanel>

From b750e8f7b5b3446348e583deba69d001a0861748 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Mon, 4 May 2026 21:30:27 -0700
Subject: [PATCH 41/44] Fix monitor duplication

---
 AuraClick/Pages/MainPage.xaml.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 8652aac3..9e6cc313 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -82,9 +82,12 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
         // Set up window message monitor
-        MainWindow window = App.MainWindow;
-        monitor = new(window);
-        monitor.WindowMessageReceived += OnWindowMessageReceived;
+        if (monitor is null)
+        {
+            MainWindow window = App.MainWindow;
+            monitor = new(window);
+            monitor.WindowMessageReceived += OnWindowMessageReceived;
+        }
 
         // Register hotkey
         HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);

From 90d4f07a5b96bc9b649833475f4cd6df85efa6ad Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Mon, 4 May 2026 21:54:42 -0700
Subject: [PATCH 42/44] Redirect to HEAD commit

---
 AuraClick/Pages/SettingsPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AuraClick/Pages/SettingsPage.xaml b/AuraClick/Pages/SettingsPage.xaml
index 42a0968d..623bcbde 100644
--- a/AuraClick/Pages/SettingsPage.xaml
+++ b/AuraClick/Pages/SettingsPage.xaml
@@ -95,11 +95,11 @@
                                 <HyperlinkButton
                                     x:Uid="HyperlinkButtonPrivacyPolicy"
                                     Margin="{StaticResource HyperlinkButtonNegativeMargin}"
-                                    NavigateUri="https://github.com/ryanlua/auraclick/blob/main/PRIVACY_POLICY.md" />
+                                    NavigateUri="https://github.com/ryanlua/auraclick/blob/HEAD/PRIVACY_POLICY.md" />
                                 <HyperlinkButton
                                     x:Uid="HyperlinkButtonLicense"
                                     Margin="{StaticResource HyperlinkButtonNegativeMargin}"
-                                    NavigateUri="https://github.com/ryanlua/auraclick/blob/main/COPYING.md" />
+                                    NavigateUri="https://github.com/ryanlua/auraclick/blob/HEAD/COPYING.md" />
                             </StackPanel>
                         </controls:SettingsCard>
 

From 0f6baf3e815cf4c59b12a7c79d3ec17e963fe1cf Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Mon, 4 May 2026 21:54:53 -0700
Subject: [PATCH 43/44] Add erroring for hotkeys

---
 AuraClick/Pages/MainPage.xaml.cs | 38 +++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 9e6cc313..7a208322 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -65,6 +65,32 @@ private static List<object> CreateDefaultShortcut()
         return [new KeyVisualInfo { Key = VirtualKey.F6, KeyName = "F6" }];
     }
 
+    private async Task ShowHotkeyRegistrationFailedAsync()
+    {
+        ContentDialog dialog = new()
+        {
+            // XamlRoot must be set in the case of a ContentDialog running in a Desktop app
+            XamlRoot = XamlRoot,
+            Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style,
+            Title = "Failed to register hotkey",
+            Content = "Please modify the hotkey setting.",
+            CloseButtonText = "OK",
+            DefaultButton = ContentDialogButton.Primary
+        };
+
+        _ = await dialog.ShowAsync();
+    }
+
+    private async Task ApplyHotkeySelectionAsync()
+    {
+        if (HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys))
+        {
+            return;
+        }
+
+        await ShowHotkeyRegistrationFailedAsync();
+    }
+
     /// <summary>
     /// Determines whether a control should be enabled based on a checkbox state and a running-state toggle.
     /// </summary>
@@ -76,7 +102,7 @@ private bool IsControlEnabled(bool? isChecked, bool? isRunning)
     /// <summary>
     /// Handles the Loaded event of the MainPage control.
     /// </summary>
-    private void MainPage_Loaded(object sender, RoutedEventArgs e)
+    private async void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
@@ -90,7 +116,7 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e)
         }
 
         // Register hotkey
-        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
+        await ApplyHotkeySelectionAsync();
     }
 
     /// <summary>
@@ -176,21 +202,21 @@ private void SettingsButton_Click(object sender, RoutedEventArgs e)
     /// <summary>
     /// Handles the PrimaryButtonClick event of the Shortcut control.
     /// </summary>
-    private void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    private async void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
+        await ApplyHotkeySelectionAsync();
     }
 
     /// <summary>
     /// Handles the SecondaryButtonClick event of the Shortcut control.
     /// </summary>
-    private void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    private async void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
     {
         ToggleShortcut.Keys = CreateDefaultShortcut();
         ToggleShortcut.UpdatePreviewKeys();
         ToggleShortcut.CloseContentDialog();
-        HotkeyManager.RegisterHotkey(ToggleHotkeyId, ToggleShortcut.Keys);
+        await ApplyHotkeySelectionAsync();
     }
 }

From 189ca15bf0aba5dd04b674c711f7a045470dca7e Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Mon, 4 May 2026 22:38:39 -0700
Subject: [PATCH 44/44] Update hotkey error dialog

---
 AuraClick/Pages/MainPage.xaml.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AuraClick/Pages/MainPage.xaml.cs b/AuraClick/Pages/MainPage.xaml.cs
index 7a208322..d5b51693 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -72,10 +72,10 @@ private async Task ShowHotkeyRegistrationFailedAsync()
             // XamlRoot must be set in the case of a ContentDialog running in a Desktop app
             XamlRoot = XamlRoot,
             Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style,
-            Title = "Failed to register hotkey",
-            Content = "Please modify the hotkey setting.",
-            CloseButtonText = "OK",
-            DefaultButton = ContentDialogButton.Primary
+            Title = "Invalid hotkey",
+            Content = "Failed to register hotkey. Change the hotkey to another key.",
+            CloseButtonText = "Close",
+            DefaultButton = ContentDialogButton.Close
         };
 
         _ = await dialog.ShowAsync();