diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index e0a21725135..003e72a5d86 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -113,7 +113,7 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                                 // If can parse the default value to bool, use it, otherwise use false
                                 : value is string stringValue && bool.TryParse(stringValue, out var boolValueFromString)
                                     && boolValueFromString;
-                            checkBox.Dispatcher.Invoke(() =>checkBox.IsChecked = isChecked);
+                            checkBox.Dispatcher.Invoke(() => checkBox.IsChecked = isChecked);
                             break;
                     }
                 }
@@ -154,8 +154,7 @@ public bool NeedCreateSettingPanel()
 
         public Control CreateSettingPanel()
         {
-            // No need to check if NeedCreateSettingPanel is true because CreateSettingPanel will only be called if it's true
-            // if (!NeedCreateSettingPanel()) return null;
+            if (!NeedCreateSettingPanel()) return null!;
 
             // Create main grid with two columns (Column 1: Auto, Column 2: *)
             var mainPanel = new Grid { Margin = SettingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 0f878151e72..1cccc38d938 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Text.Json.Serialization;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
@@ -113,6 +114,8 @@ public string SettingWindowFont
                 {
                     _settingWindowFont = value;
                     OnPropertyChanged();
+                    Application.Current.Resources["SettingWindowFont"] = new FontFamily(value);
+                    Application.Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(value);
                 }
             }
         }
diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 740b0d40254..887b13126cf 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -53,11 +53,11 @@
                         </Button>
                     </Grid>
                 </StackPanel>
-                <StackPanel Margin="26,12,26,0">
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                <StackPanel Margin="26 12 26 0">
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
                         <TextBlock
                             Grid.Column="0"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource actionKeywordsTitle}"
@@ -71,7 +71,7 @@
                             TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 18 0 0" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="1"
@@ -83,14 +83,14 @@
                             x:Name="tbOldActionKeyword"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Margin="14,10,10,10"
+                            Margin="14 10 10 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             FontWeight="SemiBold"
                             Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                    <StackPanel Margin="0 0 0 10" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="1"
@@ -101,7 +101,7 @@
                         <TextBox
                             x:Name="tbAction"
                             Width="105"
-                            Margin="10,10,15,10"
+                            Margin="10 10 15 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center" />
                     </StackPanel>
@@ -112,20 +112,20 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
                     Height="30"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
                     Height="30"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="btnDone_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 87698a54571..1b57d5cbe5c 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core;
 using Flow.Launcher.Core.Configuration;
@@ -18,6 +19,7 @@
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -29,6 +31,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         #region Public Properties
 
         public static IPublicAPI API { get; private set; }
+        public static bool Exiting => _mainWindow.CanClose;
 
         #endregion
 
@@ -37,7 +40,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private static readonly string ClassName = nameof(App);
 
         private static bool _disposed;
-        private MainWindow _mainWindow;
+        private static MainWindow _mainWindow;
         private readonly MainViewModel _mainVM;
         private readonly Settings _settings;
 
@@ -73,14 +76,27 @@ public App()
                         .AddSingleton(_ => _settings)
                         .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
                         .AddSingleton<Portable>()
-                        .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()
                         .AddSingleton<StringMatcher>()
                         .AddSingleton<Internationalization>()
                         .AddSingleton<IPublicAPI, PublicAPIInstance>()
-                        .AddSingleton<MainViewModel>()
                         .AddSingleton<Theme>()
+                        // Use one instance for main window view model because we only have one main window
+                        .AddSingleton<MainViewModel>()
+                        // Use one instance for welcome window view model & setting window view model because
+                        // pages in welcome window & setting window need to share the same instance and
+                        // these two view models do not need to be reset when creating new windows
                         .AddSingleton<WelcomeViewModel>()
+                        .AddSingleton<SettingWindowViewModel>()
+                        // Use transient instance for setting window page view models because
+                        // pages in setting window need to be recreated when setting window is closed
+                        .AddTransient<SettingsPaneAboutViewModel>()
+                        .AddTransient<SettingsPaneGeneralViewModel>()
+                        .AddTransient<SettingsPaneHotkeyViewModel>()
+                        .AddTransient<SettingsPanePluginsViewModel>()
+                        .AddTransient<SettingsPanePluginStoreViewModel>()
+                        .AddTransient<SettingsPaneProxyViewModel>()
+                        .AddTransient<SettingsPaneThemeViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
@@ -146,10 +162,14 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
 
                 Log.SetLogLevel(_settings.LogLevel);
 
+                // Update dynamic resources base on settings
+                Current.Resources["SettingWindowFont"] = new FontFamily(_settings.SettingWindowFont);
+                Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(_settings.SettingWindowFont);
+
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");
-                API.LogInfo(ClassName, "Runtime info:{ErrorReporting.RuntimeInfo()}");
+                API.LogInfo(ClassName, $"Runtime info:{ErrorReporting.RuntimeInfo()}");
 
                 RegisterAppDomainExceptions();
                 RegisterDispatcherUnhandledException();
@@ -169,19 +189,16 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 await PluginManager.InitializePluginsAsync();
 
                 // Change language after all plugins are initialized because we need to update plugin title based on their api
-                // TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
                 await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
 
                 await imageLoadertask;
 
                 _mainWindow = new MainWindow();
 
-                API.LogInfo(ClassName, "Dependencies Info:{ErrorReporting.DependenciesInfo()}");
-
                 Current.MainWindow = _mainWindow;
                 Current.MainWindow.Title = Constant.FlowLauncher;
 
-                // main windows needs initialized before theme change because of blur settings
+                // Main windows needs initialized before theme change because of blur settings
                 Ioc.Default.GetRequiredService<Theme>().ChangeTheme();
 
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -198,6 +215,10 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
 
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
+        /// <summary>
+        /// Check startup only for Release
+        /// </summary>
+        [Conditional("RELEASE")]
         private void AutoStartup()
         {
             // we try to enable auto-startup on first launch, or reenable if it was removed
@@ -261,7 +282,7 @@ private void RegisterExitEvents()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private void RegisterDispatcherUnhandledException()
@@ -270,7 +291,7 @@ private void RegisterDispatcherUnhandledException()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private static void RegisterAppDomainExceptions()
@@ -279,7 +300,7 @@ private static void RegisterAppDomainExceptions()
         }
 
         /// <summary>
-        /// let exception throw as normal is better for Debug
+        /// Let exception throw as normal is better for Debug
         /// </summary>
         [Conditional("RELEASE")]
         private static void RegisterTaskSchedulerUnhandledException()
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index d3c31c6da5c..0171e6d79c3 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -8,7 +8,6 @@
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     MouseDown="window_MouseDown"
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index cc07caaa21e..77febde9d5b 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -10,14 +10,14 @@ namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
-        public Settings Settings { get; }
+        private readonly Settings _settings;
 
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
 
         public CustomQueryHotkeySetting(Settings settings)
         {
-            Settings = settings;
+            _settings = settings;
             InitializeComponent();
         }
 
@@ -30,13 +30,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             if (!update)
             {
-                Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
+                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
                     Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text
                 };
-                Settings.CustomPluginHotkeys.Add(pluginHotkey);
+                _settings.CustomPluginHotkeys.Add(pluginHotkey);
 
                 HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);
             }
@@ -55,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
 
         public void UpdateItem(CustomPluginHotkey item)
         {
-            updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>
+            updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index cbdcecea6a9..d8623753f63 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -7,7 +7,6 @@
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     ResizeMode="NoResize"
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index fcee0c96196..e180f657024 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -1,15 +1,11 @@
 using System.Windows;
 using System.Windows.Input;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        public Settings Settings { get; } = Ioc.Default.GetRequiredService<Settings>();
-
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
         public string Key { get; set; } = string.Empty;
         public string Value { get; set; } = string.Empty;
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index b83bb594894..34700c61015 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -1,11 +1,12 @@
 using System;
-using System.IO;
 using System.Linq;
 using System.Security.Principal;
 using Flow.Launcher.Infrastructure;
 using Microsoft.Win32;
 using Microsoft.Win32.TaskScheduler;
 
+#nullable enable
+
 namespace Flow.Launcher.Helper;
 
 public class AutoStartup
@@ -59,11 +60,15 @@ private static bool CheckLogonTask()
             try
             {
                 // Check if the action is the same as the current executable path
-                var action = task.Definition.Actions.FirstOrDefault()!.ToString().Trim();
-                if (!Constant.ExecutablePath.Equals(action, StringComparison.OrdinalIgnoreCase) && !File.Exists(action))
+                // If not, we need to unschedule and reschedule the task
+                if (task.Definition.Actions.FirstOrDefault() is Microsoft.Win32.TaskScheduler.Action taskAction)
                 {
-                    UnscheduleLogonTask();
-                    ScheduleLogonTask();
+                    var action = taskAction.ToString().Trim();
+                    if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
+                    {
+                        UnscheduleLogonTask();
+                        ScheduleLogonTask();
+                    }
                 }
 
                 return true;
@@ -71,6 +76,7 @@ private static bool CheckLogonTask()
             catch (Exception e)
             {
                 App.API.LogError(ClassName, $"Failed to check logon task: {e}");
+                throw; // Throw exception so that App.AutoStartup can show error message
             }
         }
 
@@ -82,15 +88,27 @@ private static bool CheckRegistry()
         try
         {
             using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            var path = key?.GetValue(Constant.FlowLauncher) as string;
-            return path == Constant.ExecutablePath;
+            if (key != null)
+            {
+                // Check if the action is the same as the current executable path
+                // If not, we need to unschedule and reschedule the task
+                var action = (key.GetValue(Constant.FlowLauncher) as string) ?? string.Empty;
+                if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
+                {
+                    UnscheduleRegistry();
+                    ScheduleRegistry();
+                }
+
+                return true;
+            }
+
+            return false;
         }
         catch (Exception e)
         {
-            App.API.LogError(ClassName, $"Ignoring non-critical registry error (querying if enabled): {e}");
+            App.API.LogError(ClassName, $"Failed to check registry: {e}");
+            throw; // Throw exception so that App.AutoStartup can show error message
         }
-
-        return false;
     }
 
     public static void DisableViaLogonTaskAndRegistry()
