diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 6ba41e410..177c00fa2 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -1,3 +1,5 @@
+# This file should contain names of products, companies, or individuals that aren't in a standard dictionary (e.g., GitHub, Keptn, VSCode).
+
 crowdin
 DWM
 workflows
@@ -34,7 +36,6 @@ mscorlib
 pythonw
 dotnet
 winget
-jjw24
 wolframalpha
 gmail
 duckduckgo
@@ -49,7 +50,6 @@ srchadmin
 EWX
 dlgtext
 CMD
-appref-ms
 appref
 TSource
 runas
@@ -57,7 +57,6 @@ dpi
 popup
 ptr
 pluginindicator
-TobiasSekan
 img
 resx
 bak
@@ -68,9 +67,6 @@ dlg
 ddd
 dddd
 clearlogfolder
-ACCENT_ENABLE_TRANSPARENTGRADIENT
-ACCENT_ENABLE_BLURBEHIND
-WCA_ACCENT_POLICY
 HGlobal
 dopusrt
 firefox
@@ -91,22 +87,15 @@ keyevent
 KListener
 requery
 vkcode
-čeština
 Polski
 Srpski
-Português
-Português (Brasil)
 Italiano
-Slovenský
 quicklook
-Tiếng Việt
 Droplex
 Preinstalled
 errormetadatafile
 noresult
 pluginsmanager
 alreadyexists
-JsonRPC
-JsonRPCV2
 Softpedia
 img
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
index f29f57ad5..5ef8859fc 100644
--- a/.github/actions/spelling/patterns.txt
+++ b/.github/actions/spelling/patterns.txt
@@ -1,4 +1,6 @@
 # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+# This file should contain strings that contain a mix of letters and numbers, or specific symbols
+
 
 # Questionably acceptable forms of `in to`
 # Personally, I prefer `log into`, but people object
@@ -121,3 +123,13 @@
 
 # version suffix <word>v#
 (?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+
+\bjjw24\b
+\bappref-ms\b
+\bTobiasSekan\b
+\bJsonRPC\b
+\bJsonRPCV2\b
+\bTiếng Việt\b
+\bPortuguês (Brasil)\b
+\bčeština\b
+\bPortuguês\b
diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
index b32b09e8f..24edc5ed8 100644
--- a/Flow.Launcher.Core/Resource/Internationalization.cs
+++ b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -1,16 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
-using System.Globalization;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core.Resource
 {
@@ -29,13 +30,12 @@ namespace Flow.Launcher.Core.Resource
         private readonly Settings _settings;
         private readonly List<string> _languageDirectories = new();
         private readonly List<ResourceDictionary> _oldResources = new();
-        private readonly string SystemLanguageCode;
+        private static string SystemLanguageCode;
 
         public Internationalization(Settings settings)
         {
             _settings = settings;
             AddFlowLauncherLanguageDirectory();
-            SystemLanguageCode = GetSystemLanguageCodeAtStartup();
         }
 
         private void AddFlowLauncherLanguageDirectory()
@@ -44,7 +44,7 @@ namespace Flow.Launcher.Core.Resource
             _languageDirectories.Add(directory);
         }
 
-        private static string GetSystemLanguageCodeAtStartup()
+        public static void InitSystemLanguageCode()
         {
             var availableLanguages = AvailableLanguages.GetAvailableLanguages();
 
@@ -65,11 +65,11 @@ namespace Flow.Launcher.Core.Resource
                     string.Equals(languageCode, threeLetterCode, StringComparison.OrdinalIgnoreCase) ||
                     string.Equals(languageCode, fullName, StringComparison.OrdinalIgnoreCase))
                 {
-                    return languageCode;
+                    SystemLanguageCode = languageCode;
                 }
             }
 
-            return DefaultLanguageCode;
+            SystemLanguageCode = DefaultLanguageCode;
         }
 
         private void AddPluginLanguageDirectories()
@@ -173,15 +173,33 @@ namespace Flow.Launcher.Core.Resource
                 LoadLanguage(language);
             }
 
-            // Culture of main thread
-            // Use CreateSpecificCulture to preserve possible user-override settings in Windows, if Flow's language culture is the same as Windows's
-            CultureInfo.CurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
-            CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
+            // Change culture info
+            ChangeCultureInfo(language.LanguageCode);
 
             // Raise event for plugins after culture is set
             await Task.Run(UpdatePluginMetadataTranslations);
         }
 
+        public static void ChangeCultureInfo(string languageCode)
+        {
+            // Culture of main thread
+            // Use CreateSpecificCulture to preserve possible user-override settings in Windows, if Flow's language culture is the same as Windows's
+            CultureInfo currentCulture;
+            try
+            {
+                currentCulture = CultureInfo.CreateSpecificCulture(languageCode);
+            }
+            catch (CultureNotFoundException)
+            {
+                currentCulture = CultureInfo.CreateSpecificCulture(SystemLanguageCode);
+            }
+            CultureInfo.CurrentCulture = currentCulture;
+            CultureInfo.CurrentUICulture = currentCulture;
+            var thread = Thread.CurrentThread;
+            thread.CurrentCulture = currentCulture;
+            thread.CurrentUICulture = currentCulture;
+        }
+
         public bool PromptShouldUsePinyin(string languageCodeToSet)
         {
             var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index ae3c4a396..3ec765fa4 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -25,7 +25,13 @@ namespace Flow.Launcher.Infrastructure.UserSettings
 
         public void Initialize()
         {
+            // Initialize dependency injection instances after Ioc.Default is created
             _stringMatcher = Ioc.Default.GetRequiredService<StringMatcher>();
+
+            // Initialize application resources after application is created
+            var settingWindowFont = new FontFamily(SettingWindowFont);
+            Application.Current.Resources["SettingWindowFont"] = settingWindowFont;
+            Application.Current.Resources["ContentControlThemeFontFamily"] = settingWindowFont;
         }
 
         public void Save()
@@ -119,8 +125,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                 {
                     _settingWindowFont = value;
                     OnPropertyChanged();
-                    Application.Current.Resources["SettingWindowFont"] = new FontFamily(value);
-                    Application.Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(value);
+                    if (Application.Current != null)
+                    {
+                        Application.Current.Resources["SettingWindowFont"] = new FontFamily(value);
+                        Application.Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(value);
+                    }
                 }
             }
         }
