diff --git a/AuraClick/App.xaml b/AuraClick/App.xaml
index 41325f1c..4eb0b26a 100644
--- a/AuraClick/App.xaml
+++ b/AuraClick/App.xaml
@@ -8,6 +8,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/AuraClick/AuraClick.csproj b/AuraClick/AuraClick.csproj
index 29cef165..13be7c23 100644
--- a/AuraClick/AuraClick.csproj
+++ b/AuraClick/AuraClick.csproj
@@ -32,6 +32,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
+    <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>
@@ -39,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/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs b/AuraClick/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
deleted file mode 100644
index 1cbe7f74..00000000
--- a/AuraClick/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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 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 General Public License for more details.
-//
-// 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 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 AuraClick.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/AuraClick/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml b/AuraClick/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
deleted file mode 100644
index 0b3c3cd5..00000000
--- a/AuraClick/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:AuraClick.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/AuraClick/Helpers/HotkeyManager.cs b/AuraClick/Helpers/HotkeyManager.cs
new file mode 100644
index 00000000..2e4be8d5
--- /dev/null
+++ b/AuraClick/Helpers/HotkeyManager.cs
@@ -0,0 +1,98 @@
+// 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 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 General Public License for more details.
+//
+// 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;
+using Windows.Win32.UI.Input.KeyboardAndMouse;
+using WinRT.Interop;
+
+namespace AuraClick.Helpers;
+
+internal static class HotkeyManager
+{
+    public static bool RegisterHotkey(int hotkeyId, IEnumerable<object>? keys)
+    {
+        if (!TryGetHotkey(keys, out var modifiers, out var virtualKey))
+        {
+            return false;
+        }
+
+        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)
+        => PInvoke.UnregisterHotKey(new HWND(WindowNative.GetWindowHandle(App.MainWindow)), hotkeyId);
+
+    private static bool TryGetHotkey(IEnumerable<object>? keys, out VirtualKeyModifiers modifiers, out VirtualKey virtualKey)
+    {
+        modifiers = VirtualKeyModifiers.None;
+        virtualKey = VirtualKey.None;
+
+        if (keys is null)
+        {
+            return false;
+        }
+
+        foreach (var key in keys)
+        {
+            if (key is not KeyVisualInfo keyInfo || keyInfo.Key is not VirtualKey keyCode)
+            {
+                continue;
+            }
+
+            if (TryGetModifier(keyCode, out var modifier))
+            {
+                modifiers |= modifier;
+            }
+            else
+            {
+                virtualKey = keyCode;
+            }
+        }
+
+        return virtualKey != VirtualKey.None;
+    }
+
+    private static bool TryGetModifier(VirtualKey keyCode, out VirtualKeyModifiers modifier)
+    {
+        modifier = keyCode switch
+        {
+            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;
+    }
+
+}
diff --git a/AuraClick/MainWindow.xaml b/AuraClick/MainWindow.xaml
index 1a80fe04..6fa61e55 100644
--- a/AuraClick/MainWindow.xaml
+++ b/AuraClick/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>
diff --git a/AuraClick/NativeMethods.txt b/AuraClick/NativeMethods.txt
index 44852877..c5975d20 100644
--- a/AuraClick/NativeMethods.txt
+++ b/AuraClick/NativeMethods.txt
@@ -1,10 +1,10 @@
 RegisterHotKey
 UnregisterHotKey
-CallWindowProc
 SendInput
 SetProcessInformation
 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 b/AuraClick/Pages/MainPage.xaml
index a7290fb8..6ac3eb54 100644
--- a/AuraClick/Pages/MainPage.xaml
+++ b/AuraClick/Pages/MainPage.xaml
@@ -5,9 +5,9 @@
     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:AuraClick.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
     xmlns:helpers="using:AuraClick.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -43,7 +43,7 @@
 
         <!--  Click Interval  -->
         <StackPanel Grid.ColumnSpan="2" Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock
+            <dev:IsEnabledTextBlock
                 x:Name="ClickIntervalTextBlock"
                 x:Uid="TextBlockClickInterval"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}" />
@@ -110,11 +110,15 @@
             Grid.Row="2"
             Grid.Column="0"
             Spacing="{StaticResource StackPanelSpacing}">
-            <controls:IsEnabledTextBlock
+            <dev:IsEnabledTextBlock
                 x:Name="HotkeyTextBlock"
                 x:Uid="TextBlockHotkey"
                 IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}" />