@@ -121,8 +139,7 @@ private static void Disable(bool logonTask)
             }
             else
             {
-                using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-                key?.DeleteValue(Constant.FlowLauncher, false);
+                UnscheduleRegistry();
             }
         }
         catch (Exception e)
@@ -142,8 +159,7 @@ private static void Enable(bool logonTask)
             }
             else
             {
-                using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-                key?.SetValue(Constant.FlowLauncher, $"\"{Constant.ExecutablePath}\"");
+                ScheduleRegistry();
             }
         }
         catch (Exception e)
@@ -202,4 +218,18 @@ private static bool IsCurrentUserIsAdmin()
         var principal = new WindowsPrincipal(identity);
         return principal.IsInRole(WindowsBuiltInRole.Administrator);
     }
+
+    private static bool UnscheduleRegistry()
+    {
+        using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+        key?.DeleteValue(Constant.FlowLauncher, false);
+        return true;
+    }
+
+    private static bool ScheduleRegistry()
+    {
+        using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+        key?.SetValue(Constant.FlowLauncher, $"\"{Constant.ExecutablePath}\"");
+        return true;
+    }
 }
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 02c625da558..8e15816cf7f 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -7,15 +7,15 @@
     mc:Ignorable="d">
     <Button
         Width="Auto"
+        Click="GetNewHotkey"
         FontSize="13"
         FontWeight="Bold"
-        Foreground="{DynamicResource Color01B}"
-        Click="GetNewHotkey">
+        Foreground="{DynamicResource Color01B}">
         <Button.Template>
             <ControlTemplate TargetType="Button">
                 <Border
                     x:Name="ButtonBorder"
-                    Padding="5,0,5,0"
+                    Padding="5 0 5 0"
                     Background="{DynamicResource ButtonBackgroundColor}"
                     BorderBrush="{DynamicResource ButtonInsideBorder}"
                     BorderThickness="1"
@@ -28,26 +28,21 @@
                             <Condition Property="IsMouseOver" Value="True" />
                             <Condition Property="IsPressed" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMousePressed}" />
-                        <Setter TargetName="ButtonBorder" Property="BorderBrush"
-                                Value="{DynamicResource ButtonMousePressedInsideBorder}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
+                        <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource ButtonMousePressedInsideBorder}" />
                     </MultiTrigger>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
                             <Condition Property="IsMouseOver" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMouseOver}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
                     </MultiTrigger>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
                             <Condition Property="IsPressed" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMousePressed}" />
-                        <Setter TargetName="ButtonBorder" Property="BorderBrush"
-                                Value="{DynamicResource CustomContextHover}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
+                        <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource CustomContextHover}" />
                     </MultiTrigger>
                 </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -62,8 +57,8 @@
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Border
-                            Margin="2,5,2,5"
-                            Padding="10,5,10,5"
+                            Margin="2 5 2 5"
+                            Padding="10 5 10 5"
                             Background="{DynamicResource AccentButtonBackground}"
                             BorderThickness="1"
                             CornerRadius="5">
diff --git a/Flow.Launcher/HotkeyControlDialog.xaml b/Flow.Launcher/HotkeyControlDialog.xaml
index 9a5872f4dc1..1edce6d0634 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml
+++ b/Flow.Launcher/HotkeyControlDialog.xaml
@@ -5,7 +5,7 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Background="{DynamicResource PopuBGColor}"
     BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-    BorderThickness="0,1,0,0"
+    BorderThickness="0 1 0 0"
     CornerRadius="8"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
@@ -24,14 +24,14 @@
         </Grid.RowDefinitions>
 
         <!--  Window title and the keys in the hotkey  -->
-        <Grid Grid.Row="0" Margin="26,12,26,0">
+        <Grid Grid.Row="0" Margin="26 12 26 0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <StackPanel>
                 <TextBlock
-                    Margin="0,0,0,0"
+                    Margin="0 0 0 0"
                     FontSize="20"
                     FontWeight="SemiBold"
                     Text="{Binding WindowTitle}"
@@ -42,8 +42,8 @@
                 Grid.Row="1"
                 Width="450"
                 Height="100"
-                Margin="0,100,0,0"
-                Padding="26,12,26,0">
+                Margin="0 100 0 0"
+                Padding="26 12 26 0">
                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                     <ItemsControl ItemsSource="{Binding KeysToDisplay}">
                         <ItemsControl.ItemsPanel>
@@ -56,12 +56,12 @@
                                 <Border
                                     MinWidth="50"
                                     MinHeight="50"
-                                    Margin="5,0,5,0"
+                                    Margin="5 0 5 0"
                                     Padding="8"
                                     Background="{DynamicResource AccentButtonBackground}"
                                     CornerRadius="6">
                                     <TextBlock
-                                        Margin="5,0,5,0"
+                                        Margin="5 0 5 0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         FontSize="18"
@@ -82,9 +82,9 @@
             <Border
                 x:Name="Alert"
                 Width="420"
-                Padding="0, 10"
-                VerticalAlignment="Center"
+                Padding="0 10"
                 HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 Background="{DynamicResource InfoBarWarningBG}"
                 BorderBrush="{DynamicResource InfoBarBD}"
                 BorderThickness="1"
@@ -97,21 +97,21 @@
                     </Grid.ColumnDefinitions>
                     <ui:FontIcon
                         Grid.Column="0"
-                        Margin="20,0,14,0"
+                        Margin="20 0 14 0"
                         VerticalAlignment="Center"
                         FontSize="15"
                         Foreground="{DynamicResource InfoBarWarningIcon}"
                         Glyph="&#xf167;" />
                     <TextBlock
-                        Grid.Column="1"
                         x:Name="tbMsg"
-                        Margin="0,0,0,2"
-                        Padding="0,0,8,0"
+                        Grid.Column="1"
+                        Margin="0 0 0 2"
+                        Padding="0 0 8 0"
                         HorizontalAlignment="Left"
                         FontSize="13"
                         FontWeight="SemiBold"
-                        TextWrapping="Wrap"
-                        Foreground="{DynamicResource Color05B}" />
+                        Foreground="{DynamicResource Color05B}"
+                        TextWrapping="Wrap" />
                 </Grid>
             </Border>
 
@@ -122,7 +122,7 @@
             Grid.Row="2"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0"
+            BorderThickness="0 1 0 0"
             CornerRadius="0 0 8 8">
             <StackPanel
                 Margin="10"
@@ -132,35 +132,35 @@
                     x:Name="OverwriteBtn"
                     Height="30"
                     MinWidth="100"
-                    Margin="0,0,4,0"
+                    Margin="0 0 4 0"
                     Click="Overwrite"
                     Content="{DynamicResource commonOverwrite}"
-                    Visibility="Collapsed"
-                    Style="{StaticResource AccentButtonStyle}" />
+                    Style="{StaticResource AccentButtonStyle}"
+                    Visibility="Collapsed" />
                 <Button
                     x:Name="SaveBtn"
                     Height="30"
                     MinWidth="100"
-                    Margin="0,0,4,0"
+                    Margin="0 0 4 0"
                     Click="Save"
                     Content="{DynamicResource commonSave}"
                     Style="{StaticResource AccentButtonStyle}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,4,0"
+                    Margin="4 0 4 0"
                     Click="Reset"
                     Content="{DynamicResource commonReset}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,4,0"
+                    Margin="4 0 4 0"
                     Click="Delete"
                     Content="{DynamicResource commonDelete}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,0,0"
+                    Margin="4 0 0 0"
                     Click="Cancel"
                     Content="{DynamicResource commonCancel}" />
             </StackPanel>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 04a26f09c86..72897521b6d 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -355,7 +355,7 @@
     <system:String x:Key="logLevel">Log Level</system:String>
     <system:String x:Key="LogLevelDEBUG">Debug</system:String>
     <system:String x:Key="LogLevelINFO">Info</system:String>
-    <system:String x:Key="settingWindowFont">Setting Window Font</system:String>
+    <system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index bf7a45b1d25..381d03c1f2f 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -140,7 +140,8 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
                 _viewModel.Show();
             }
 
-            // Show notify icon when flowlauncher is hidden
+            // Initialize context menu & notify icon
+            InitializeContextMenu();
             InitializeNotifyIcon();
 
             // Initialize color scheme
@@ -270,6 +271,9 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
                     case nameof(Settings.KeepMaxResults):
                         SetupResizeMode();
                         break;
+                    case nameof(Settings.SettingWindowFont):
+                        InitializeContextMenu();
+                        break;
                 }
             };
 