@@ -411,7 +420,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
 
-        private bool _showAtTopmost = true;
+        private bool _showAtTopmost = false;
         public bool ShowAtTopmost
         {
             get => _showAtTopmost;
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 4a26cec95..4a49e9589 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>4.5.0</Version>
-    <PackageVersion>4.5.0</PackageVersion>
-    <AssemblyVersion>4.5.0</AssemblyVersion>
-    <FileVersion>4.5.0</FileVersion>
+    <Version>4.6.0</Version>
+    <PackageVersion>4.6.0</PackageVersion>
+    <AssemblyVersion>4.6.0</AssemblyVersion>
+    <FileVersion>4.6.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 76c7a4911..f47ee5e11 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -336,13 +336,28 @@ namespace Flow.Launcher.Plugin
         public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null);
 
         /// <summary>
-        /// Opens the URL with the given Uri object. 
+        /// Opens the URL using the browser with the given Uri object, even if the URL is a local file.
+        /// The browser and mode used is based on what's configured in Flow's default browser settings.
+        /// </summary>
+        public void OpenWebUrl(Uri url, bool? inPrivate = null);
+
+        /// <summary>
+        /// Opens the URL using the browser with the given string, even if the URL is a local file.
+        /// The browser and mode used is based on what's configured in Flow's default browser settings.
+        /// Non-C# plugins should use this method.
+        /// </summary>
+        public void OpenWebUrl(string url, bool? inPrivate = null);
+
+        /// <summary>
+        /// Opens the URL with the given Uri object in browser if scheme is Http or Https.
+        /// If the URL is a local file, it will instead be opened with the default application for that file type.
         /// The browser and mode used is based on what's configured in Flow's default browser settings.
         /// </summary>
         public void OpenUrl(Uri url, bool? inPrivate = null);
 
         /// <summary>
-        /// Opens the URL with the given string. 
+        /// Opens the URL with the given string in browser if scheme is Http or Https.
+        /// If the URL is a local file, it will instead be opened with the default application for that file type.
         /// The browser and mode used is based on what's configured in Flow's default browser settings.
         /// Non-C# plugins should use this method.
         /// </summary>
diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 887b13126..5af76f37f 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -14,102 +14,102 @@
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
+
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Grid>
-            <StackPanel Grid.Row="0">
-                <StackPanel>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Button
-                            Grid.Column="4"
-                            Click="BtnCancel_OnClick"
-                            Style="{StaticResource TitleBarCloseButtonStyle}">
-                            <Path
-                                Width="46"
-                                Height="32"
-                                Data="M 18,11 27,20 M 18,20 27,11"
-                                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                                StrokeThickness="1">
-                                <Path.Style>
-                                    <Style TargetType="Path">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-                                                <Setter Property="Opacity" Value="0.5" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Path.Style>
-                            </Path>
-                        </Button>
-                    </Grid>
-                </StackPanel>
-                <StackPanel Margin="26 12 26 0">
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="0 0 0 0"
-                            FontSize="20"
-                            FontWeight="SemiBold"
-                            Text="{DynamicResource actionKeywordsTitle}"
-                            TextAlignment="Left" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            FontSize="14"
-                            Text="{DynamicResource actionkeyword_tips}"
-                            TextAlignment="Left"
-                            TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
-                    <StackPanel Margin="0 18 0 0" Orientation="Horizontal">
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource currentActionKeywords}" />
-                        <TextBlock
-                            x:Name="tbOldActionKeyword"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            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">
-                        <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource newActionKeyword}" />
-                        <TextBox
-                            x:Name="tbAction"
-                            Width="105"
-                            Margin="10 10 15 10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center" />
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-        <Border
+        <Button
+            Grid.Row="0"
+            Grid.Column="1"
+            HorizontalAlignment="Right"
+            Click="BtnCancel_OnClick"
+            Style="{StaticResource TitleBarCloseButtonStyle}">
+            <Path
+                Width="46"
+                Height="32"
+                Data="M 18,11 27,20 M 18,20 27,11"
+                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                StrokeThickness="1">
+                <Path.Style>
+                    <Style TargetType="Path">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                <Setter Property="Opacity" Value="0.5" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Path.Style>
+            </Path>
+        </Button>
+
+        <TextBlock
             Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="26 12 26 12"