-            <Button Content="F6" IsEnabled="False" />
+            <dev:Shortcut
+                x:Name="ToggleShortcut"
+                IsEnabled="{x:Bind ToggleButtonStart.IsChecked, Converter={StaticResource BoolNegationConverter}}"
+                PrimaryButtonClick="ToggleShortcut_PrimaryButtonClick"
+                SecondaryButtonClick="ToggleShortcut_SecondaryButtonClick" />
         </StackPanel>
 
         <!--  Click Repeat  -->
@@ -178,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 12d12090..d5b51693 100644
--- a/AuraClick/Pages/MainPage.xaml.cs
+++ b/AuraClick/Pages/MainPage.xaml.cs
@@ -16,15 +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 Windows.Win32.Foundation;
-using Windows.Win32.UI.Input.KeyboardAndMouse;
-using WinRT.Interop;
-using WinUIEx.Messaging;
+using WindowMessageEventArgs = WinUIEx.Messaging.WindowMessageEventArgs;
+using WindowMessageMonitor = WinUIEx.Messaging.WindowMessageMonitor;
 
 namespace AuraClick;
 
@@ -38,6 +38,16 @@ 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>
+    private const int ToggleHotkeyId = 1;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="MainPage" /> class.
     /// </summary>
@@ -46,21 +56,44 @@ public MainPage()
         InitializeComponent();
         Loaded += MainPage_Loaded;
 
-        // Set tooltip
+        ToggleShortcut.Keys = CreateDefaultShortcut();
         ToolTipService.SetToolTip(ToggleButtonStart, "ToggleButtonStartTooltipStart".GetLocalized());
     }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the hotkey is registered.
-    /// </summary>
-    private bool IsHotKeyRegistered { get; set; }
+    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 = "Invalid hotkey",
+            Content = "Failed to register hotkey. Change the hotkey to another key.",
+            CloseButtonText = "Close",
+            DefaultButton = ContentDialogButton.Close
+        };
+
+        _ = 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>
-    /// <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);
@@ -69,63 +102,37 @@ 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)
     {
         // Set badge notification
         SetNotificationBadge(BadgeNotificationGlyph.Paused);
 
-        // Prevent registering multiple hotkeys
-        if (IsHotKeyRegistered)
+        // Set up window message monitor
+        if (monitor is null)
         {
-            return;
+            MainWindow window = App.MainWindow;
+            monitor = new(window);
+            monitor.WindowMessageReceived += OnWindowMessageReceived;
         }
 
-        // 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();
-        }
+        await ApplyHotkeySelectionAsync();
     }
 
     /// <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
+        // Allow hotkey only on main page
+        if (Frame.Content is not MainPage)
         {
-            if (ToggleButtonStart.IsEnabled)
-            {
-                ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
-            }
+            return;
+        }
+
+        if (e.Message.MessageId == PInvoke.WM_HOTKEY && e.Message.WParam == ToggleHotkeyId)
+        {
+            ToggleButtonStart.IsChecked = !ToggleButtonStart.IsChecked;
         }
     }
 
@@ -140,7 +147,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)
@@ -160,45 +166,57 @@ 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();
+
+        await Task.Delay(1000);
         ToggleButtonStart.IsEnabled = true;
     }
 
     /// <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
+        ToggleButtonStart.IsEnabled = true;
         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());
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Handles the PrimaryButtonClick event of the Shortcut control.
+    /// </summary>
+    private async void ToggleShortcut_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    {
+        ToggleShortcut.UpdatePreviewKeys();
+        ToggleShortcut.CloseContentDialog();
+        await ApplyHotkeySelectionAsync();
+    }
+
+    /// <summary>
+    /// Handles the SecondaryButtonClick event of the Shortcut control.
+    /// </summary>
+    private async void ToggleShortcut_SecondaryButtonClick(object sender, ContentDialogButtonClickEventArgs e)
+    {
+        ToggleShortcut.Keys = CreateDefaultShortcut();
+        ToggleShortcut.UpdatePreviewKeys();
+        ToggleShortcut.CloseContentDialog();
+        await ApplyHotkeySelectionAsync();
+    }
+}
diff --git a/AuraClick/Pages/SettingsPage.xaml b/AuraClick/Pages/SettingsPage.xaml
index 80fa77cc..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>
 
@@ -138,6 +138,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>
 
diff --git a/AuraClick/Themes/Generic.xaml b/AuraClick/Themes/Generic.xaml
deleted file mode 100644
index d7756fcf..00000000
--- a/AuraClick/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>