@@ -320,7 +324,7 @@ private void OnClosed(object sender, EventArgs e)
 
         private void OnLocationChanged(object sender, EventArgs e)
         {
-            if (_settings.SearchWindowScreen == SearchWindowScreens.RememberLastLaunchLocation)
+            if (IsLoaded)
             {
                 _settings.WindowLeft = Left;
                 _settings.WindowTop = Top;
@@ -563,6 +567,44 @@ private void InitializeNotifyIcon()
                 Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
                 Visible = !_settings.HideNotifyIcon
             };
+
+            _notifyIcon.MouseClick += (o, e) =>
+            {
+                switch (e.Button)
+                {
+                    case MouseButtons.Left:
+                        _viewModel.ToggleFlowLauncher();
+                        break;
+                    case MouseButtons.Right:
+
+                        _contextMenu.IsOpen = true;
+                        // Get context menu handle and bring it to the foreground
+                        if (PresentationSource.FromVisual(_contextMenu) is HwndSource hwndSource)
+                        {
+                            Win32Helper.SetForegroundWindow(hwndSource.Handle);
+                        }
+
+                        _contextMenu.Focus();
+                        break;
+                }
+            };
+        }
+
+        private void UpdateNotifyIconText()
+        {
+            var menu = _contextMenu;
+            ((MenuItem)menu.Items[0]).Header = App.API.GetTranslation("iconTrayOpen") +
+                                               " (" + _settings.Hotkey + ")";
+            ((MenuItem)menu.Items[1]).Header = App.API.GetTranslation("GameMode");
+            ((MenuItem)menu.Items[2]).Header = App.API.GetTranslation("PositionReset");
+            ((MenuItem)menu.Items[3]).Header = App.API.GetTranslation("iconTraySettings");
+            ((MenuItem)menu.Items[4]).Header = App.API.GetTranslation("iconTrayExit");
+        }
+
+        private void InitializeContextMenu()
+        {
+            var menu = _contextMenu;
+            menu.Items.Clear();
             var openIcon = new FontIcon { Glyph = "\ue71e" };
             var open = new MenuItem
             {
@@ -608,38 +650,6 @@ private void InitializeNotifyIcon()
             _contextMenu.Items.Add(positionreset);
             _contextMenu.Items.Add(settings);
             _contextMenu.Items.Add(exit);
-
-            _notifyIcon.MouseClick += (o, e) =>
-            {
-                switch (e.Button)
-                {
-                    case MouseButtons.Left:
-                        _viewModel.ToggleFlowLauncher();
-                        break;
-                    case MouseButtons.Right:
-
-                        _contextMenu.IsOpen = true;
-                        // Get context menu handle and bring it to the foreground
-                        if (PresentationSource.FromVisual(_contextMenu) is HwndSource hwndSource)
-                        {
-                            Win32Helper.SetForegroundWindow(hwndSource.Handle);
-                        }
-
-                        _contextMenu.Focus();
-                        break;
-                }
-            };
-        }
-
-        private void UpdateNotifyIconText()
-        {
-            var menu = _contextMenu;
-            ((MenuItem)menu.Items[0]).Header = App.API.GetTranslation("iconTrayOpen") +
-                                               " (" + _settings.Hotkey + ")";
-            ((MenuItem)menu.Items[1]).Header = App.API.GetTranslation("GameMode");
-            ((MenuItem)menu.Items[2]).Header = App.API.GetTranslation("PositionReset");
-            ((MenuItem)menu.Items[3]).Header = App.API.GetTranslation("iconTraySettings");
-            ((MenuItem)menu.Items[4]).Header = App.API.GetTranslation("iconTrayExit");
         }
 
         #endregion
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
index 448efb9cf44..961f727ae91 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
@@ -23,12 +23,12 @@
                         <Border.Style>
                             <Style TargetType="{x:Type Border}">
                                 <Setter Property="Background" Value="{DynamicResource Color12B}" />
-                                <Setter Property="Padding" Value="5,0,5,0" />
+                                <Setter Property="Padding" Value="5 0 5 0" />
                                 <Setter Property="BorderThickness" Value="1" />
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
                                         <Setter Property="Background" Value="Transparent" />
-                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="Padding" Value="0 0 0 0" />
                                         <Setter Property="BorderThickness" Value="0" />
                                     </DataTrigger>
                                 </Style.Triggers>
@@ -51,14 +51,14 @@
                                 <Border.Style>
                                     <Style TargetType="{x:Type Border}">
                                         <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
-                                        <Setter Property="Padding" Value="10,5,10,5" />
-                                        <Setter Property="Margin" Value="2,5,2,5" />
+                                        <Setter Property="Padding" Value="10 5 10 5" />
+                                        <Setter Property="Margin" Value="2 5 2 5" />
                                         <Setter Property="BorderThickness" Value="1" />
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
                                                 <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-                                                <Setter Property="Padding" Value="10,5,10,5" />
-                                                <Setter Property="Margin" Value="2,0,2,0" />
+                                                <Setter Property="Padding" Value="10 5 10 5" />
+                                                <Setter Property="Margin" Value="2 0 2 0" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
index 9b19ffd8626..bc167184b73 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
@@ -42,14 +42,11 @@ public DisplayType Type
 
         private static void keyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var control = d as UserControl;
-            if (null == control) return; // This should not be possible
+            if (d is not UserControl) return; // This should not be possible
 
-            var newValue = e.NewValue as string;
-            if (null == newValue) return;
+            if (e.NewValue is not string newValue) return;
 
-            if (d is not HotkeyDisplay hotkeyDisplay)
-                return;
+            if (d is not HotkeyDisplay hotkeyDisplay) return;
 
             hotkeyDisplay.Values.Clear();
             foreach (var key in newValue.Split('+'))
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index ef85e8724b7..0e101a0fe9e 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -4,6 +4,24 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
+    <!--  Setting Window Font  -->
+    <FontFamily x:Key="SettingWindowFont">Segoe UI</FontFamily>
+    <Style TargetType="ui:FontIcon">
+        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
+    </Style>
+    <Style TargetType="Control">
+        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
+    </Style>
+    <Style TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
+    </Style>
+    <Style TargetType="Window">
+        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
+    </Style>
+    <FontFamily x:Key="ContentControlThemeFontFamily">
+        {DynamicResource SettingWindowFont}
+    </FontFamily>
+
     <ContextMenu x:Key="TextBoxContextMenu">
         <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}">
             <MenuItem.Icon>
@@ -1568,6 +1586,7 @@
 
     <Style BasedOn="{StaticResource DefaultPasswordBoxStyle}" TargetType="PasswordBox">
         <Setter Property="ContextMenu" Value="{StaticResource TextBoxContextMenu}" />
+        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
     </Style>
 
     <Style
@@ -2728,6 +2747,7 @@
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
                             Focusable="False"
+                            FontFamily="{DynamicResource ContentControlThemeFontFamily}"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                             IsTabStop="False"
@@ -2740,6 +2760,7 @@
                             Grid.ColumnSpan="2"
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
+                            FontFamily="{DynamicResource ContentControlThemeFontFamily}"
                             Foreground="{TemplateBinding ui:ControlHelper.PlaceholderForeground}"
                             IsHitTestVisible="False"
                             Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
index 32fdb62fc71..b6a99d9e993 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -127,7 +127,7 @@
                             Style="{DynamicResource StyleImageFadeIn}" />
                         <TextBlock
                             Canvas.Left="205"
-                            Margin="12,0,0,0"
+                            Margin="12 0 0 0"
                             VerticalAlignment="Center"
                             FontSize="30"
                             Foreground="White"
@@ -151,30 +151,30 @@
                     Style="{DynamicResource WizardMove}" />
 
 
-                <StackPanel Width="550" Margin="24,20,24,20">
-                    <StackPanel Margin="0,0,24,0">
+                <StackPanel Width="550" Margin="24 20 24 20">
+                    <StackPanel Margin="0 0 24 0">
                         <TextBlock
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource Welcome_Page1_Title}" />
                         <TextBlock
-                            Margin="0,10,24,0"
+                            Margin="0 10 24 0"
                             FontSize="14"
                             Text="{DynamicResource Welcome_Page1_Text01}"
                             TextWrapping="WrapWithOverflow" />
                         <TextBlock
-                            Margin="0,10,24,0"
+                            Margin="0 10 24 0"
                             FontSize="14"
                             Text="{DynamicResource Welcome_Page1_Text02}"
                             TextWrapping="WrapWithOverflow" />
                         <TextBlock
-                            Margin="0,30,0,0"
+                            Margin="0 30 0 0"
                             FontSize="14"
                             FontWeight="SemiBold"
                             Text="{DynamicResource language}" />
                         <ComboBox
                             Width="200"
-                            Margin="0,10,0,0"
+                            Margin="0 10 0 0"
                             DisplayMemberPath="Display"
                             ItemsSource="{Binding Languages}"
                             SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
index 64f52edffe3..a3b008206d6 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -1,29 +1,35 @@
 using System.Collections.Generic;
 using System.Windows.Navigation;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Core.Resource;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage1
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 1;
-            InitializeComponent();
+            _viewModel.PageNum = 1;
+            base.OnNavigatedTo(e);
         }
 
         private readonly Internationalization _translater = Ioc.Default.GetRequiredService<Internationalization>();
 
         public List<Language> Languages => _translater.LoadAvailableLanguages();
 
-        public Settings Settings { get; set; }
-
         public string CustomLanguage
         {
             get
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index f62cec3bf12..ca00091f5e3 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -56,7 +56,7 @@
                     Margin="0"
                     Background="{Binding PreviewBackground}">
                     <StackPanel
-                        Margin="0,80,0,0"
+                        Margin="0 80 0 0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Orientation="Horizontal">
@@ -89,29 +89,29 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page2_Title}" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page2_Text01}"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page2_Text02}"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,30,0,0"
+                        Margin="0 30 0 0"
                         FontSize="14"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncherHotkey}" />
                     <flowlauncher:HotkeyControl
-                        Margin="0,8,0,0"
+                        Margin="0 8 0 0"
                         ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
                         DefaultHotkey="Alt+Space"
                         Type="Hotkey"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
index 786b4d5063d..a63edbcda7c 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -1,25 +1,31 @@
-using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.Hotkey;
-using Flow.Launcher.Infrastructure.UserSettings;
+using System.Windows.Media;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
-using Flow.Launcher.ViewModel;
-using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage2
     {
-        public Settings Settings { get; set; }
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 2;
-            InitializeComponent();
+            _viewModel.PageNum = 2;
+            base.OnNavigatedTo(e);
         }
 
         [RelayCommand]
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index a9e3fa696ee..0c1dcfea047 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -13,15 +13,15 @@
     <Page.Resources>
         <Style x:Key="KbdLine" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Margin" Value="0,3,0,3" />