+            FontSize="20"
+            FontWeight="SemiBold"
+            Text="{DynamicResource actionKeywordsTitle}"
+            TextAlignment="Left" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="26 0 26 10"
+            FontSize="14"
+            Text="{DynamicResource actionkeyword_tips}"
+            TextAlignment="Left"
+            TextWrapping="WrapWithOverflow" />
+
+        <TextBlock
+            Grid.Row="3"
+            Grid.Column="0"
+            Margin="26 0 10 0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource currentActionKeywords}" />
+        <TextBox
+            x:Name="tbOldActionKeyword"
+            Grid.Row="3"
+            Grid.Column="1"
+            Margin="10 10 26 6"
+            VerticalAlignment="Center"
+            FontSize="14"
+            FontWeight="SemiBold"
+            Foreground="{DynamicResource Color05B}"
+            IsReadOnly="True"
+            Text="List of old keyword(s)" />
+
+        <TextBlock
+            Grid.Row="4"
+            Grid.Column="0"
+            Margin="26 6 10 12"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource newActionKeyword}" />
+        <TextBox
+            x:Name="tbAction"
+            Grid.Row="4"
+            Grid.Column="1"
+            Margin="10 6 26 10"
+            VerticalAlignment="Center" />
+
+        <Border
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="0 10 0 0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
             BorderThickness="0 1 0 0">
@@ -117,15 +117,15 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="30"
-                    Margin="10 0 5 0"
+                    Height="38"
+                    Margin="10 0 10 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
-                    Height="30"
-                    Margin="5 0 10 0"
+                    Height="38"
+                    Margin="10 0 10 0"
                     Click="btnDone_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
index 9420b4c38..8e05686c9 100644
--- a/Flow.Launcher/ActionKeywords.xaml.cs
+++ b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -20,7 +20,9 @@ namespace Flow.Launcher
 
         private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
         {
-            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords.ToArray());
+            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords);
+            tbAction.Text = tbOldActionKeyword.Text;
+            tbAction.SelectAll();
             tbAction.Focus();
         }
 
@@ -33,38 +35,39 @@ namespace Flow.Launcher
         {
             var oldActionKeywords = _plugin.Metadata.ActionKeywords;
 
-            var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator).ToList();
-            newActionKeywords.RemoveAll(string.IsNullOrEmpty);
-            newActionKeywords = newActionKeywords.Distinct().ToList();
+            var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator)
+                                                 .Where(s => !string.IsNullOrEmpty(s))
+                                                 .Distinct()
+                                                 .ToList();
 
             newActionKeywords = newActionKeywords.Count > 0 ? newActionKeywords : new() { Query.GlobalPluginWildcardSign };
 
             var addedActionKeywords = newActionKeywords.Except(oldActionKeywords).ToList();
             var removedActionKeywords = oldActionKeywords.Except(newActionKeywords).ToList();
-            if (!addedActionKeywords.Any(App.API.ActionKeywordAssigned))
+
+            if (addedActionKeywords.Any(App.API.ActionKeywordAssigned))
             {
-                if (oldActionKeywords.Count != newActionKeywords.Count)
-                {
-                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
-                    return;
-                }
+                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
+                return;
+            }
 
-                var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
-                var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
+            if (oldActionKeywords.Count != newActionKeywords.Count)
+            {
+                ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
+                return;
+            }
 
-                if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
-                {
-                    // User just changes the sequence of action keywords
-                    App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
-                }
-                else
-                {
-                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
-                }
+            var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
+            var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
+
+            if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
+            {
+                // User just changes the sequence of action keywords
+                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
             }
             else
             {
-                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
+                ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
             }
         }
 
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 59e8cac20..5df1f88ae 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -41,9 +41,9 @@ namespace Flow.Launcher
         private static readonly string ClassName = nameof(App);
 
         private static bool _disposed;
+        private static Settings _settings;
         private static MainWindow _mainWindow;
         private readonly MainViewModel _mainVM;
-        private readonly Settings _settings;
 
         // To prevent two disposals running at the same time.
         private static readonly object _disposingLock = new();
@@ -55,18 +55,7 @@ namespace Flow.Launcher
         public App()
         {
             // Initialize settings
-            try
-            {
-                var storage = new FlowLauncherJsonStorage<Settings>();
-                _settings = storage.Load();
-                _settings.SetStorage(storage);
-                _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
-            }
-            catch (Exception e)
-            {
-                ShowErrorMsgBoxAndFailFast("Cannot load setting storage, please check local data directory", e);
-                return;
-            }
+            _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
 
             // Configure the dependency injection container
             try
@@ -123,16 +112,6 @@ namespace Flow.Launcher
                 ShowErrorMsgBoxAndFailFast("Cannot initialize api and settings, please open new issue in Flow.Launcher", e);
                 return;
             }
-
-            // Local function
-            static void ShowErrorMsgBoxAndFailFast(string message, Exception e)
-            {
-                // Firstly show users the message
-                MessageBox.Show(e.ToString(), message, MessageBoxButton.OK, MessageBoxImage.Error);
-
-                // Flow cannot construct its App instance, so ensure Flow crashes w/ the exception info.
-                Environment.FailFast(message, e);
-            }
         }
 
         #endregion
@@ -142,6 +121,29 @@ namespace Flow.Launcher
         [STAThread]
         public static void Main()
         {
+            // Initialize settings so that we can get language code
+            try
+            {
+                var storage = new FlowLauncherJsonStorage<Settings>();
+                _settings = storage.Load();
+                _settings.SetStorage(storage);
+            }
+            catch (Exception e)
+            {
+                ShowErrorMsgBoxAndFailFast("Cannot load setting storage, please check local data directory", e);
+                return;
+            }
+
+            // Initialize system language before changing culture info
+            Internationalization.InitSystemLanguageCode();
+
+            // Change culture info before application creation to localize WinForm windows
+            if (_settings.Language != Constant.SystemLanguageCode)
+            {
+                Internationalization.ChangeCultureInfo(_settings.Language);
+            }
+
+            // Start the application as a single instance
             if (SingleInstance<App>.InitializeAsFirstInstance())
             {
                 using var application = new App();
@@ -152,6 +154,19 @@ namespace Flow.Launcher
 
         #endregion
 
+        #region Fail Fast
+
+        private static void ShowErrorMsgBoxAndFailFast(string message, Exception e)
+        {
+            // Firstly show users the message
+            MessageBox.Show(e.ToString(), message, MessageBoxButton.OK, MessageBoxImage.Error);
+
+            // Flow cannot construct its App instance, so ensure Flow crashes w/ the exception info.
+            Environment.FailFast(message, e);
+        }
+
+        #endregion
+
         #region App Events
 
 #pragma warning disable VSTHRD100 // Avoid async void methods
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index d8623753f..5185354e7 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -118,24 +118,26 @@
                             FontSize="14"
                             Text="{DynamicResource customShortcutExpansion}" />
 
-                        <DockPanel
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            LastChildFill="True">
-                            <Button
-                                x:Name="btnTestShortcut"
-                                Margin="0 0 10 0"
-                                Padding="10 5 10 5"
-                                Click="BtnTestShortcut_OnClick"
-                                Content="{DynamicResource preview}"
-                                DockPanel.Dock="Right" />
+                        <Grid Grid.Row="1" Grid.Column="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <TextBox
                                 x:Name="tbExpand"
+                                Grid.Column="0"
                                 Margin="10 0 10 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding Value}" />
-                        </DockPanel>
+                            <Button
+                                x:Name="btnTestShortcut"
+                                Grid.Column="1"
+                                Margin="0 0 10 0"
+                                Padding="10 5 10 5"
+                                Click="BtnTestShortcut_OnClick"
+                                Content="{DynamicResource preview}" />
+                        </Grid>
                     </Grid>
                 </StackPanel>
             </StackPanel>
diff --git a/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs b/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs
index 9d2046972..b05409de2 100644
--- a/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs
+++ b/Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs
@@ -1,11 +1,23 @@
-using Microsoft.Win32;
+using System;
+using Microsoft.Win32;
 
 namespace Flow.Launcher.Helper;
+
 internal static class WindowsMediaPlayerHelper
 {
+    private static readonly string ClassName = nameof(WindowsMediaPlayerHelper);
+
     internal static bool IsWindowsMediaPlayerInstalled()
     {
-        using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MediaPlayer");
-        return key?.GetValue("Installation Directory") != null;
+        try
+        {
+            using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MediaPlayer");
+            return key?.GetValue("Installation Directory") != null;
+        }
+        catch (Exception e)
+        {
+            App.API.LogException(ClassName, "Failed to check if Windows Media Player is installed", e);
+            return false;
+        }
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index f7f8dfd42..bd4cbd282 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -131,8 +131,8 @@
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
-    <system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
-    <system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
+    <system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
+    <system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index e527ab57b..f4d7ad8eb 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -137,12 +137,11 @@ namespace Flow.Launcher
                 welcomeWindow.Show();
             }
 
-            if (_settings.ReleaseNotesVersion != Constant.Version)
+            if (Constant.Version != "1.0.0" && _settings.ReleaseNotesVersion != Constant.Version) // Skip release notes notification for developer builds (version 1.0.0)
             {
                 // Update release notes version
                 _settings.ReleaseNotesVersion = Constant.Version;
-
-                // Display message box with button
+                // Show release note popup with button
                 App.API.ShowMsgWithButton(
                     string.Format(App.API.GetTranslation("appUpdateTitle"), Constant.Version),
                     App.API.GetTranslation("appUpdateButtonContent"),
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index c125ea00f..6e82032ff 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -400,10 +400,9 @@ namespace Flow.Launcher
             }
         }
 
-
-        private void OpenUri(Uri uri, bool? inPrivate = null)
+        private void OpenUri(Uri uri, bool? inPrivate = null, bool forceBrowser = false)
         {
-            if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+            if (forceBrowser || uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
             {
                 var browserInfo = _settings.CustomBrowser;
 
@@ -444,6 +443,16 @@ namespace Flow.Launcher
             }
         }
 
+        public void OpenWebUrl(string url, bool? inPrivate = null)
+        {
+            OpenUri(new Uri(url), inPrivate, true);
+        }
+
+        public void OpenWebUrl(Uri url, bool? inPrivate = null)
+        {
+            OpenUri(url, inPrivate, true);
+        }
+
         public void OpenUrl(string url, bool? inPrivate = null)
         {
             OpenUri(new Uri(url), inPrivate);
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 79465cd71..b62a35495 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -170,7 +170,8 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         "dddd dd', 'MMMM",
         "dd', 'MMMM",
         "dd.MM.yy",
-        "dd.MM.yyyy"
+        "dd.MM.yyyy",
+        "dd MMMM yyyy"
     };
 
     public string TimeFormat
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index e8ae0dc3c..7f8555d65 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -70,6 +70,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
+
             <cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideNotifyIcon}"
@@ -77,10 +78,11 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
+
             <cc:Card
                 Title="{DynamicResource showAtTopmost}"
                 Margin="0 14 0 0"
-                Icon="&#xE923;"
+                Icon="&#xf5ed;"
                 Sub="{DynamicResource showAtTopmostToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.ShowAtTopmost}"
@@ -88,7 +90,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 14 0 0">
+            <cc:CardGroup Margin="0 4 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index 49ae26564..3fb0fa46f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -95,6 +95,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
   </ItemGroup>
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 3182adfed..1ee6b5c45 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -1,12 +1,13 @@
 using System.Windows;
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
-using System.ComponentModel;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;
 
-public partial class SettingsControl : INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class SettingsControl
 {
     public Settings Settings { get; }
     public CustomBrowser SelectedCustomBrowser { get; set; }
@@ -53,12 +54,10 @@ public partial class SettingsControl : INotifyPropertyChanged
         set
         {
             Settings.OpenInNewBrowserWindow = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow)));
+            OnPropertyChanged();
         }
     }
 