+            <Setter Property="Margin" Value="0 3 0 3" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="Kbd" TargetType="Border">
             <Setter Property="CornerRadius" Value="4" />
-            <Setter Property="Padding" Value="12,4,12,4" />
+            <Setter Property="Padding" Value="12 4 12 4" />
             <Setter Property="Background" Value="{DynamicResource Color00B}" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color18B}" />
-            <Setter Property="BorderThickness" Value="1,1,1,2" />
+            <Setter Property="BorderThickness" Value="1 1 1 2" />
         </Style>
         <Style x:Key="KbdText" TargetType="TextBlock">
             <Setter Property="TextAlignment" Value="Center" />
@@ -36,17 +36,17 @@
         </Grid.RowDefinitions>
         <TextBlock
             Grid.Row="0"
-            Margin="24,20,24,14"
+            Margin="24 20 24 14"
             FontSize="20"
             FontWeight="SemiBold"
             Text="{DynamicResource Welcome_Page3_Title}" />
         <ScrollViewer
             Grid.Row="1"
             Height="478"
-            Margin="0,0,0,0"
+            Margin="0 0 0 0"
             HorizontalAlignment="Stretch"
             FontSize="13">
-            <StackPanel Margin="24,0,24,0">
+            <StackPanel Margin="24 0 24 0">
                 <Border
                     BorderBrush="{DynamicResource Color03B}"
                     BorderThickness="0"
@@ -54,7 +54,7 @@
                     <StackPanel>
                         <cc:Card
                             Title="{DynamicResource HotkeyUpDownDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="←+→" Type="Small" />
@@ -62,7 +62,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyLeftRightDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="↑+↓" Type="Small" />
@@ -70,7 +70,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyESCDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="ESC" Type="Small" />
@@ -78,13 +78,13 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyRunDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <cc:HotkeyDisplay Keys="ENTER" Type="Small" />
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyShiftEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="SHIFT+ENTER" Type="Small" />
@@ -92,7 +92,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyCtrlEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="CTRL+ENTER" Type="Small" />
@@ -100,7 +100,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyCtrlShiftEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="CTRL+SHIFT+ENTER" Type="Small" />
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
index f59b65c1c4c..4a6610e6173 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -7,15 +7,21 @@ namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage3
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 3;
-            InitializeComponent();
+            _viewModel.PageNum = 3;
+            base.OnNavigatedTo(e);
         }
-
-        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
index 13f0030860f..e57718775c1 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage4"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -36,8 +36,8 @@
         </Style>
         <Style x:Key="RecommendQuery" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Padding" Value="20,7,12,7" />
-            <Setter Property="Margin" Value="4,4,4,4" />
+            <Setter Property="Padding" Value="20 7 12 7" />
+            <Setter Property="Margin" Value="4 4 4 4" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="QueryText" TargetType="TextBlock">
@@ -50,7 +50,7 @@
             <Setter Property="TextAlignment" Value="Left" />
             <Setter Property="TextAlignment" Value="Left" />
             <Setter Property="FontSize" Value="13" />
-            <Setter Property="Margin" Value="0,4,0,0" />
+            <Setter Property="Margin" Value="0 4 0 0" />
             <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
         </Style>
     </Page.Resources>
@@ -81,26 +81,26 @@
                             Canvas.Left="0"
                             Width="450"
                             Height="280"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             Source="../../images/page_img01.png"
                             Style="{DynamicResource StyleImageFadeIn}" />
                     </Canvas>
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page4_Title}" />
                     <TextBlock
-                        Margin="0,10,0,10"
+                        Margin="0 10 0 10"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page4_Text01}"
                         TextWrapping="WrapWithOverflow" />
                     <UniformGrid
-                        Margin="0,14,0,0"
+                        Margin="0 14 0 0"
                         Columns="2"
                         Rows="2">
                         <Border Style="{DynamicResource RecommendQuery}">
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
index 4c83f3a83e0..1ee3284d22e 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -1,21 +1,27 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
+using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
-using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage4
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 4;
-            InitializeComponent();
+            _viewModel.PageNum = 4;
+            base.OnNavigatedTo(e);
         }
-
-        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
index 3df4b506ed2..7495231aece 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -79,18 +79,18 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page5_Title}" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page5_Text01}"
                         TextWrapping="WrapWithOverflow" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 30 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnAutoStartupChecked"
                             Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@@ -98,7 +98,7 @@
                             Style="{DynamicResource DefaultCheckBoxStyle}"
                             Unchecked="OnAutoStartupUncheck" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 0 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnHideOnStartupChecked"
                             Content="{DynamicResource hideOnStartup}"
@@ -109,7 +109,7 @@
                     <Button
                         Width="150"
                         Height="40"
-                        Margin="0,60,0,0"
+                        Margin="0 60 0 0"
                         HorizontalAlignment="Right"
                         Click="BtnCancel_OnClick"
                         Content="{DynamicResource done}"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
index 95d7ff1a0d2..6328c991449 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -1,54 +1,74 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Navigation;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Microsoft.Win32;
-using Flow.Launcher.Infrastructure;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage5
     {
-        private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
-        public Settings Settings { get; set; }
-        public bool HideOnStartup { get; set; }
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 5;
-            InitializeComponent();
+            _viewModel.PageNum = 5;
+            base.OnNavigatedTo(e);
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
         {
-            SetStartup();
+            ChangeAutoStartup(true);
         }
+
         private void OnAutoStartupUncheck(object sender, RoutedEventArgs e)
         {
-            RemoveStartup();
+            ChangeAutoStartup(false);
         }
 
-        private void RemoveStartup()
+        private void ChangeAutoStartup(bool value)
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.DeleteValue(Constant.FlowLauncher, false);
-            Settings.StartFlowLauncherOnSystemStartup = false;
-        }
-        private void SetStartup()
-        {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);
-            Settings.StartFlowLauncherOnSystemStartup = true;
+            Settings.StartFlowLauncherOnSystemStartup = value;
+            try
+            {
+                if (value)
+                {
+                    if (Settings.UseLogonTaskForStartup)
+                    {
+                        AutoStartup.ChangeToViaLogonTask();
+                    }
+                    else
+                    {
+                        AutoStartup.ChangeToViaRegistry();
+                    }
+                }
+                else
+                {
+                    AutoStartup.DisableViaLogonTaskAndRegistry();
+                }
+            }
+            catch (Exception e)
+            {
+                App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
+            }
         }
 
         private void OnHideOnStartupChecked(object sender, RoutedEventArgs e)
         {
             Settings.HideOnStartup = true;
         }
+
         private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e)
         {
             Settings.HideOnStartup = false;
@@ -59,6 +79,5 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
             var window = Window.GetWindow(this);
             window.Close();
         }
-
     }
 }
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index 4fc5a91c5da..4a0928dc2e6 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -10,7 +10,6 @@
     Width="550"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