-    public event PropertyChangedEventHandler PropertyChanged;
-
     private void NewCustomBrowser(object sender, RoutedEventArgs e)
     {
         var newBrowser = new CustomBrowser();
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 7d0a553a4..2e0f6a67d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -98,8 +98,11 @@
     <system:String x:Key="plugin_explorer_deletefilefolder">Delete</system:String>
     <system:String x:Key="plugin_explorer_deletefile_subtitle">Permanently delete current file</system:String>
     <system:String x:Key="plugin_explorer_deletefolder_subtitle">Permanently delete current folder</system:String>
-    <system:String x:Key="plugin_explorer_path">Path:</system:String>
-    <system:String x:Key="plugin_explorer_name">Name:</system:String>
+    <system:String x:Key="plugin_explorer_name">Name</system:String>
+    <system:String x:Key="plugin_explorer_type">Type</system:String>
+    <system:String x:Key="plugin_explorer_path">Path</system:String>
+    <system:String x:Key="plugin_explorer_file">File</system:String>
+    <system:String x:Key="plugin_explorer_folder">Folder</system:String>
     <system:String x:Key="plugin_explorer_deletefilefolder_subtitle">Delete the selected</system:String>
     <system:String x:Key="plugin_explorer_runasdifferentuser">Run as different user</system:String>
     <system:String x:Key="plugin_explorer_runasdifferentuser_subtitle">Run the selected using a different user account</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index a16d0c5f3..e87d2df97 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -101,6 +101,10 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 AutoCompleteText = GetAutoCompleteText(title, query, path, ResultType.Folder),
                 TitleHighlightData = Context.API.FuzzySearch(query.Search, title).MatchData,
                 CopyText = path,
+                Preview = new Result.PreviewInfo
+                {
+                    FilePath = path,
+                },
                 PreviewPanel = new Lazy<UserControl>(() => new PreviewPanel(Settings, path, ResultType.Folder)),
                 Action = c =>
                 {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
index 745032d2c..2c4c4e54f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
@@ -1,16 +1,11 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
+#nullable enable
 
-#nullable enable
-
-namespace Flow.Launcher.Plugin.Explorer.Views
+namespace Flow.Launcher.Plugin.Explorer.ViewModels
 {
-    public class ActionKeywordModel : INotifyPropertyChanged
+    public partial class ActionKeywordModel : BaseModel
     {
         private static Settings _settings = null!;
 
-        public event PropertyChangedEventHandler? PropertyChanged;
-
         public static void Init(Settings settings)
         {
             _settings = settings;
@@ -28,13 +23,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         internal Settings.ActionKeyword KeywordProperty { get; }
 
-        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
         private string? keyword;
-
         public string Keyword
         {
             get => keyword ??= _settings.GetActionKeyword(KeywordProperty);
@@ -45,8 +34,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
                 OnPropertyChanged();
             }
         }
-        private bool? enabled;
 
+        private bool? enabled;
         public bool Enabled
         {
             get => enabled ??= _settings.GetActionKeywordEnabled(KeywordProperty);
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 10ce28fe4..829a2feed 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -1,16 +1,13 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Plugin.Explorer.ViewModels;
 
 namespace Flow.Launcher.Plugin.Explorer.Views
 {
-    /// <summary>
-    /// Interaction logic for ActionKeywordSetting.xaml
-    /// </summary>
-    public partial class ActionKeywordSetting : INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class ActionKeywordSetting
     {
         private ActionKeywordModel CurrentActionKeyword { get; }
 
@@ -21,14 +18,14 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             {
                 // Set Enable to be true if user change ActionKeyword
                 KeywordEnabled = true;
-                _ = SetField(ref actionKeyword, value);
+                _ = SetProperty(ref actionKeyword, value);
             }
         }
 
         public bool KeywordEnabled
         {
             get => _keywordEnabled;
-            set => SetField(ref _keywordEnabled, value);
+            set => _ = SetProperty(ref _keywordEnabled, value);
         }
 
         private string actionKeyword;
@@ -116,20 +113,5 @@ namespace Flow.Launcher.Plugin.Explorer.Views
                 e.CancelCommand();
             }
         }
-        
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        
-        private bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, value))
-                return false;
-            field = value;
-            OnPropertyChanged(propertyName);
-            return true;
-        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 8f4b4d862..59373b4de 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -8,7 +8,6 @@
     xmlns:qa="clr-namespace:Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
-    xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
     d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -18,7 +17,7 @@
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
-        <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
+        <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type viewModels:ActionKeywordModel}">
             <Grid>
                 <TextBlock
                     Margin="0 5 0 0"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
index 5714b0d0f..6e3cf8466 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -11,12 +10,14 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Flow.Launcher.Plugin.Explorer.Search;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
 
 #nullable enable
 
-public partial class PreviewPanel : UserControl, INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class PreviewPanel : UserControl
 {
     private static readonly string ClassName = nameof(PreviewPanel);
 
@@ -327,11 +328,4 @@ public partial class PreviewPanel : UserControl, INotifyPropertyChanged
         return yearsDiff == 1 ? Main.Context.API.GetTranslation("OneYearAgo") :
             string.Format(Main.Context.API.GetTranslation("YearsAgo"), yearsDiff);
     }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
index e9ba53618..e977a72c2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
@@ -1,22 +1,23 @@
-<Window x:Class="Flow.Launcher.Plugin.Explorer.Views.QuickAccessLinkSettings"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        Title="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
-        Width="Auto"
-        Height="255"
-        Background="{DynamicResource PopuBGColor}"
-        DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Foreground="{DynamicResource PopupTextColor}"
-        ResizeMode="NoResize"
-        SizeToContent="Width"
-        WindowStartupLocation="CenterScreen"
-        mc:Ignorable="d">
-        <WindowChrome.WindowChrome>
-            <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
-        </WindowChrome.WindowChrome>
+<Window
+    x:Class="Flow.Launcher.Plugin.Explorer.Views.QuickAccessLinkSettings"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
+    Width="Auto"
+    Height="300"
+    Background="{DynamicResource PopuBGColor}"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Width"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -58,55 +59,91 @@
             <StackPanel Margin="26 0 26 0">
                 <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
                         TextAlignment="Left" />
                 </StackPanel>
-                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" MinWidth="100" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <!--  Name  -->
                     <TextBlock
-                        MinWidth="150"
-                        Margin="0 10 15 10"
-                        HorizontalAlignment="Left"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="14"
                         Text="{DynamicResource plugin_explorer_name}" />
                     <TextBox
-                        Margin="10 0 0 0"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="10 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
-                        Width="250"
                         Text="{Binding SelectedName, Mode=TwoWay}" />
-                </StackPanel>
-                
-                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
+
+                    <!--  Type  -->
                     <TextBlock
-                        MinWidth="150"
-                        Margin="0 10 15 10"
-                        HorizontalAlignment="Left"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource plugin_explorer_type}" />
+                    <StackPanel
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Orientation="Horizontal">
+                        <RadioButton
+                            Margin="10 10 0 0"
+                            Content="{DynamicResource plugin_explorer_file}"
+                            GroupName="PathType"
+                            IsChecked="{Binding IsFileSelected}" />
+                        <RadioButton
+                            Margin="10 10 0 0"
+                            Content="{DynamicResource plugin_explorer_folder}"
+                            GroupName="PathType"
+                            IsChecked="{Binding IsFolderSelected}" />
+                    </StackPanel>
+                    <!--  Path  -->
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="14"
                         Text="{DynamicResource plugin_explorer_path}" />