index 849056ab104..bea5b4352ac 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml.cs
+++ b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -10,13 +10,14 @@ namespace Flow.Launcher
     [INotifyPropertyChanged]
     public partial class SelectBrowserWindow : Window
     {
-        public Settings Settings { get; }
+        private readonly Settings _settings;
 
         private int selectedCustomBrowserIndex;
 
         public int SelectedCustomBrowserIndex
         {
-            get => selectedCustomBrowserIndex; set
+            get => selectedCustomBrowserIndex;
+            set
             {
                 selectedCustomBrowserIndex = value;
                 OnPropertyChanged(nameof(CustomBrowser));
@@ -27,9 +28,9 @@ public int SelectedCustomBrowserIndex
         public CustomBrowserViewModel CustomBrowser => CustomBrowsers[SelectedCustomBrowserIndex];
         public SelectBrowserWindow(Settings settings)
         {
-            Settings = settings;
-            CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(Settings.CustomBrowserList.Select(x => x.Copy()));
-            SelectedCustomBrowserIndex = Settings.CustomBrowserIndex;
+            _settings = settings;
+            CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(_settings.CustomBrowserList.Select(x => x.Copy()));
+            SelectedCustomBrowserIndex = _settings.CustomBrowserIndex;
             InitializeComponent();
         }
 
@@ -40,8 +41,8 @@ private void btnCancel_Click(object sender, RoutedEventArgs e)
 
         private void btnDone_Click(object sender, RoutedEventArgs e)
         {
-            Settings.CustomBrowserList = CustomBrowsers.ToList();
-            Settings.CustomBrowserIndex = SelectedCustomBrowserIndex;
+            _settings.CustomBrowserList = CustomBrowsers.ToList();
+            _settings.CustomBrowserIndex = SelectedCustomBrowserIndex;
             Close();
         }
 
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 7d1fe0f567f..0287af9b03a 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -10,7 +10,6 @@
     Width="600"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
index 946052e320b..bf94ddacb01 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -12,13 +12,14 @@ namespace Flow.Launcher
     [INotifyPropertyChanged]
     public partial class SelectFileManagerWindow : Window
     {
-        public Settings Settings { get; }
+        private readonly Settings _settings;
 
         private int selectedCustomExplorerIndex;
 
         public int SelectedCustomExplorerIndex
         {
-            get => selectedCustomExplorerIndex; set
+            get => selectedCustomExplorerIndex;
+            set
             {
                 selectedCustomExplorerIndex = value;
                 OnPropertyChanged(nameof(CustomExplorer));
@@ -29,9 +30,9 @@ public int SelectedCustomExplorerIndex
         public CustomExplorerViewModel CustomExplorer => CustomExplorers[SelectedCustomExplorerIndex];
         public SelectFileManagerWindow(Settings settings)
         {
-            Settings = settings;
-            CustomExplorers = new ObservableCollection<CustomExplorerViewModel>(Settings.CustomExplorerList.Select(x => x.Copy()));
-            SelectedCustomExplorerIndex = Settings.CustomExplorerIndex;
+            _settings = settings;
+            CustomExplorers = new ObservableCollection<CustomExplorerViewModel>(_settings.CustomExplorerList.Select(x => x.Copy()));
+            SelectedCustomExplorerIndex = _settings.CustomExplorerIndex;
             InitializeComponent();
         }
 
@@ -42,8 +43,8 @@ private void btnCancel_Click(object sender, RoutedEventArgs e)
 
         private void btnDone_Click(object sender, RoutedEventArgs e)
         {
-            Settings.CustomExplorerList = CustomExplorers.ToList();
-            Settings.CustomExplorerIndex = SelectedCustomExplorerIndex;
+            _settings.CustomExplorerList = CustomExplorers.ToList();
+            _settings.CustomExplorerIndex = SelectedCustomExplorerIndex;
             Close();
         }
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 6b56caf5e74..1a887c4b7f3 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -17,11 +17,12 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 public partial class SettingsPaneGeneralViewModel : BaseModel
 {
     public Settings Settings { get; }
+
     private readonly Updater _updater;
-    private readonly IPortable _portable;
+    private readonly Portable _portable;
     private readonly Internationalization _translater;
 
-    public SettingsPaneGeneralViewModel(Settings settings, Updater updater, IPortable portable, Internationalization translater)
+    public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater)
     {
         Settings = settings;
         _updater = updater;
@@ -78,7 +79,7 @@ public bool UseLogonTaskForStartup
             {
                 try
                 {
-                    if (UseLogonTaskForStartup)
+                    if (value)
                     {
                         AutoStartup.ChangeToViaLogonTask();
                     }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs
index fd2c8e09fa1..68c69f8411b 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
-using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneProxyViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneProxyViewModel.cs
index 38a6ef31eaa..6cddee8d88e 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneProxyViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneProxyViewModel.cs
@@ -1,4 +1,6 @@
 using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -8,49 +10,43 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneProxyViewModel : BaseModel
 {
-    private readonly Updater _updater;
     public Settings Settings { get; }
 
+    private readonly Updater _updater;
+
     public SettingsPaneProxyViewModel(Settings settings, Updater updater)
     {
-        _updater = updater;
         Settings = settings;
+        _updater = updater;
     }
 
     [RelayCommand]
-    private void OnTestProxyClicked()
+    private async Task OnTestProxyClickedAsync()
     {
-        var message = TestProxy();
+        var message = await TestProxyAsync();
         App.API.ShowMsgBox(App.API.GetTranslation(message));
     }
 
-    private string TestProxy()
+    private async Task<string> TestProxyAsync()
     {
         if (string.IsNullOrEmpty(Settings.Proxy.Server)) return "serverCantBeEmpty";
         if (Settings.Proxy.Port <= 0) return "portCantBeEmpty";
 
-        HttpWebRequest request = (HttpWebRequest)WebRequest.Create(_updater.GitHubRepository);
-
-        if (string.IsNullOrEmpty(Settings.Proxy.UserName) || string.IsNullOrEmpty(Settings.Proxy.Password))
+        var handler = new HttpClientHandler
         {
-            request.Proxy = new WebProxy(Settings.Proxy.Server, Settings.Proxy.Port);
-        }
-        else
+            Proxy = new WebProxy(Settings.Proxy.Server, Settings.Proxy.Port)
+        };
+
+        if (!string.IsNullOrEmpty(Settings.Proxy.UserName) && !string.IsNullOrEmpty(Settings.Proxy.Password))
         {
-            request.Proxy = new WebProxy(Settings.Proxy.Server, Settings.Proxy.Port)
-            {
-                Credentials = new NetworkCredential(Settings.Proxy.UserName, Settings.Proxy.Password)
-            };
+            handler.Proxy.Credentials = new NetworkCredential(Settings.Proxy.UserName, Settings.Proxy.Password);
         }
 
+        using var client = new HttpClient(handler);
         try
         {
-            var response = (HttpWebResponse)request.GetResponse();
-            return response.StatusCode switch
-            {
-                HttpStatusCode.OK => "proxyIsCorrect",
-                _ => "proxyConnectFailed"
-            };
+            var response = await client.GetAsync(_updater.GitHubRepository);
+            return response.IsSuccessStatusCode ? "proxyIsCorrect" : "proxyConnectFailed";
         }
         catch
         {
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 1138b286975..d542eb019f9 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -6,7 +6,6 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Media;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
@@ -22,10 +21,12 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
+    public Settings Settings { get; }
+
+    private readonly Theme _theme;
+
     private readonly string DefaultFont = Win32Helper.GetSystemDefaultFont();
     public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
-    public Settings Settings { get; }
-    private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();
 
     public static string LinkHowToCreateTheme => @"https://www.flowlauncher.com/theme-builder/";
     public static string LinkThemeGallery => "https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438";
@@ -289,59 +290,14 @@ public bool UseDate
         set => Settings.UseDate = value;
     }
 
+    public FontFamily ClockPanelFont { get; }
+
     public Brush PreviewBackground
     {
         get => WallpaperPathRetrieval.GetWallpaperBrush();
     }
 
-    public ResultsViewModel PreviewResults
-    {
-        get
-        {
-            var results = new List<Result>
-            {
-                new()
-                {
-                    Title = App.API.GetTranslation("SampleTitleExplorer"),
-                    SubTitle = App.API.GetTranslation("SampleSubTitleExplorer"),
-                    IcoPath = Path.Combine(
-                        Constant.ProgramDirectory,
-                        @"Plugins\Flow.Launcher.Plugin.Explorer\Images\explorer.png"
-                    )
-                },
-                new()
-                {
-                    Title = App.API.GetTranslation("SampleTitleWebSearch"),
-                    SubTitle = App.API.GetTranslation("SampleSubTitleWebSearch"),
-                    IcoPath = Path.Combine(
-                        Constant.ProgramDirectory,
-                        @"Plugins\Flow.Launcher.Plugin.WebSearch\Images\web_search.png"
-                    )
-                },
-                new()
-                {
-                    Title = App.API.GetTranslation("SampleTitleProgram"),
-                    SubTitle = App.API.GetTranslation("SampleSubTitleProgram"),
-                    IcoPath = Path.Combine(
-                        Constant.ProgramDirectory,
-                        @"Plugins\Flow.Launcher.Plugin.Program\Images\program.png"
-                    )
-                },
-                new()
-                {
-                    Title = App.API.GetTranslation("SampleTitleProcessKiller"),
-                    SubTitle = App.API.GetTranslation("SampleSubTitleProcessKiller"),
-                    IcoPath = Path.Combine(
-                        Constant.ProgramDirectory,
-                        @"Plugins\Flow.Launcher.Plugin.ProcessKiller\Images\app.png"
-                    )
-                }
-            };
-            var vm = new ResultsViewModel(Settings);
-            vm.AddResults(results, "PREVIEW");
-            return vm;
-        }
-    }
+    public ResultsViewModel PreviewResults { get; }
 
     public FontFamily SelectedQueryBoxFont
     {
@@ -479,9 +435,53 @@ public FamilyTypeface SelectedResultSubFontFaces
 
     public string ThemeImage => Constant.QueryTextBoxIconImagePath;
 
-    public SettingsPaneThemeViewModel(Settings settings)
+    public SettingsPaneThemeViewModel(Settings settings, Theme theme)
     {
         Settings = settings;
+        _theme = theme;
+        ClockPanelFont = new FontFamily(DefaultFont);
+        var results = new List<Result>
+            {
+                new()
+                {
+                    Title = App.API.GetTranslation("SampleTitleExplorer"),
+                    SubTitle = App.API.GetTranslation("SampleSubTitleExplorer"),
+                    IcoPath = Path.Combine(
+                        Constant.ProgramDirectory,
+                        @"Plugins\Flow.Launcher.Plugin.Explorer\Images\explorer.png"
+                    )
+                },
+                new()
+                {
+                    Title = App.API.GetTranslation("SampleTitleWebSearch"),
+                    SubTitle = App.API.GetTranslation("SampleSubTitleWebSearch"),
+                    IcoPath = Path.Combine(
+                        Constant.ProgramDirectory,
+                        @"Plugins\Flow.Launcher.Plugin.WebSearch\Images\web_search.png"
+                    )
+                },
+                new()
+                {
+                    Title = App.API.GetTranslation("SampleTitleProgram"),
+                    SubTitle = App.API.GetTranslation("SampleSubTitleProgram"),
+                    IcoPath = Path.Combine(
+                        Constant.ProgramDirectory,
+                        @"Plugins\Flow.Launcher.Plugin.Program\Images\program.png"
+                    )
+                },
+                new()
+                {
+                    Title = App.API.GetTranslation("SampleTitleProcessKiller"),
+                    SubTitle = App.API.GetTranslation("SampleSubTitleProcessKiller"),
+                    IcoPath = Path.Combine(
+                        Constant.ProgramDirectory,
+                        @"Plugins\Flow.Launcher.Plugin.ProcessKiller\Images\app.png"
+                    )
+                }
+            };
+        var vm = new ResultsViewModel(Settings);
+        vm.AddResults(results, "PREVIEW");
+        PreviewResults = vm;
     }
 
     [RelayCommand]
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 4bf5df227e5..1a92ad0c24a 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -103,10 +103,8 @@
                         Margin="0 0 12 0"
                         Command="{Binding AskClearLogFolderConfirmationCommand}"
                         Content="{Binding LogFolderSize, Mode=OneWay}" />
-                    <Button
-                        Content="&#xec7a;"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
+                    <Button>
+                        <ui:FontIcon FontSize="20" Glyph="&#xec7a;" />
                         <ui:FlyoutService.Flyout>
                             <ui:MenuFlyout>
                                 <MenuItem Command="{Binding OpenWelcomeWindowCommand}" Header="{DynamicResource welcomewindow}">
@@ -148,7 +146,7 @@
                             SelectedValuePath="Value" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource settingWindowFont}"
+                        Title="{DynamicResource settingWindowFontTitle}"
                         Icon="&#xf259;"
                         Type="Inside">
                         <StackPanel Orientation="Horizontal">
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
index 1ecc02aa6b3..e57cba6d409 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,8 +1,6 @@
 using System.Windows.Navigation;
-using Flow.Launcher.Core;
-using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -14,9 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            _viewModel = new SettingsPaneAboutViewModel(settings, updater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
index 569d489d2c6..31653962dfd 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -1,9 +1,5 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core;
-using Flow.Launcher.Core.Configuration;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher.SettingPages.Views;
@@ -16,11 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            var portable = Ioc.Default.GetRequiredService<Portable>();
-            var translater = Ioc.Default.GetRequiredService<Internationalization>();
-            _viewModel = new SettingsPaneGeneralViewModel(settings, updater, portable, translater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
index eb100da0ca8..8b757bd60a5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -13,8 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPaneHotkeyViewModel(settings);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
index 89d25377b77..5f9e57faa6f 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
@@ -37,9 +37,9 @@
         <Border
             Grid.Row="0"
             Grid.Column="0"
-            Padding="5,18,0,0">
+            Padding="5 18 0 0">
             <TextBlock
-                Margin="0,5"
+                Margin="0 5"
                 FontSize="30"
                 Style="{StaticResource PageTitle}"
                 Text="{DynamicResource pluginStore}"
@@ -49,13 +49,13 @@
         <DockPanel
             Grid.Row="0"
             Grid.Column="1"
-            Margin="5,24,0,0">
+            Margin="5 24 0 0">
 
             <TextBox
                 Name="PluginStoreFilterTextbox"
                 Width="150"
                 Height="34"
-                Margin="0,0,26,0"
+                Margin="0 0 26 0"
                 HorizontalAlignment="Right"
                 ContextMenu="{StaticResource TextBoxContextMenu}"
                 DockPanel.Dock="Right"
@@ -75,7 +75,7 @@
                                 Stretch="None">
                                 <VisualBrush.Visual>
                                     <Label
-                                        Padding="10,0,0,0"
+                                        Padding="10 0 0 0"
                                         Content="{DynamicResource searchplugin}"
                                         Foreground="{DynamicResource CustomContextDisabled}" />
                                 </VisualBrush.Visual>
@@ -97,8 +97,8 @@
             </TextBox>
             <Button
                 Height="34"
-                Margin="0,5,10,5"
-                Padding="12,4"
+                Margin="0 5 10 5"
+                Padding="12 4"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 Command="{Binding RefreshExternalPluginsCommand}"
@@ -111,8 +111,8 @@
             Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Margin="4,0,0,0"
-            Padding="0,0,18,0"
+            Margin="4 0 0 0"
+            Padding="0 0 18 0"
             FontSize="14"
             ItemContainerStyle="{StaticResource StoreList}"
             ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
@@ -125,7 +125,7 @@
                 <ItemsPanelTemplate>
                     <wpftk:VirtualizingWrapPanel
                         x:Name="ItemWrapPanel"
-                        Margin="0,0,0,10"
+                        Margin="0 0 0 10"
                         ItemSize="216,184"
                         MouseWheelDelta="48"
                         ScrollLineDelta="16"
@@ -143,7 +143,7 @@
                                         <Grid>
                                             <StackPanel Orientation="Vertical">
                                                 <TextBlock
-                                                    Margin="2,0,0,10"
+                                                    Margin="2 0 0 10"
                                                     VerticalAlignment="Top"
                                                     FontSize="16"
                                                     FontWeight="Bold"
@@ -231,10 +231,10 @@
                                     <VirtualizingStackPanel
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="5,0,0,0"
+                                        Margin="5 0 0 0"
                                         Orientation="Horizontal">
                                         <TextBlock
-                                            Margin="0,0,5,0"
+                                            Margin="0 0 5 0"
                                             VerticalAlignment="Center"
                                             FontSize="14"
                                             FontWeight="Bold"
@@ -253,7 +253,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="5,4,0,0"
+                                        Margin="5 4 0 0"
                                         TextWrapping="Wrap">
                                         <Hyperlink
                                             Foreground="{DynamicResource Color04B}"
@@ -267,13 +267,13 @@
                                         Grid.Row="0"
                                         Grid.RowSpan="2"
                                         Grid.Column="1"
-                                        Margin="20,0,0,0"
+                                        Margin="20 0 0 0"
                                         HorizontalAlignment="Right"
                                         Orientation="Horizontal">
                                         <Button
                                             MinHeight="42"
-                                            Margin="5,0"
-                                            Padding="15,5"
+                                            Margin="5 0"
+                                            Padding="15 5"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Center"
                                             Command="{Binding ShowCommandQueryCommand}"
@@ -282,8 +282,8 @@
                                             Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
                                         <Button
                                             MinHeight="42"
-                                            Margin="5,0"
-                                            Padding="15,5"
+                                            Margin="5 0"
+                                            Padding="15 5"
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Center"
                                             Command="{Binding ShowCommandQueryCommand}"
@@ -292,8 +292,8 @@
                                             Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                         <Button
                                             MinHeight="42"
-                                            Margin="5,0"
-                                            Padding="15,5"
+                                            Margin="5 0"
+                                            Padding="15 5"
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Center"
                                             Command="{Binding ShowCommandQueryCommand}"
@@ -311,15 +311,15 @@
                                     <Image
                                         Width="32"
                                         Height="32"
-                                        Margin="18,24,0,0"
+                                        Margin="18 24 0 0"
                                         HorizontalAlignment="Left"
                                         RenderOptions.BitmapScalingMode="Fant"
                                         Source="{Binding IcoPath, IsAsync=True}" />
                                     <Border
                                         x:Name="LabelUpdate"
                                         Height="12"
-                                        Margin="10,24,0,0"
-                                        Padding="6,2"
+                                        Margin="10 24 0 0"
+                                        Padding="6 2"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Top"
                                         Background="#45BD59"
@@ -328,7 +328,7 @@
                                         Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                 </StackPanel>
                                 <TextBlock
-                                    Margin="18,10,18,0"
+                                    Margin="18 10 18 0"
                                     FontWeight="SemiBold"
                                     Foreground="{DynamicResource Color05B}"
                                     Text="{Binding Name}"
@@ -336,8 +336,8 @@
                                     ToolTip="{Binding Version}" />
                                 <TextBlock
                                     Height="60"
-                                    Margin="18,6,18,0"
-                                    Padding="0,0,0,10"
+                                    Margin="18 6 18 0"
+                                    Padding="0 0 0 10"
                                     FontSize="12"
                                     Foreground="{DynamicResource Color04B}"
                                     Text="{Binding Description, Mode=OneWay}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
index 3bd24bc1323..131dfab6d29 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -5,7 +5,6 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -17,8 +16,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPanePluginStoreViewModel();
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
index f3d63030625..bb742f800e0 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
@@ -58,9 +58,9 @@
                     Margin="0 0 20 0"
                     Command="{Binding OpenHelperCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                    Content="&#xe9ce;"
-                    FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                    FontSize="14" />
+                    FontSize="14">
+                    <ui:FontIcon FontSize="14" Glyph="&#xe9ce;" />
+                </Button>
                 <TextBox
                     Name="PluginFilterTextbox"
                     Width="150"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
index f6b4351864e..97574b3ce48 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -14,8 +13,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPanePluginsViewModel(settings);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
index 768abbf978a..f429a6e29cf 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
@@ -2,11 +2,11 @@
     x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneProxy"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     Title="Proxy"
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneProxyViewModel}"
@@ -18,8 +18,8 @@
     </Page.Resources>
     <ScrollViewer
         Padding="5 0 24 0"
-        FontSize="14"
         CanContentScroll="True"
+        FontSize="14"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
 
@@ -71,9 +71,9 @@
             <cc:Card Title="{DynamicResource testProxy}" Margin="0 8 0 0">
                 <Button
                     Width="150"
+                    Command="{Binding TestProxyClickedCommand}"
                     Content="{DynamicResource testProxy}"
-                    IsEnabled="{Binding Settings.Proxy.Enabled}"
-                    Command="{Binding TestProxyClickedCommand}"/>
+                    IsEnabled="{Binding Settings.Proxy.Enabled}" />
             </cc:Card>
         </StackPanel>
     </ScrollViewer>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
index 26350b8bbd5..258f2a4adbf 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -1,8 +1,6 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -14,13 +12,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            _viewModel = new SettingsPaneProxyViewModel(settings, updater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
-
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index f7853515a38..37de8045173 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -331,20 +331,22 @@
                                                 IsReadOnly="True"
                                                 Style="{DynamicResource QueryBoxStyle}"
                                                 Text="{DynamicResource hiThere}" />
-
                                         </Border>
                                         <StackPanel
                                             x:Name="ClockPanel"
                                             IsHitTestVisible="False"
                                             Style="{DynamicResource ClockPanel}"
                                             Visibility="Visible">
+                                            <!--  Because these two textblock follow SettingWindowFont, we need to revert their font family explictly  -->
                                             <TextBlock
                                                 x:Name="ClockBox"
+                                                FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
                                                 Style="{DynamicResource ClockBox}"
                                                 Text="{Binding ClockText}"
                                                 Visibility="{Binding UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
                                             <TextBlock
                                                 x:Name="DateBox"
+                                                FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
                                                 Style="{DynamicResource DateBox}"
                                                 Text="{Binding DateText}"
                                                 Visibility="{Binding UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
index f4c103ade01..cee8e4ae468 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -1,12 +1,10 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Page = ModernWpf.Controls.Page;
 
 namespace Flow.Launcher.SettingPages.Views;
 
-public partial class SettingsPaneTheme : Page
+public partial class SettingsPaneTheme
 {
     private SettingsPaneThemeViewModel _viewModel = null!;
 
@@ -14,12 +12,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPaneThemeViewModel(settings);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
-
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index a34777d3020..a75a51c8fbb 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -13,10 +13,10 @@
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
     Closed="OnClosed"
-    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Icon="Images\app.ico"
     Left="{Binding SettingWindowLeft, Mode=TwoWay}"
     Loaded="OnLoaded"
+    LocationChanged="Window_LocationChanged"
     MouseDown="window_MouseDown"
     ResizeMode="CanResize"
     SnapsToDevicePixels="True"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index b4a3ae47a92..79bd171edfe 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Windows;
-using System.Windows.Forms;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -9,43 +9,53 @@
 using Flow.Launcher.SettingPages.Views;
 using Flow.Launcher.ViewModel;
 using ModernWpf.Controls;
-using TextBox = System.Windows.Controls.TextBox;
+using Screen = System.Windows.Forms.Screen;
 
 namespace Flow.Launcher;
 
 public partial class SettingWindow
 {
+    #region Private Fields
+
     private readonly Settings _settings;
-    private readonly SettingWindowViewModel _viewModel;
+
+    #endregion
+
+    #region Constructor
 
     public SettingWindow()
     {
-        var viewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
         _settings = Ioc.Default.GetRequiredService<Settings>();
+        var viewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
         DataContext = viewModel;
-        _viewModel = viewModel;
-        InitializePosition();
         InitializeComponent();
+
+        UpdatePositionAndState();
     }
 
+    #endregion
+
+    #region Window Events
+
     private void OnLoaded(object sender, RoutedEventArgs e)
     {
         RefreshMaximizeRestoreButton();
+
         // Fix (workaround) for the window freezes after lock screen (Win+L) or sleep
         // https://stackoverflow.com/questions/4951058/software-rendering-mode-wpf
         HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
         HwndTarget hwndTarget = hwndSource.CompositionTarget;
         hwndTarget.RenderMode = RenderMode.SoftwareOnly;  // Must use software only render mode here
 
-        InitializePosition();
+        UpdatePositionAndState();
     }
 
     private void OnClosed(object sender, EventArgs e)
     {
-        _settings.SettingWindowState = WindowState;
-        _settings.SettingWindowTop = Top;
-        _settings.SettingWindowLeft = Left;
-        _viewModel.Save();
+        // If app is exiting, settings save is not needed because main window closing event will handle this
+        if (App.Exiting) return;
+        // Save settings when window is closed
+        _settings.Save();
         App.API.SavePluginSettings();
     }
 
@@ -56,15 +66,32 @@ private void OnCloseExecuted(object sender, ExecutedRoutedEventArgs e)
 
     private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
     {
-        if (Keyboard.FocusedElement is not TextBox textBox)
-        {
-            return;
-        }
+        if (Keyboard.FocusedElement is not TextBox textBox) return;
         var tRequest = new TraversalRequest(FocusNavigationDirection.Next);
         textBox.MoveFocus(tRequest);
     }
 
-    /* Custom TitleBar */
+    private void Window_StateChanged(object sender, EventArgs e)
+    {
+        RefreshMaximizeRestoreButton();
+        if (IsLoaded)
+        {
+            _settings.SettingWindowState = WindowState;
+        }
+    }
+
+    private void Window_LocationChanged(object sender, EventArgs e)
+    {
+        if (IsLoaded)
+        {
+            _settings.SettingWindowTop = Top;
+            _settings.SettingWindowLeft = Left;
+        }
+    }
+
+    #endregion
+
+    #region Window Custom TitleBar
 
     private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)
     {
@@ -99,12 +126,11 @@ private void RefreshMaximizeRestoreButton()
         }
     }
 
-    private void Window_StateChanged(object sender, EventArgs e)
-    {
-        RefreshMaximizeRestoreButton();
-    }
+    #endregion
+
+    #region Window Position
 
-    public void InitializePosition()
+    public void UpdatePositionAndState()
     {
         var previousTop = _settings.SettingWindowTop;
         var previousLeft = _settings.SettingWindowLeft;
@@ -119,6 +145,7 @@ public void InitializePosition()
             Top = previousTop.Value;
             Left = previousLeft.Value;
         }
+
         WindowState = _settings.SettingWindowState;
     }
 
@@ -155,6 +182,10 @@ private double WindowTop()
         return top;
     }
 
+    #endregion
+
+    #region Navigation View Events
+
     private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
     {
         if (args.IsSettingsSelected)
@@ -201,4 +232,6 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
     {
         NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
     }
+
+    #endregion
 }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index f05893cf476..17a1a2b50f1 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -5,42 +5,34 @@ namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    public Settings Settings { get; }
+    private readonly Settings _settings;
 
     public SettingWindowViewModel(Settings settings)
     {
-        Settings = settings;
-    }
-
-    /// <summary>
-    /// Save Flow settings. Plugins settings are not included.
-    /// </summary>
-    public void Save()
-    {
-        Settings.Save();
+        _settings = settings;
     }
 
     public double SettingWindowWidth
     {
-        get => Settings.SettingWindowWidth;
-        set => Settings.SettingWindowWidth = value;
+        get => _settings.SettingWindowWidth;
+        set => _settings.SettingWindowWidth = value;
     }
 
     public double SettingWindowHeight
     {
-        get => Settings.SettingWindowHeight;
-        set => Settings.SettingWindowHeight = value;
+        get => _settings.SettingWindowHeight;
+        set => _settings.SettingWindowHeight = value;
     }
 
     public double? SettingWindowTop
     {
-        get => Settings.SettingWindowTop;
-        set => Settings.SettingWindowTop = value;
+        get => _settings.SettingWindowTop;
+        set => _settings.SettingWindowTop = value;
     }
 
     public double? SettingWindowLeft
     {
-        get => Settings.SettingWindowLeft;
-        set => Settings.SettingWindowLeft = value;
+        get => _settings.SettingWindowLeft;
+        set => _settings.SettingWindowLeft = value;
     }
 }
diff --git a/Flow.Launcher/ViewModel/WelcomeViewModel.cs b/Flow.Launcher/ViewModel/WelcomeViewModel.cs
index 5eecabfde85..82d19273f0b 100644
--- a/Flow.Launcher/ViewModel/WelcomeViewModel.cs
+++ b/Flow.Launcher/ViewModel/WelcomeViewModel.cs
@@ -18,6 +18,7 @@ public int PageNum
                 {
                     _pageNum = value;
                     OnPropertyChanged();
+                    OnPropertyChanged(nameof(PageDisplay));
                     UpdateView();
                 }
             }
@@ -47,7 +48,6 @@ public bool NextEnabled
 
         private void UpdateView()
         {
-            OnPropertyChanged(nameof(PageDisplay));
             if (PageNum == 1)
             {
                 BackEnabled = false;
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index e7c483f89b5..5d91db749f6 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -140,21 +140,19 @@
                         Height="40"
                         Margin="8 5 0 5"
                         Click="ForwardButton_Click"
-                        Content="&#xe76c;"
                         DockPanel.Dock="Right"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="18"
-                        IsEnabled="{Binding NextEnabled, Mode=OneWay}" />
+                        IsEnabled="{Binding NextEnabled, Mode=OneWay}">
+                        <ui:FontIcon FontSize="18" Glyph="&#xe76c;" />
+                    </Button>
                     <Button
                         x:Name="BackButton"
                         Width="40"
                         Height="40"
                         Click="BackwardButton_Click"
-                        Content="&#xe76b;"
                         DockPanel.Dock="Right"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="18"
-                        IsEnabled="{Binding BackEnabled, Mode=OneWay}" />
+                        IsEnabled="{Binding BackEnabled, Mode=OneWay}">
+                        <ui:FontIcon FontSize="18" Glyph="&#xe76b;" />
+                    </Button>
                     <StackPanel />
                 </DockPanel>
 
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index 637f9448d9a..ef07067650c 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -2,16 +2,17 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
-using Flow.Launcher.Resources.Pages;
-using ModernWpf.Media.Animation;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.ViewModel;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Resources.Pages;
+using Flow.Launcher.ViewModel;
+using ModernWpf.Media.Animation;
 
 namespace Flow.Launcher
 {
     public partial class WelcomeWindow : Window
     {
+        private readonly Settings _settings;
         private readonly WelcomeViewModel _viewModel;
 
         private readonly NavigationTransitionInfo _forwardTransitionInfo = new SlideNavigationTransitionInfo()
@@ -25,6 +26,7 @@ public partial class WelcomeWindow : Window
 
         public WelcomeWindow()
         {
+            _settings = Ioc.Default.GetRequiredService<Settings>();
             _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
@@ -76,10 +78,7 @@ private static Type PageTypeSelector(int pageNumber)
 
         private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
         {
-            if (Keyboard.FocusedElement is not TextBox textBox)
-            {
-                return;
-            }
+            if (Keyboard.FocusedElement is not TextBox textBox) return;
             var tRequest = new TraversalRequest(FocusNavigationDirection.Next);
             textBox.MoveFocus(tRequest);
         }
@@ -96,8 +95,10 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
 
         private void Window_Closed(object sender, EventArgs e)
         {
+            // If app is exiting, settings save is not needed because main window closing event will handle this
+            if (App.Exiting) return;
             // Save settings when window is closed
-            Ioc.Default.GetRequiredService<Settings>().Save();
+            _settings.Save();
         }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index f5017ced5d8..80b004ff993 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -60,17 +60,17 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}"
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,0,0,20" Orientation="Horizontal">
+                <StackPanel Margin="0 0 0 20" Orientation="Horizontal">
                     <Grid Width="474" HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -86,23 +86,23 @@
                             Grid.Row="0"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Margin="5,0,0,20">
+                            Margin="5 0 0 20">
                             <TextBlock
-                                Margin="0,0,0,4"
+                                Margin="0 0 0 4"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage01}"
                                 TextWrapping="WrapWithOverflow" />
                             <TextBlock
-                                Margin="0,4,0,4"
+                                Margin="0 4 0 4"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage02}"
                                 TextWrapping="WrapWithOverflow" />
                             <TextBlock
-                                Margin="0,4,0,0"
+                                Margin="0 4 0 0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -112,7 +112,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="5,0,20,0"
+                            Margin="5 0 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -122,14 +122,14 @@
                             Grid.Column="1"
                             Width="120"
                             Height="34"
-                            Margin="5,0,10,0"
+                            Margin="5 0 10 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Text="{Binding Name}" />
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="5,10,20,0"
+                            Margin="5 10 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -139,7 +139,7 @@
                             Grid.Column="1"
                             Width="120"
                             Height="34"
-                            Margin="5,10,10,0"
+                            Margin="5 10 10 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type local:BrowserType}}}"
@@ -147,7 +147,7 @@
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="5,10,20,0"
+                            Margin="5 10 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -159,7 +159,7 @@
                             <Button
                                 Height="34"
                                 MinWidth="100"
-                                Margin="5,10,0,0"
+                                Margin="5 10 0 0"
                                 VerticalContentAlignment="Stretch"
                                 Click="OnSelectPathClick"
                                 Content="{DynamicResource flowlauncher_plugin_browserbookmark_browseBrowserBookmark}"
@@ -167,7 +167,7 @@
                             <TextBox
                                 Name="PathTextBox"
                                 Height="34"
-                                Margin="5,10,0,0"
+                                Margin="5 10 0 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding DataDirectoryPath}" />
@@ -180,18 +180,18 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     MinWidth="145"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="CancelEditCustomBrowser"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="btnConfirm"
                     MinWidth="145"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     Click="ConfirmEditCustomBrowser"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 37a7ccb8d5b..ae0f91d93a8 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -57,20 +57,20 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource plugin_explorer_manageactionkeywords_header}"
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
                     <TextBlock
                         MinWidth="150"
-                        Margin="0,10,15,10"
+                        Margin="0 10 15 10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -84,10 +84,10 @@
                         PreviewKeyDown="TxtCurrentActionKeyword_OnKeyDown"
                         Text="{Binding ActionKeyword}" />
                 </StackPanel>
-                <StackPanel Margin="0,10,0,15" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 15" Orientation="Horizontal">
                     <TextBlock
                         MinWidth="150"
-                        Margin="0,0,18,0"
+                        Margin="0 0 18 0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -105,20 +105,20 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
                     Height="30"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="DownButton"
                     Width="145"
                     Height="30"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     Click="OnDoneButtonClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource plugin_explorer_actionkeyword_done}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 9848f51cfe0..26efc681322 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
@@ -5,21 +5,21 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Flow.Launcher.Plugin.Program.ViewModels"
-    mc:Ignorable="d"
     Title="{DynamicResource flowlauncher_plugin_program_directory}"
-    d:DataContext="{d:DesignInstance vm:AddProgramSourceViewModel}"
     Width="Auto"
     Height="276"
+    d:DataContext="{d:DesignInstance vm:AddProgramSourceViewModel}"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Width"
-    WindowStartupLocation="CenterScreen">
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
     <Window.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -59,11 +59,11 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Grid.Row="0" Margin="0 0 0 12">
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_program_edit_program_source_title}"
@@ -77,7 +77,7 @@
                         TextWrapping="WrapWithOverflow" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,10,0" Orientation="Horizontal">
+                <StackPanel Margin="0 10 10 0" Orientation="Horizontal">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -104,16 +104,16 @@
                                 HorizontalAlignment="Stretch"
                                 Click="BrowseButton_Click"
                                 Content="{DynamicResource flowlauncher_plugin_program_browse}"
-                                Visibility="{Binding IsCustomSource, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                DockPanel.Dock="Right" />
+                                DockPanel.Dock="Right"
+                                Visibility="{Binding IsCustomSource, Converter={StaticResource BooleanToVisibilityConverter}}" />
                             <TextBox
                                 Name="Directory"
                                 Width="350"
                                 Margin="10"
-                                Text="{Binding Location, Mode=TwoWay}"
-                                IsReadOnly="{Binding IsNotCustomSource}"
                                 HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center" />
+                                VerticalAlignment="Center"
+                                IsReadOnly="{Binding IsNotCustomSource}"
+                                Text="{Binding Location, Mode=TwoWay}" />
                         </DockPanel>
                         <TextBlock
                             Grid.Row="1"
@@ -127,30 +127,30 @@
                             x:Name="Chkbox"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="10,0"
-                            IsChecked="{Binding Enabled, Mode=TwoWay}"
-                            VerticalAlignment="Center" />
+                            Margin="10 0"
+                            VerticalAlignment="Center"
+                            IsChecked="{Binding Enabled, Mode=TwoWay}" />
                     </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
         <Border
             Grid.Row="1"
-            Margin="0,14,0,0"
+            Margin="0 14 0 0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     MinWidth="140"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnAdd"
                     MinWidth="140"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="BtnAdd_OnClick"
                     Content="{Binding AddBtnText}"
                     Style="{DynamicResource AccentButtonStyle}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
index 71bc12a8678..53baa79a316 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
@@ -46,8 +46,8 @@
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Margin" Value="0,5,0,0" />
-            <Setter Property="Padding" Value="15,15,15,15" />
+            <Setter Property="Margin" Value="0 5 0 0" />
+            <Setter Property="Padding" Value="15 15 15 15" />
             <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="Visibility" Value="Collapsed" />
             <Style.Triggers>
@@ -65,8 +65,8 @@
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Margin" Value="0,5,0,0" />
-            <Setter Property="Padding" Value="15,15,15,15" />
+            <Setter Property="Margin" Value="0 5 0 0" />
+            <Setter Property="Padding" Value="15 15 15 15" />
             <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="Visibility" Value="Collapsed" />
             <Style.Triggers>
@@ -120,20 +120,20 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,12,26,0">
+            <StackPanel Margin="26 12 26 0">
 
-                <StackPanel Margin="0,0,0,12">
+                <StackPanel Margin="0 0 0 12">
 
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_program_suffixes}"
                         TextAlignment="Left" />
                 </StackPanel>
                 <TextBlock
-                    Margin="0,0,0,10"
+                    Margin="0 0 0 10"
                     FontSize="14"
                     Text="{DynamicResource flowlauncher_plugin_program_only_index_tip}"
                     TextWrapping="Wrap" />
@@ -151,82 +151,82 @@
                         TextWrapping="Wrap" />
                 </Border>
 
-                <Grid Margin="0,20,0,12">
+                <Grid Margin="0 20 0 12">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="250" />
                         <ColumnDefinition Width="250" />
                     </Grid.ColumnDefinitions>
 
-                    <StackPanel Grid.Column="0" Margin="0,0,0,0">
+                    <StackPanel Grid.Column="0" Margin="0 0 0 0">
                         <TextBlock
-                            Margin="0,0,0,8"
+                            Margin="0 0 0 8"
                             FontSize="16"
                             FontWeight="SemiBold"
                             Text="{DynamicResource flowlauncher_plugin_program_suffixes_executable_types}" />
                         <CheckBox
                             Name="apprefMS"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[appref-ms]}">
                             appref-ms
                         </CheckBox>
                         <CheckBox
                             Name="exe"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[exe]}">
                             exe
                         </CheckBox>
                         <CheckBox
                             Name="lnk"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[lnk]}">
                             lnk
                         </CheckBox>
                         <CheckBox
                             Name="CustomFiles"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_file_types}"
                             IsChecked="{Binding UseCustomSuffixes}" />
                         <TextBox
                             x:Name="tbSuffixes"
-                            Margin="10,4,0,10"
+                            Margin="10 4 0 10"
                             Style="{StaticResource CustomFileTypeTextBox}" />
                     </StackPanel>
 
                     <Border
                         Grid.Column="1"
-                        Margin="20,0,0,10"
-                        Padding="20,0,0,0"
+                        Margin="20 0 0 10"
+                        Padding="20 0 0 0"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1,0,0,0">
+                        BorderThickness="1 0 0 0">
                         <StackPanel>
                             <TextBlock
-                                Margin="0,0,0,8"
+                                Margin="0 0 0 8"
                                 FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{DynamicResource flowlauncher_plugin_program_suffixes_URL_types}" />
                             <CheckBox
                                 Name="steam"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_steam}"
                                 IsChecked="{Binding ProtocolsStatus[steam]}" />
                             <CheckBox
                                 Name="epic"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_epic}"
                                 IsChecked="{Binding ProtocolsStatus[epic]}" />
                             <CheckBox
                                 Name="http"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_http}"
                                 IsChecked="{Binding ProtocolsStatus[http]}" />
                             <CheckBox
                                 Name="CustomProtocol"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_urls}"
                                 IsChecked="{Binding UseCustomProtocols}" />
                             <TextBox
                                 x:Name="tbProtocols"
-                                Margin="10,4,0,0"
+                                Margin="10 4 0 0"
                                 Style="{StaticResource CustomURLTypeTextBox}" />
                         </StackPanel>
                     </Border>
@@ -237,27 +237,27 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnReset"
                     Height="30"
                     MinWidth="140"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="BtnReset_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_reset}" />
                 <Button
                     x:Name="btnCancel"
                     Height="30"
                     MinWidth="140"
-                    Margin="5,0,5,0"
+                    Margin="5 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
 
                 <Button
                     Height="30"
                     MinWidth="140"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     HorizontalAlignment="Right"
                     Click="BtnAdd_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_update}"