-
-
                     <TextBox
-                        Margin="10 0 0 0"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="250"
+                        Margin="10 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
-                        Width="250"
-                        Text="{Binding SelectedPath, Mode=TwoWay}"
-                        IsReadOnly="True" />
+                        IsReadOnly="True"
+                        Text="{Binding SelectedPath, Mode=TwoWay}" />
                     <Button
-                        Width="80"
+                        Grid.Row="2"
+                        Grid.Column="2"
                         Height="Auto"
-                        Margin="10 0 0 0"
+                        MinWidth="80"
+                        Margin="10 10 0 0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Content="{DynamicResource select}"
-                        Click="SelectPath_OnClick" />
-                </StackPanel>
-
+                        Click="SelectPath_OnClick"
+                        Content="{DynamicResource select}" />
+                </Grid>
             </StackPanel>
         </StackPanel>
         <Border
@@ -118,15 +155,15 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="30"
-                    Margin="0 0 5 0"
+                    Height="34"
+                    Margin="0 0 5 1"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="DownButton"
                     Width="145"
-                    Height="30"
-                    Margin="5 0 0 0"
+                    Height="34"
+                    Margin="5 0 0 1"
                     Click="OnDoneButtonClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
@@ -134,4 +171,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 36a00e9e5..eb66e1efc 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -2,15 +2,17 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Forms;
 using Flow.Launcher.Plugin.Explorer.Helper;
+using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
 
-public partial class QuickAccessLinkSettings : INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class QuickAccessLinkSettings
 {
     private string _selectedPath;
     public string SelectedPath
@@ -25,6 +27,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
                 if (string.IsNullOrEmpty(_selectedName))
                 {
                     SelectedName = _selectedPath.GetPathName();
+                    _accessLinkType = GetResultType(_selectedPath);
                 }
             }
         }
@@ -47,11 +50,16 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         }
     }
 
+    public bool IsFileSelected { get; set; }
+    public bool IsFolderSelected { get; set; } = true; // Default to Folder
+
     private bool IsEdit { get; }
     private AccessLink SelectedAccessLink { get; }
-    
+
     public ObservableCollection<AccessLink> QuickAccessLinks { get; }
-    
+
+    private ResultType _accessLinkType = ResultType.Folder; // Default to Folder
+
     public QuickAccessLinkSettings(ObservableCollection<AccessLink> quickAccessLinks)
     {
         IsEdit = false;
@@ -64,6 +72,9 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         IsEdit = true;
         _selectedName = selectedAccessLink.Name;
         _selectedPath = selectedAccessLink.Path;
+        _accessLinkType = GetResultType(_selectedPath); // Initialize link type
+        IsFileSelected = selectedAccessLink.Type == ResultType.File; // Initialize default selection
+        IsFolderSelected = !IsFileSelected;
         SelectedAccessLink = selectedAccessLink;
         QuickAccessLinks = quickAccessLinks;
         InitializeComponent();
@@ -96,30 +107,42 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         }
 
         // If editing, update the existing link
-        if (IsEdit) 
+        if (IsEdit)
         {
-            if (SelectedAccessLink == null) return;
-
-            var index = QuickAccessLinks.IndexOf(SelectedAccessLink);
-            if (index >= 0)
+            if (SelectedAccessLink != null)
             {
-                var updatedLink = new AccessLink
+                var index = QuickAccessLinks.IndexOf(SelectedAccessLink);
+                if (index >= 0)
                 {
-                    Name = SelectedName,
-                    Type = SelectedAccessLink.Type,
-                    Path = SelectedPath
-                };
-                QuickAccessLinks[index] = updatedLink;
+                    var updatedLink = new AccessLink
+                    {
+                        Name = SelectedName,
+                        Type = _accessLinkType,
+                        Path = SelectedPath
+                    };
+                    QuickAccessLinks[index] = updatedLink;
+                }
+                DialogResult = true;
+                Close();
+            }
+            // Add a new one if the selected access link is null (should not happen in edit mode, but just in case)
+            else
+            {
+                AddNewAccessLink();
             }
-            DialogResult = true;
-            Close();
         }
         // Otherwise, add a new one
         else
+        {
+            AddNewAccessLink();
+        }
+
+        void AddNewAccessLink()
         {
             var newAccessLink = new AccessLink
             {
                 Name = SelectedName,
+                Type = _accessLinkType,
                 Path = SelectedPath
             };
             QuickAccessLinks.Add(newAccessLink);
@@ -130,18 +153,59 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
 
     private void SelectPath_OnClick(object commandParameter, RoutedEventArgs e)
     {
-        var folderBrowserDialog = new FolderBrowserDialog();
+        // Open file or folder selection dialog based on the selected radio button
+        if (IsFileSelected)
+        {
+            var openFileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                CheckFileExists = true,
+                CheckPathExists = true
+            };
 
-        if (folderBrowserDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
-            return;
+            if (openFileDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK ||
+                string.IsNullOrEmpty(openFileDialog.FileName))
+                return;
 
-        SelectedPath = folderBrowserDialog.SelectedPath;
+            SelectedPath = openFileDialog.FileName;
+        }
+        else // Folder selection
+        {
+            var folderBrowserDialog = new FolderBrowserDialog
+            {
+                ShowNewFolderButton = true
+            };
+
+            if (folderBrowserDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK ||
+                string.IsNullOrEmpty(folderBrowserDialog.SelectedPath))
+                return;
+
+            SelectedPath = folderBrowserDialog.SelectedPath;
+        }
     }
 
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    private static ResultType GetResultType(string path)
     {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        // Check if the path is a file or folder
+        if (System.IO.File.Exists(path))
+        {
+            return ResultType.File;
+        }
+        else if (System.IO.Directory.Exists(path))
+        {
+            if (string.Equals(System.IO.Path.GetPathRoot(path), path, StringComparison.OrdinalIgnoreCase))
+            {
+                return ResultType.Volume;
+            }
+            else
+            {
+                return ResultType.Folder;
+            }
+        }
+        else
+        {
+            // This should not happen, but just in case, we assume it's a folder
+            return ResultType.Folder;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index d0add9f31..a51aadec7 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -194,10 +194,13 @@ namespace Flow.Launcher.Plugin.Shell
             var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             var runAsAdministratorArg = !runAsAdministrator && !_settings.RunAsAdministrator ? "" : "runas";
 
-            ProcessStartInfo info = new()
+            var info = new ProcessStartInfo()
             {
-                Verb = runAsAdministratorArg, WorkingDirectory = workingDirectory,
+                Verb = runAsAdministratorArg,
+                WorkingDirectory = workingDirectory,
             };
+            var notifyStr = Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close");
+            var addedCharacter = _settings.UseWindowsTerminal ? "\\" : "";
             switch (_settings.Shell)
             {
                 case Shell.Cmd:
@@ -211,8 +214,19 @@ namespace Flow.Launcher.Plugin.Shell
                         {
                             info.FileName = "cmd.exe";
                         }
-
-                        info.ArgumentList.Add($"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command} {(_settings.CloseShellAfterPress ? $"&& echo {Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")} && pause > nul /c" : "")}");
+                        if (_settings.LeaveShellOpen)
+                        {
+                            info.ArgumentList.Add("/k");
+                        }
+                        else
+                        {
+                            info.ArgumentList.Add("/c");
+                        }
+                        info.ArgumentList.Add(
+                            $"{command}" +
+                            $"{(_settings.CloseShellAfterPress ?
+                                $" && echo {notifyStr} && pause > nul /c" :
+                                "")}");
                         break;
                     }
 
@@ -220,7 +234,6 @@ namespace Flow.Launcher.Plugin.Shell
                     {
                         // Using just a ; doesn't work with wt, as it's used to create a new tab for the terminal window
                         // \\ must be escaped for it to work properly, or breaking it into multiple arguments
-                        var addedCharacter = _settings.UseWindowsTerminal ? "\\" : "";
                         if (_settings.UseWindowsTerminal)
                         {
                             info.FileName = "wt.exe";
@@ -238,7 +251,11 @@ namespace Flow.Launcher.Plugin.Shell
                         else
                         {
                             info.ArgumentList.Add("-Command");
-                            info.ArgumentList.Add($"{command}{addedCharacter}; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" : "")}");
+                            info.ArgumentList.Add(
+                                $"{command}{addedCharacter};" +
+                                $"{(_settings.CloseShellAfterPress ?
+                                    $" Write-Host '{notifyStr}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" :
+                                    "")}");
                         }
                         break;
                     }
@@ -247,7 +264,6 @@ namespace Flow.Launcher.Plugin.Shell
                     {
                         // Using just a ; doesn't work with wt, as it's used to create a new tab for the terminal window
                         // \\ must be escaped for it to work properly, or breaking it into multiple arguments
-                        var addedCharacter = _settings.UseWindowsTerminal ? "\\" : "";
                         if (_settings.UseWindowsTerminal)
                         {
                             info.FileName = "wt.exe";
@@ -262,7 +278,11 @@ namespace Flow.Launcher.Plugin.Shell
                             info.ArgumentList.Add("-NoExit");
                         }
                         info.ArgumentList.Add("-Command");
-                        info.ArgumentList.Add($"{command}{addedCharacter}; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" : "")}");
+                        info.ArgumentList.Add(
+                            $"{command}{addedCharacter};" +
+                            $"{(_settings.CloseShellAfterPress ?
+                                $" Write-Host '{notifyStr}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" :
+                                "")}");
                         break;
                     }
 
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
index 76aeb3250..0040cffa7 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
@@ -71,7 +71,7 @@ namespace Flow.Launcher.Plugin.WebSearch
                         Score = score,
                         Action = c =>
                         {
-                            _context.API.OpenUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)));
+                            _context.API.OpenWebUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)));
 
                             return true;
                         },
@@ -135,7 +135,7 @@ namespace Flow.Launcher.Plugin.WebSearch
                 ActionKeywordAssigned = searchSource.ActionKeyword == SearchSourceGlobalPluginWildCardSign ? string.Empty : searchSource.ActionKeyword,
                 Action = c =>
                 {
-                    _context.API.OpenUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)));
+                    _context.API.OpenWebUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)));
 
                     return true;
                 },
diff --git a/appveyor.yml b/appveyor.yml
index 8fba05252..646594f4a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,7 @@
-version: '1.20.0.{build}'
+version: '1.20.1.{build}'
+
+# Do not build on tags because we create a release on merge to master. Otherwise will upload artifacts twice changing the hash, as well as triggering duplicate GitHub release action & NuGet deployments.
+skip_tags: true
 
 init:
 - ps: |
@@ -14,7 +17,6 @@ init:
 cache:
   - '%USERPROFILE%\.nuget\packages -> **.sln, **.csproj'  # preserve nuget folder (packages) unless the solution or projects change
 
-
 assembly_info:
   patch: true
   file: SolutionAssemblyInfo.cs
@@ -60,14 +62,24 @@ deploy:
   - provider: NuGet
     artifact: Plugin nupkg
     api_key:
-      secure: sCSd5JWgdzJWDa9kpqECut5ACPKZqcoxKU8ERKC00k7VIjig3/+nFV5zzTcGb0w3
+      secure: en+/GPSgfUVARoX0+lOeAAlbzvcCZAyBeVQaNq1AeXuRjjHgMwhBnt0PHVJXOepS
     on:
       branch: master
 
   - provider: GitHub
     repository: Flow-Launcher/Prereleases
     release: v$(prereleaseTag)
-    description: 'This is the early access build of our upcoming release. All changes contained here are reviewed, tested and stable to use.\n\nSee our [release](https://github.com/Flow-Launcher/Flow.Launcher/pulls?q=is%3Aopen+is%3Apr+label%3Arelease) Pull Request for details.\n\nFor latest production release visit [here](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest)\n\nPlease report any bugs or issues over at the [main repository](https://github.com/Flow-Launcher/Flow.Launcher/issues)'
+    description: |
+      This is the early access build of our upcoming release.
+      All changes contained here are reviewed, tested and stable to use.
+      
+      This build includes new changes from commit:
+      $(APPVEYOR_REPO_COMMIT_MESSAGE)
+      
+      See all changes in this early access by going to the [milstones](https://github.com/Flow-Launcher/Flow.Launcher/milestones?sort=title&direction=asc) section and choosing the upcoming milestone.
+      For latest production release visit [here](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest)
+      
+      Please report any bugs or issues over at the [main repository](https://github.com/Flow-Launcher/Flow.Launcher/issues)'
     auth_token:
       secure: ij4UeXUYQBDJxn2YRAAhUOjklOGVKDB87Hn5J8tKIzj13yatoI7sLM666QDQFEgv
     artifact: Squirrel Installer, Portable Version, Squirrel nupkg, Squirrel RELEASES