Merge branch 'dev' into WindowIllustration

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -29,13 +29,13 @@ namespace Flow.Launcher.Core.ExternalPlugins
                 var request = new HttpRequestMessage(HttpMethod.Get, manifestFileUrl);
                 request.Headers.Add("If-None-Match", latestEtag);
 
-                var response = await Http.SendAsync(request, token).ConfigureAwait(false);
+                using var response = await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false);
 
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     Log.Info($"|PluginsManifest.{nameof(UpdateManifestAsync)}|Fetched plugins from manifest repo");
 
-                    var json = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false);
+                    await using var json = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false);
 
                     UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(json, cancellationToken: token).ConfigureAwait(false);
 
@@ -56,4 +56,4 @@ namespace Flow.Launcher.Core.ExternalPlugins
             }
         }
     }
-}
+}

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -96,9 +96,16 @@ namespace Flow.Launcher.Core.Resource
             {
                 LoadLanguage(language);
             }
-            Settings.Language = language.LanguageCode;
-            CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
+            // Culture of this thread
+            // Use CreateSpecificCulture to preserve possible user-override settings in Windows
+            CultureInfo.CurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
+            // App domain
+            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
+            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.DefaultThreadCurrentCulture;
+
+            // Raise event after culture is set
+            Settings.Language = language.LanguageCode;
             _ = Task.Run(() =>
             {
                 UpdatePluginMetadataTranslations();
@@ -115,7 +122,11 @@ namespace Flow.Launcher.Core.Resource
             if (languageToSet != AvailableLanguages.Chinese && languageToSet != AvailableLanguages.Chinese_TW)
                 return false;
 
-            if (MessageBox.Show("Do you want to turn on search with Pinyin?", string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            // No other languages should show the following text so just make it hard-coded
+            // "Do you want to search with pinyin?"
+            string text = languageToSet == AvailableLanguages.Chinese ? "是否启用拼音搜索？" : "是否啓用拼音搜索？" ;
+
+            if (MessageBox.Show(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
                 return false;
 
             return true;
@@ -182,7 +193,7 @@ namespace Flow.Launcher.Core.Resource
                 {
                     p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
                     p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
-                    pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
+                    pluginI18N.OnCultureInfoChanged(CultureInfo.DefaultThreadCurrentCulture);
                 }
                 catch (Exception e)
                 {
@@ -221,4 +232,4 @@ namespace Flow.Launcher.Core.Resource
             }
         }
     }
-}
+}

Flow.Launcher.Core/Updater.cs

@@ -79,7 +79,7 @@ namespace Flow.Launcher.Core
                     await updateManager.CreateUninstallerRegistryEntry().ConfigureAwait(false);
                 }
 
-                var newVersionTips = NewVersinoTips(newReleaseVersion.ToString());
+                var newVersionTips = NewVersionTips(newReleaseVersion.ToString());
 
                 Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
@@ -137,10 +137,10 @@ namespace Flow.Launcher.Core
             return manager;
         }
 
-        public string NewVersinoTips(string version)
+        public string NewVersionTips(string version)
         {
-            var translater = InternationalizationManager.Instance;
-            var tips = string.Format(translater.GetTranslation("newVersionTips"), version);
+            var translator = InternationalizationManager.Instance;
+            var tips = string.Format(translator.GetTranslation("newVersionTips"), version);
 
             return tips;
         }

Flow.Launcher.Infrastructure/Constant.cs

@@ -45,6 +45,7 @@ namespace Flow.Launcher.Infrastructure
         public const string Logs = "Logs";
 
         public const string Website = "https://flowlauncher.com";
+        public const string SponsorPage = "https://github.com/sponsors/Flow-Launcher";
         public const string GitHub = "https://github.com/Flow-Launcher/Flow.Launcher";
         public const string Docs = "https://flowlauncher.com/docs";
     }

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -64,16 +64,5 @@
     <PackageReference Include="ToolGood.Words.Pinyin" Version="3.0.1.4" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="pinyindb\pinyin_gwoyeu_mapping.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="pinyindb\pinyin_mapping.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="pinyindb\unicode_to_hanyu_pinyin.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   
 </Project>

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -68,7 +68,7 @@ namespace Flow.Launcher.Infrastructure.Http
                             var userName when string.IsNullOrEmpty(userName) =>
                                 (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), null),
                             _ => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"),
-                                    new NetworkCredential(Proxy.UserName, Proxy.Password))
+                                new NetworkCredential(Proxy.UserName, Proxy.Password))
                         },
                         _ => (null, null)
                     },
@@ -79,7 +79,7 @@ namespace Flow.Launcher.Infrastructure.Http
                     _ => throw new ArgumentOutOfRangeException()
                 };
             }
-            catch(UriFormatException e)
+            catch (UriFormatException e)
             {
                 API.ShowMsg("Please try again", "Unable to parse Http Proxy");
                 Log.Exception("Flow.Launcher.Infrastructure.Http", "Unable to parse Uri", e);
@@ -94,7 +94,7 @@ namespace Flow.Launcher.Infrastructure.Http
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     await using var fileStream = new FileStream(filePath, FileMode.CreateNew);
-                    await response.Content.CopyToAsync(fileStream);
+                    await response.Content.CopyToAsync(fileStream, token);
                 }
                 else
                 {
@@ -117,7 +117,7 @@ namespace Flow.Launcher.Infrastructure.Http
         public static Task<string> GetAsync([NotNull] string url, CancellationToken token = default)
         {
             Log.Debug($"|Http.Get|Url <{url}>");
-            return GetAsync(new Uri(url.Replace("#", "%23")), token);
+            return GetAsync(new Uri(url), token);
         }
 
         /// <summary>
@@ -130,36 +130,57 @@ namespace Flow.Launcher.Infrastructure.Http
         {
             Log.Debug($"|Http.Get|Url <{url}>");
             using var response = await client.GetAsync(url, token);
-            var content = await response.Content.ReadAsStringAsync();
-            if (response.StatusCode == HttpStatusCode.OK)
-            {
-                return content;
-            }
-            else
+            var content = await response.Content.ReadAsStringAsync(token);
+            if (response.StatusCode != HttpStatusCode.OK)
             {
                 throw new HttpRequestException(
                     $"Error code <{response.StatusCode}> with content <{content}> returned from <{url}>");
             }
+
+            return content;
         }
 
         /// <summary>
-        /// Asynchrously get the result as stream from url.
+        /// Send a GET request to the specified Uri with an HTTP completion option and a cancellation token as an asynchronous operation.
+        /// </summary>
+        /// <param name="url">The Uri the request is sent to.</param>
+        /// <param name="completionOption">An HTTP completion option value that indicates when the operation should be considered completed.</param>
+        /// <param name="token">A cancellation token that can be used by other objects or threads to receive notice of cancellation</param>
+        /// <returns></returns>
+        public static Task<Stream> GetStreamAsync([NotNull] string url,
+            CancellationToken token = default) => GetStreamAsync(new Uri(url), token);
+
+
+        /// <summary>
+        /// Send a GET request to the specified Uri with an HTTP completion option and a cancellation token as an asynchronous operation.
         /// </summary>
         /// <param name="url"></param>
+        /// <param name="token"></param>
         /// <returns></returns>
-        public static async Task<Stream> GetStreamAsync([NotNull] string url, CancellationToken token = default)
+        public static async Task<Stream> GetStreamAsync([NotNull] Uri url,
+            CancellationToken token = default)
         {
             Log.Debug($"|Http.Get|Url <{url}>");
-            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
-            return await response.Content.ReadAsStreamAsync();
+            return await client.GetStreamAsync(url, token);
+        }
+
+        public static async Task<HttpResponseMessage> GetResponseAsync(string url, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead,
+            CancellationToken token = default)
+            => await GetResponseAsync(new Uri(url), completionOption, token);
+
+        public static async Task<HttpResponseMessage> GetResponseAsync([NotNull] Uri url, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead,
+            CancellationToken token = default)
+        {
+            Log.Debug($"|Http.Get|Url <{url}>");
+            return await client.GetAsync(url, completionOption, token);
         }
 
         /// <summary>
         /// Asynchrously send an HTTP request.
         /// </summary>
-        public static async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token = default)
+        public static async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken token = default)
         {
-            return await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token);
+            return await client.SendAsync(request, completionOption, token);
         }
     }
 }

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -25,11 +25,11 @@ namespace Flow.Launcher.Infrastructure.Image
     public class ImageCache
     {
         private const int MaxCached = 50;
-        public ConcurrentDictionary<string, ImageUsage> Data { get; private set; } = new ConcurrentDictionary<string, ImageUsage>();
+        public ConcurrentDictionary<(string, bool), ImageUsage> Data { get; } = new();
         private const int permissibleFactor = 2;
         private SemaphoreSlim semaphore = new(1, 1);
 
-        public void Initialization(Dictionary<string, int> usage)
+        public void Initialization(Dictionary<(string, bool), int> usage)
         {
             foreach (var key in usage.Keys)
             {
@@ -37,29 +37,29 @@ namespace Flow.Launcher.Infrastructure.Image
             }
         }
 
-        public ImageSource this[string path]
+        public ImageSource this[string path, bool isFullImage = false]
         {
             get
             {
-                if (Data.TryGetValue(path, out var value))
+                if (!Data.TryGetValue((path, isFullImage), out var value))
                 {
-                    value.usage++;
-                    return value.imageSource;
+                    return null;
                 }
+                value.usage++;
+                return value.imageSource;
 
-                return null;
             }
             set
             {
                 Data.AddOrUpdate(
-                        path,
-                        new ImageUsage(0, value),
-                        (k, v) =>
-                            {
-                                v.imageSource = value;
-                                v.usage++;
-                                return v;
-                            }
+                    (path, isFullImage),
+                    new ImageUsage(0, value),
+                    (k, v) =>
+                    {
+                        v.imageSource = value;
+                        v.usage++;
+                        return v;
+                    }
                 );
 
                 SliceExtra();
@@ -82,9 +82,9 @@ namespace Flow.Launcher.Infrastructure.Image
             }
         }
 
-        public bool ContainsKey(string key)
+        public bool ContainsKey(string key, bool isFullImage)
         {
-            return key is not null && Data.ContainsKey(key) && Data[key].imageSource != null;
+            return key is not null && Data.ContainsKey((key, isFullImage)) && Data[(key, isFullImage)].imageSource != null;
         }
 
         public int CacheSize()
@@ -100,4 +100,4 @@ namespace Flow.Launcher.Infrastructure.Image
             return Data.Values.Select(x => x.imageSource).Distinct().Count();
         }
     }
-}
+}

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -3,57 +3,58 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
+using static Flow.Launcher.Infrastructure.Http.Http;
 
 namespace Flow.Launcher.Infrastructure.Image
 {
     public static class ImageLoader
     {
         private static readonly ImageCache ImageCache = new();
-        private static BinaryStorage<Dictionary<string, int>> _storage;
+        private static BinaryStorage<Dictionary<(string, bool), int>> _storage;
         private static readonly ConcurrentDictionary<string, string> GuidToKey = new();
         private static IImageHashGenerator _hashGenerator;
         private static readonly bool EnableImageHash = true;
         public static ImageSource DefaultImage { get; } = new BitmapImage(new Uri(Constant.MissingImgIcon));
+        public const int SmallIconSize = 32;
 
 
         private static readonly string[] ImageExtensions =
         {
-            ".png",
-            ".jpg",
-            ".jpeg",
-            ".gif",
-            ".bmp",
-            ".tiff",
-            ".ico"
+            ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico"
         };
 
         public static void Initialize()
         {
-            _storage = new BinaryStorage<Dictionary<string, int>>("Image");
+            _storage = new BinaryStorage<Dictionary<(string, bool), int>>("Image");
             _hashGenerator = new ImageHashGenerator();
 
             var usage = LoadStorageToConcurrentDictionary();
 
-            foreach (var icon in new[] { Constant.DefaultIcon, Constant.MissingImgIcon })
+            foreach (var icon in new[]
+                     {
+                         Constant.DefaultIcon, Constant.MissingImgIcon
+                     })
             {
                 ImageSource img = new BitmapImage(new Uri(icon));
                 img.Freeze();
-                ImageCache[icon] = img;
+                ImageCache[icon, false] = img;
             }
 
-            _ = Task.Run(() =>
+            _ = Task.Run(async () =>
             {
-                Stopwatch.Normal("|ImageLoader.Initialize|Preload images cost", () =>
+                await Stopwatch.NormalAsync("|ImageLoader.Initialize|Preload images cost", async () =>
                 {
-                    ImageCache.Data.AsParallel().ForAll(x =>
+                    foreach (var ((path, isFullImage), _) in ImageCache.Data)
                     {
-                        Load(x.Key);
-                    });
+                        await LoadAsync(path, isFullImage);
+                    }
                 });
                 Log.Info($"|ImageLoader.Initialize|Number of preload images is <{ImageCache.CacheSize()}>, Images Number: {ImageCache.CacheSize()}, Unique Items {ImageCache.UniqueImagesInCache()}");
             });
@@ -63,17 +64,20 @@ namespace Flow.Launcher.Infrastructure.Image
         {
             lock (_storage)
             {
-                _storage.Save(ImageCache.Data.Select(x => (x.Key, x.Value.usage)).ToDictionary(x => x.Key, x => x.usage));
+                _storage.Save(ImageCache.Data
+                    .ToDictionary(
+                        x => x.Key,
+                        x => x.Value.usage));
             }
         }
 
-        private static ConcurrentDictionary<string, int> LoadStorageToConcurrentDictionary()
+        private static ConcurrentDictionary<(string, bool), int> LoadStorageToConcurrentDictionary()
         {
             lock (_storage)
             {
-                var loaded = _storage.TryLoad(new Dictionary<string, int>());
+                var loaded = _storage.TryLoad(new Dictionary<(string, bool), int>());
 
-                return new ConcurrentDictionary<string, int>(loaded);
+                return new ConcurrentDictionary<(string, bool), int>(loaded);
             }
         }
 
@@ -99,7 +103,7 @@ namespace Flow.Launcher.Infrastructure.Image
             Cache
         }
 
-        private static ImageResult LoadInternal(string path, bool loadFullImage = false)
+        private static async ValueTask<ImageResult> LoadInternalAsync(string path, bool loadFullImage = false)
         {
             ImageResult imageResult;
 
@@ -107,13 +111,21 @@ namespace Flow.Launcher.Infrastructure.Image
             {
                 if (string.IsNullOrEmpty(path))
                 {
-                    return new ImageResult(ImageCache[Constant.MissingImgIcon], ImageType.Error);
-                }
-                if (ImageCache.ContainsKey(path))
-                {
-                    return new ImageResult(ImageCache[path], ImageType.Cache);
+                    return new ImageResult(DefaultImage, ImageType.Error);
                 }
 
+                if (ImageCache.ContainsKey(path, loadFullImage))
+                {
+                    return new ImageResult(ImageCache[path, loadFullImage], ImageType.Cache);
+                }
+
+                if (Uri.TryCreate(path, UriKind.RelativeOrAbsolute, out var uriResult)
+                    && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps))
+                {
+                    var image = await LoadRemoteImageAsync(loadFullImage, uriResult);
+                    ImageCache[path, loadFullImage] = image;
+                    return new ImageResult(image, ImageType.ImageFile);
+                }
                 if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
                 {
                     var imageSource = new BitmapImage(new Uri(path));
@@ -121,12 +133,7 @@ namespace Flow.Launcher.Infrastructure.Image
                     return new ImageResult(imageSource, ImageType.Data);
                 }
 
-                if (!Path.IsPathRooted(path))
-                {
-                    path = Path.Combine(Constant.ProgramDirectory, "Images", Path.GetFileName(path));
-                }
-
-                imageResult = GetThumbnailResult(ref path, loadFullImage);
+                imageResult = await Task.Run(() => GetThumbnailResult(ref path, loadFullImage));
             }
             catch (System.Exception e)
             {
@@ -140,14 +147,35 @@ namespace Flow.Launcher.Infrastructure.Image
                     Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e);
                     Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2);
 
-                    ImageSource image = ImageCache[Constant.MissingImgIcon];
-                    ImageCache[path] = image;
+                    ImageSource image = ImageCache[Constant.MissingImgIcon, false];
+                    ImageCache[path, false] = image;
                     imageResult = new ImageResult(image, ImageType.Error);
                 }
             }
 
             return imageResult;
         }
+        private static async Task<BitmapImage> LoadRemoteImageAsync(bool loadFullImage, Uri uriResult)
+        {
+            // Download image from url
+            await using var resp = await GetStreamAsync(uriResult);
+            await using var buffer = new MemoryStream();
+            await resp.CopyToAsync(buffer);
+            buffer.Seek(0, SeekOrigin.Begin);
+            var image = new BitmapImage();
+            image.BeginInit();
+            image.CacheOption = BitmapCacheOption.OnLoad;
+            if (!loadFullImage)
+            {
+                image.DecodePixelHeight = SmallIconSize;
+                image.DecodePixelWidth = SmallIconSize;
+            }
+            image.StreamSource = buffer;
+            image.EndInit();
+            image.StreamSource = null;
+            image.Freeze();
+            return image;
+        }
 
         private static ImageResult GetThumbnailResult(ref string path, bool loadFullImage = false)
         {
@@ -192,7 +220,7 @@ namespace Flow.Launcher.Infrastructure.Image
             }
             else
             {
-                image = ImageCache[Constant.MissingImgIcon];
+                image = ImageCache[Constant.MissingImgIcon, false];
                 path = Constant.MissingImgIcon;
             }
 
@@ -213,14 +241,14 @@ namespace Flow.Launcher.Infrastructure.Image
                 option);
         }
 
-        public static bool CacheContainImage(string path)
+        public static bool CacheContainImage(string path, bool loadFullImage = false)
         {
-            return ImageCache.ContainsKey(path) && ImageCache[path] != null;
+            return ImageCache.ContainsKey(path, false) && ImageCache[path, loadFullImage] != null;
         }
 
-        public static ImageSource Load(string path, bool loadFullImage = false)
+        public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false)
         {
-            var imageResult = LoadInternal(path, loadFullImage);
+            var imageResult = await LoadInternalAsync(path, loadFullImage);
 
             var img = imageResult.ImageSource;
             if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache)
@@ -231,7 +259,7 @@ namespace Flow.Launcher.Infrastructure.Image
 
                     if (GuidToKey.TryGetValue(hash, out string key))
                     { // image already exists
-                        img = ImageCache[key] ?? img;
+                        img = ImageCache[key, false] ?? img;
                     }
                     else
                     { // new guid
@@ -240,7 +268,7 @@ namespace Flow.Launcher.Infrastructure.Image
                 }
 
                 // update cache
-                ImageCache[path] = img;
+                ImageCache[path, false] = img;
             }
 
             return img;

Flow.Launcher.Infrastructure/PinyinAlphabet.cs

@@ -15,7 +15,7 @@ namespace Flow.Launcher.Infrastructure
 
         private List<int> originalIndexs = new List<int>();
         private List<int> translatedIndexs = new List<int>();
-        private int translaedLength = 0;
+        private int translatedLength = 0;
 
         public string key { get; private set; }
 
@@ -32,13 +32,13 @@ namespace Flow.Launcher.Infrastructure
             originalIndexs.Add(originalIndex);
             translatedIndexs.Add(translatedIndex);
             translatedIndexs.Add(translatedIndex + length);
-            translaedLength += length - 1;
+            translatedLength += length - 1;
         }
 
         public int MapToOriginalIndex(int translatedIndex)
         {
             if (translatedIndex > translatedIndexs.Last())
-                return translatedIndex - translaedLength - 1;
+                return translatedIndex - translatedLength - 1;
 
             int lowerBound = 0;
             int upperBound = originalIndexs.Count - 1;
@@ -83,7 +83,7 @@ namespace Flow.Launcher.Infrastructure
                     translatedIndex < translatedIndexs[upperBound * 2])
                 {
                     int indexDef = 0;
-                    
+
                     for (int j = 0; j < upperBound; j++)
                     {
                         indexDef += translatedIndexs[j * 2 + 1] - translatedIndexs[j * 2];
@@ -102,9 +102,24 @@ namespace Flow.Launcher.Infrastructure
         }
     }
 
+    /// <summary>
+    /// Translate a language to English letters using a given rule.
+    /// </summary>
     public interface IAlphabet
     {
+        /// <summary>
+        /// Translate a string to English letters, using a given rule.
+        /// </summary>
+        /// <param name="stringToTranslate">String to translate.</param>
+        /// <returns></returns>
         public (string translation, TranslationMapping map) Translate(string stringToTranslate);
+
+        /// <summary>
+        /// Determine if a string can be translated to English letter with this Alphabet.
+        /// </summary>
+        /// <param name="stringToTranslate">String to translate.</param>
+        /// <returns></returns>
+        public bool CanBeTranslated(string stringToTranslate);
     }
 
     public class PinyinAlphabet : IAlphabet
@@ -119,63 +134,70 @@ namespace Flow.Launcher.Infrastructure
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }
 
+        public bool CanBeTranslated(string stringToTranslate)
+        {
+            return WordsHelper.HasChinese(stringToTranslate);
+        }
+
         public (string translation, TranslationMapping map) Translate(string content)
         {
             if (_settings.ShouldUsePinyin)
             {
                 if (!_pinyinCache.ContainsKey(content))
                 {
-                    if (WordsHelper.HasChinese(content))
-                    {
-                        var resultList = WordsHelper.GetPinyinList(content);
-
-                        StringBuilder resultBuilder = new StringBuilder();
-                        TranslationMapping map = new TranslationMapping();
-
-                        bool pre = false;
-
-                        for (int i = 0; i < resultList.Length; i++)
-                        {
-                            if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
-                            {
-                                map.AddNewIndex(i, resultBuilder.Length, resultList[i].Length + 1);
-                                resultBuilder.Append(' ');
-                                resultBuilder.Append(resultList[i]);
-                                pre = true;
-                            }
-                            else
-                            {
-                                if (pre)
-                                {
-                                    pre = false;
-                                    resultBuilder.Append(' ');
-                                }
-
-                                resultBuilder.Append(resultList[i]);
-                            }
-                        }
-
-                        map.endConstruct();
-
-                        var key = resultBuilder.ToString();
-                        map.setKey(key);
-
-                        return _pinyinCache[content] = (key, map);
-                    }
-                    else
-                    {
-                        return (content, null);
-                    }
+                    return BuildCacheFromContent(content);
                 }
                 else
                 {
                     return _pinyinCache[content];
                 }
             }
+            return (content, null);
+        }
+
+        private (string translation, TranslationMapping map) BuildCacheFromContent(string content)
+        {
+            if (WordsHelper.HasChinese(content))
+            {
+                var resultList = WordsHelper.GetPinyinList(content);
+
+                StringBuilder resultBuilder = new StringBuilder();
+                TranslationMapping map = new TranslationMapping();
+
+                bool pre = false;
+
+                for (int i = 0; i < resultList.Length; i++)
+                {
+                    if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
+                    {
+                        map.AddNewIndex(i, resultBuilder.Length, resultList[i].Length + 1);
+                        resultBuilder.Append(' ');
+                        resultBuilder.Append(resultList[i]);
+                        pre = true;
+                    }
+                    else
+                    {
+                        if (pre)
+                        {
+                            pre = false;
+                            resultBuilder.Append(' ');
+                        }
+
+                        resultBuilder.Append(resultList[i]);
+                    }
+                }
+
+                map.endConstruct();
+
+                var key = resultBuilder.ToString();
+                map.setKey(key);
+
+                return _pinyinCache[content] = (key, map);
+            }
             else
             {
                 return (content, null);
             }
         }
     }
-}
+}

Flow.Launcher.Infrastructure/StringMatcher.cs

@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher.Plugin.SharedModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -60,8 +60,13 @@ namespace Flow.Launcher.Infrastructure
                 return new MatchResult(false, UserSettingSearchPrecision);
 
             query = query.Trim();
-            TranslationMapping translationMapping;
-            (stringToCompare, translationMapping) = _alphabet?.Translate(stringToCompare) ?? (stringToCompare, null);
+            TranslationMapping translationMapping = null;
+            if (_alphabet is not null && !_alphabet.CanBeTranslated(query))
+            {
+                // We assume that if a query can be translated (containing characters of a language, like Chinese)
+                // it actually means user doesn't want it to be translated to English letters.
+                (stringToCompare, translationMapping) = _alphabet.Translate(stringToCompare);
+            }
 
             var currentAcronymQueryIndex = 0;
             var acronymMatchData = new List<int>();

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -6,7 +6,6 @@ using System.Text.Json.Serialization;
 using System.Windows;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-using Flow.Launcher;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Infrastructure.UserSettings

Flow.Launcher.Plugin/Result.cs

@@ -60,9 +60,14 @@ namespace Flow.Launcher.Plugin
             get { return _icoPath; }
             set
             {
-                if (!string.IsNullOrEmpty(PluginDirectory) && !Path.IsPathRooted(value))
+                // As a standard this property will handle prepping and converting to absolute local path for icon image processing
+                if (!string.IsNullOrEmpty(value)
+                    && !string.IsNullOrEmpty(PluginDirectory)
+                    && !Path.IsPathRooted(value)
+                    && !value.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+                    && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
                 {
-                    _icoPath = Path.Combine(value, IcoPath);
+                    _icoPath = Path.Combine(PluginDirectory, value);
                 }
                 else
                 {
@@ -140,10 +145,11 @@ namespace Flow.Launcher.Plugin
             set
             {
                 _pluginDirectory = value;
-                if (!string.IsNullOrEmpty(IcoPath) && !Path.IsPathRooted(IcoPath))
-                {
-                    IcoPath = Path.Combine(value, IcoPath);
-                }
+
+                // When the Result object is returned from the query call, PluginDirectory is not provided until
+                // UpdatePluginMetadata call is made at PluginManager.cs L196. Once the PluginDirectory becomes available
+                // we need to update (only if not Uri path) the IcoPath with the full absolute path so the image can be loaded.
+                IcoPath = _icoPath;
             }
         }
 

Flow.Launcher.Test/FuzzyMatcherTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

Flow.Launcher/Converters/DateTimeFormatToNowConverter.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters
+{
+    public class DateTimeFormatToNowConverter : IValueConverter
+    {
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is not string format ? null : DateTime.Now.ToString(format);
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

@@ -52,7 +52,8 @@ namespace Flow.Launcher.Converters
 
                 // Check if Text will be larger then our QueryTextBox
                 System.Windows.Media.Typeface typeface = new Typeface(QueryTextBox.FontFamily, QueryTextBox.FontStyle, QueryTextBox.FontWeight, QueryTextBox.FontStretch);
-                System.Windows.Media.FormattedText ft = new FormattedText(QueryTextBox.Text, System.Globalization.CultureInfo.CurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, QueryTextBox.FontSize, Brushes.Black);
+                // TODO: Obsolete warning?
+                System.Windows.Media.FormattedText ft = new FormattedText(QueryTextBox.Text, System.Globalization.CultureInfo.DefaultThreadCurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, QueryTextBox.FontSize, Brushes.Black);
 
                 var offset = QueryTextBox.Padding.Right;
 
@@ -75,4 +76,4 @@ namespace Flow.Launcher.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

Flow.Launcher/Flow.Launcher.csproj

@@ -126,4 +126,4 @@
       <Analyzer Include="@(FilteredAnalyzer)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>

Flow.Launcher/Languages/da.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/de.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/en.xaml

@@ -64,8 +64,8 @@
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
-    <system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
-    <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
+    <system:String x:Key="ShouldUsePinyin">Search with Pinyin</system:String>
+    <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
     <!--  Setting Plugin  -->
@@ -105,9 +105,9 @@
     <system:String x:Key="installbtn">Install</system:String>
     <system:String x:Key="uninstallbtn">Uninstall</system:String>
     <system:String x:Key="updatebtn">Update</system:String>
-    <system:String x:Key="LabelInstalledToolTip">Plug-in already installed</system:String>
+    <system:String x:Key="LabelInstalledToolTip">Plugin already installed</system:String>
     <system:String x:Key="LabelNew">New Version</system:String>
-    <system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String>
+    <system:String x:Key="LabelNewToolTip">This plugin has been updated within the last 7 days</system:String>
     <system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String>
 
 
@@ -191,6 +191,7 @@
     <system:String x:Key="icons">Icons</system:String>
     <system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
     <system:String x:Key="checkUpdates">Check for Updates</system:String>
+    <system:String x:Key="BecomeASponsor">Become A Sponsor</system:String>
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
@@ -332,7 +333,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/es-419.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Clima en los Resultados de Google</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Comando de Shell</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth en configuración de Windows</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Notas adhesivas</system:String>

Flow.Launcher/Languages/es.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">El tiempo en los resultados de Google</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Comando de terminal</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth en la configuración de Windows</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Notas adhesivas</system:String>

Flow.Launcher/Languages/fr.xaml

@@ -286,7 +286,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Commande Shell</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth dans les Paramètres de Windows</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/it.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Meteo nel risultato di Google</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Comando Della shell</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/ja.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/ko.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">구글 날씨 검색</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">쉘 명령어</system:String>
-    <system:String x:Key="RecommendBluetooth">블루투스</system:String>
+    <system:String x:Key="RecommendBluetooth">s 블루투스</system:String>
     <system:String x:Key="RecommendBluetoothDesc">윈도우 블루투스 설정</system:String>
     <system:String x:Key="RecommendAcronyms">스메</system:String>
     <system:String x:Key="RecommendAcronymsDesc">스티커 메모</system:String>

Flow.Launcher/Languages/nb.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/nl.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/pl.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/pt-br.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/pt-pt.xaml

@@ -286,7 +286,7 @@ Queira por favor mover a pasta do seu perfil de {0} para {1}
     <system:String x:Key="RecommendWeatherDesc">Meteorologia no Google</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Comando de consola</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth nas definições do Windows</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/ru.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/sk.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Počasie na Googli</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Príkazový riadok</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth v nastaveniach Windowsu</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/sr.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/tr.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/uk-UA.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell Command</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Bluetooth in Windows Settings</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>

Flow.Launcher/Languages/zh-cn.xaml

@@ -287,7 +287,7 @@
     <system:String x:Key="RecommendWeatherDesc">谷歌天气结果</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">命令行命令</system:String>
-    <system:String x:Key="RecommendBluetooth">Bluetooth</system:String>
+    <system:String x:Key="RecommendBluetooth">s Bluetooth</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Windows 设置中的蓝牙</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">便笺</system:String>

Flow.Launcher/Languages/zh-tw.xaml

@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">登錄快捷鍵：{0} 失敗</system:String>
     <system:String x:Key="couldnotStartCmd">啟動命令 {0} 失敗</system:String>
@@ -287,7 +290,7 @@
     <system:String x:Key="RecommendWeatherDesc">Google 搜索的天氣結果</system:String>
     <system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>
     <system:String x:Key="RecommendShellDesc">Shell 指令</system:String>
-    <system:String x:Key="RecommendBluetooth">藍牙</system:String>
+    <system:String x:Key="RecommendBluetooth">s 藍牙</system:String>
     <system:String x:Key="RecommendBluetoothDesc">Windows 設定中的藍牙</system:String>
     <system:String x:Key="RecommendAcronyms">sn</system:String>
     <system:String x:Key="RecommendAcronymsDesc">便利貼</system:String>

Flow.Launcher/MainWindow.xaml

@@ -37,7 +37,7 @@
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
     </Window.Resources>
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
@@ -184,100 +184,107 @@
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
             <StackPanel Orientation="Vertical">
                 <Grid>
-                    <TextBox
-                        x:Name="QueryTextSuggestionBox"
-                        IsEnabled="False"
-                        Style="{DynamicResource QuerySuggestionBoxStyle}">
-                        <TextBox.Text>
-                            <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
-                                <Binding ElementName="QueryTextBox" Mode="OneTime" />
-                                <Binding ElementName="ResultListBox" Path="SelectedItem" />
-                                <Binding ElementName="QueryTextBox" Path="Text" />
-                            </MultiBinding>
-                        </TextBox.Text>
-                    </TextBox>
-                    <TextBox
-                        x:Name="QueryTextBox"
-                        AllowDrop="True"
-                        Background="Transparent"
-                        PreviewDragOver="OnPreviewDragOver"
-                        PreviewKeyUp="QueryTextBox_KeyUp"
-                        Style="{DynamicResource QueryBoxStyle}"
-                        Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Visibility="Visible">
-                        <TextBox.CommandBindings>
-                            <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
-                        </TextBox.CommandBindings>
-                        <TextBox.ContextMenu>
-                            <ContextMenu>
-                                <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe8c6;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                                <MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe8c8;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                                <MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe77f;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                                <Separator
-                                    Margin="0"
-                                    Padding="0,4,0,4"
-                                    Background="{DynamicResource ContextSeparator}" />
-                                <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe713;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}">
-                                    <MenuItem.Icon>
-                                        <ui:FontIcon Glyph="&#xe711;" />
-                                    </MenuItem.Icon>
-                                </MenuItem>
-                            </ContextMenu>
-                        </TextBox.ContextMenu>
-                    </TextBox>
-
+                    <Border Style="{DynamicResource QueryBoxBgStyle}">
+                        <Grid>
+                            <TextBox
+                                x:Name="QueryTextSuggestionBox"
+                                IsEnabled="False"
+                                Style="{DynamicResource QuerySuggestionBoxStyle}">
+                                <TextBox.Text>
+                                    <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
+                                        <Binding ElementName="QueryTextBox" Mode="OneTime" />
+                                        <Binding ElementName="ResultListBox" Path="SelectedItem" />
+                                        <Binding ElementName="QueryTextBox" Path="Text" />
+                                    </MultiBinding>
+                                </TextBox.Text>
+                            </TextBox>
+                            <TextBox
+                                x:Name="QueryTextBox"
+                                AllowDrop="True"
+                                PreviewDragOver="OnPreviewDragOver"
+                                PreviewKeyUp="QueryTextBox_KeyUp"
+                                Style="{DynamicResource QueryBoxStyle}"
+                                Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                Visibility="Visible">
+                                <TextBox.CommandBindings>
+                                    <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
+                                </TextBox.CommandBindings>
+                                <TextBox.ContextMenu>
+                                    <ContextMenu MinWidth="160">
+                                        <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}">
+                                            <MenuItem.Icon>
+                                                <ui:FontIcon Glyph="&#xe8c6;" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}">
+                                            <MenuItem.Icon>
+                                                <ui:FontIcon Glyph="&#xe8c8;" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}">
+                                            <MenuItem.Icon>
+                                                <ui:FontIcon Glyph="&#xe77f;" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <Separator
+                                            Margin="0"
+                                            Padding="0,4,0,4"
+                                            Background="{DynamicResource ContextSeparator}" />
+                                        <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}">
+                                            <MenuItem.Icon>
+                                                <ui:FontIcon Glyph="&#xe713;" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}">
+                                            <MenuItem.Icon>
+                                                <ui:FontIcon Glyph="&#xe711;" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                    </ContextMenu>
+                                </TextBox.ContextMenu>
+                            </TextBox>
+                        </Grid>
+                    </Border>
                     <StackPanel
                         x:Name="ClockPanel"
                         IsHitTestVisible="False"
                         Style="{DynamicResource ClockPanel}">
                         <TextBlock
-                            Style="{DynamicResource DateBox}"
-                            Text="{Binding DateText}"
-                            Visibility="{Binding Settings.UseDate, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                        <TextBlock
+                            x:Name="ClockBox"
                             Style="{DynamicResource ClockBox}"
                             Text="{Binding ClockText}"
-                            Visibility="{Binding Settings.UseClock, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            Visibility="{Binding Settings.UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        <TextBlock
+                            x:Name="DateBox"
+                            Style="{DynamicResource DateBox}"
+                            Text="{Binding DateText}"
+                            Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
                     </StackPanel>
-
-                    <Canvas Style="{DynamicResource SearchIconPosition}">
-                        <Image
-                            x:Name="PluginActivationIcon"
-                            Width="32"
-                            Height="32"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Panel.ZIndex="2"
-                            RenderOptions.BitmapScalingMode="HighQuality"
-                            Source="{Binding PluginIconPath}"
-                            Stretch="Uniform"
-                            Style="{DynamicResource PluginActivationIcon}" />
-                        <Path
-                            Name="SearchIcon"
-                            Margin="0"
-                            Data="{DynamicResource SearchIconImg}"
-                            Stretch="Fill"
-                            Style="{DynamicResource SearchIconStyle}"
-                            Visibility="{Binding SearchIconVisibility}" />
-                    </Canvas>
+                    <Border>
+                        <Grid>
+                            <Image
+                                x:Name="PluginActivationIcon"
+                                Width="32"
+                                Height="32"
+                                Margin="0,0,18,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Panel.ZIndex="2"
+                                RenderOptions.BitmapScalingMode="HighQuality"
+                                Source="{Binding PluginIconPath}"
+                                Stretch="Uniform"
+                                Style="{DynamicResource PluginActivationIcon}" />
+                            <Canvas Style="{DynamicResource SearchIconPosition}">
+                                <Path
+                                    Name="SearchIcon"
+                                    Margin="0"
+                                    Data="{DynamicResource SearchIconImg}"
+                                    Stretch="Fill"
+                                    Style="{DynamicResource SearchIconStyle}"
+                                    Visibility="{Binding SearchIconVisibility}" />
+                            </Canvas>
+                        </Grid>
+                    </Border>
                 </Grid>
 
                 <Grid ClipToBounds="True">
@@ -329,7 +336,8 @@
                         <flowlauncher:ResultListBox
                             x:Name="ResultListBox"
                             DataContext="{Binding Results}"
-                            PreviewMouseLeftButtonUp="OnPreviewMouseButtonDown" />
+                            LeftClickResultCommand="{Binding LeftClickResultCommand}"
+                            RightClickResultCommand="{Binding RightClickResultCommand}" />
                     </ContentControl>
                 </Border>
                 <Border Style="{DynamicResource WindowRadius}">
@@ -344,7 +352,8 @@
                         <flowlauncher:ResultListBox
                             x:Name="ContextMenu"
                             DataContext="{Binding ContextMenu}"
-                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                            LeftClickResultCommand="{Binding LeftClickResultCommand}"
+                            RightClickResultCommand="{Binding RightClickResultCommand}" />
                     </ContentControl>
                 </Border>
                 <Border Style="{DynamicResource WindowRadius}">
@@ -359,7 +368,8 @@
                         <flowlauncher:ResultListBox
                             x:Name="History"
                             DataContext="{Binding History}"
-                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                            LeftClickResultCommand="{Binding LeftClickResultCommand}"
+                            RightClickResultCommand="{Binding RightClickResultCommand}" />
                     </ContentControl>
                 </Border>
             </StackPanel>

Flow.Launcher/MainWindow.xaml.cs

@@ -30,6 +30,10 @@ using System.Windows.Data;
 using ModernWpf.Controls;
 using System.Drawing;
 using System.Windows.Forms.Design.Behavior;
+using System.Security.Cryptography;
+using System.Runtime.CompilerServices;
+using Microsoft.VisualBasic.Devices;
+using Microsoft.FSharp.Data.UnitSystems.SI.UnitNames;
 
 namespace Flow.Launcher
 {
@@ -105,7 +109,6 @@ namespace Flow.Launcher
             // since the default main window visibility is visible
             // so we need set focus during startup
             QueryTextBox.Focus();
-
             _viewModel.PropertyChanged += (o, e) =>
             {
                 switch (e.PropertyName)
@@ -243,7 +246,9 @@ namespace Flow.Launcher
                 Icon = Properties.Resources.app,
                 Visible = !_settings.HideNotifyIcon
             };
+
             contextMenu = new ContextMenu();
+
             var openIcon = new FontIcon { Glyph = "\ue71e" };
             var open = new MenuItem
             {
@@ -280,9 +285,11 @@ namespace Flow.Launcher
             positionreset.Click += (o, e) => PositionReset();
             settings.Click += (o, e) => App.API.OpenSettingDialog();
             exit.Click += (o, e) => Close();
-            contextMenu.Items.Add(open);
+
             gamemode.ToolTip = InternationalizationManager.Instance.GetTranslation("GameModeToolTip");
             positionreset.ToolTip = InternationalizationManager.Instance.GetTranslation("PositionResetToolTip");
+
+            contextMenu.Items.Add(open);
             contextMenu.Items.Add(gamemode);
             contextMenu.Items.Add(positionreset);
             contextMenu.Items.Add(settings);
@@ -359,11 +366,14 @@ namespace Flow.Launcher
 
             _animating = true;
             UpdatePosition();
-            Storyboard sb = new Storyboard();
+
+            Storyboard windowsb = new Storyboard();
+            Storyboard clocksb = new Storyboard();
             Storyboard iconsb = new Storyboard();
-            CircleEase easing = new CircleEase();  // or whatever easing class you want
+            CircleEase easing = new CircleEase();
             easing.EasingMode = EasingMode.EaseInOut;
-            var da = new DoubleAnimation
+
+            var WindowOpacity = new DoubleAnimation
             {
                 From = 0,
                 To = 1,
@@ -371,33 +381,76 @@ namespace Flow.Launcher
                 FillBehavior = FillBehavior.Stop
             };
 
-            var da2 = new DoubleAnimation
+            var WindowMotion = new DoubleAnimation
             {
                 From = Top + 10,
                 To = Top,
                 Duration = TimeSpan.FromSeconds(0.25),
                 FillBehavior = FillBehavior.Stop
             };
-                var da3 = new DoubleAnimation
-                {
+            var IconMotion = new DoubleAnimation
+            {
                     From = 12,
                     To = 0,
                     EasingFunction = easing,
                     Duration = TimeSpan.FromSeconds(0.36),
                     FillBehavior = FillBehavior.Stop
-                };
-            Storyboard.SetTarget(da, this);
-            Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
-            Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
-            Storyboard.SetTargetProperty(da3, new PropertyPath(TopProperty));
-            sb.Children.Add(da);
-            sb.Children.Add(da2);
-            iconsb.Children.Add(da3);
-            sb.Completed += (_, _) => _animating = false;
+            };
+
+            var ClockOpacity = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                EasingFunction = easing,
+                Duration = TimeSpan.FromSeconds(0.36),
+                FillBehavior = FillBehavior.Stop
+            };
+            double TargetIconOpacity = SearchIcon.Opacity; // Animation Target Opacity from Style
+            var IconOpacity = new DoubleAnimation
+            {
+                From = 0,
+                To = TargetIconOpacity,
+                EasingFunction = easing,
+                Duration = TimeSpan.FromSeconds(0.36),
+                FillBehavior = FillBehavior.Stop
+            };
+
+            double right = ClockPanel.Margin.Right;
+            var thicknessAnimation = new ThicknessAnimation
+            {
+                From = new Thickness(0, 12, right, 0),
+                To = new Thickness(0, 0, right, 0),
+                EasingFunction = easing,
+                Duration = TimeSpan.FromSeconds(0.36),
+                FillBehavior = FillBehavior.Stop
+            };
+
+            Storyboard.SetTargetProperty(ClockOpacity, new PropertyPath(OpacityProperty));
+            Storyboard.SetTargetName(thicknessAnimation, "ClockPanel");
+            Storyboard.SetTargetProperty(thicknessAnimation, new PropertyPath(MarginProperty));
+            Storyboard.SetTarget(WindowOpacity, this);
+            Storyboard.SetTargetProperty(WindowOpacity, new PropertyPath(Window.OpacityProperty));
+            Storyboard.SetTargetProperty(WindowMotion, new PropertyPath(Window.TopProperty));
+            Storyboard.SetTargetProperty(IconMotion, new PropertyPath(TopProperty));
+            Storyboard.SetTargetProperty(IconOpacity, new PropertyPath(OpacityProperty));
+
+            clocksb.Children.Add(thicknessAnimation);
+            clocksb.Children.Add(ClockOpacity);
+            windowsb.Children.Add(WindowOpacity);
+            windowsb.Children.Add(WindowMotion);
+            iconsb.Children.Add(IconMotion);
+            iconsb.Children.Add(IconOpacity);
+
+            windowsb.Completed += (_, _) => _animating = false;
             _settings.WindowLeft = Left;
             _settings.WindowTop = Top;
+
+            if (QueryTextBox.Text.Length == 0)
+            {
+                clocksb.Begin(ClockPanel);
+            }
             iconsb.Begin(SearchIcon);
-            sb.Begin(FlowMainWindow);
+            windowsb.Begin(FlowMainWindow);
         }
 
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
@@ -405,28 +458,6 @@ namespace Flow.Launcher
             if (e.ChangedButton == MouseButton.Left) DragMove();
         }
 
-        private void OnPreviewMouseButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender != null && e.OriginalSource != null)
-            {
-                var r = (ResultListBox)sender;
-                var d = (DependencyObject)e.OriginalSource;
-                var item = ItemsControl.ContainerFromElement(r, d) as ListBoxItem;
-                var result = (ResultViewModel)item?.DataContext;
-                if (result != null)
-                {
-                    if (e.ChangedButton == MouseButton.Left)
-                    {
-                        _viewModel.OpenResultCommand.Execute(null);
-                    }
-                    else if (e.ChangedButton == MouseButton.Right)
-                    {
-                        _viewModel.LoadContextMenuCommand.Execute(null);
-                    }
-                }
-            }
-        }
-
         private void OnPreviewDragOver(object sender, DragEventArgs e)
         {
             e.Handled = true;

Flow.Launcher/Msg.xaml.cs

@@ -38,10 +38,16 @@ namespace Flow.Launcher
             Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(TopProperty));
             fadeOutStoryboard.Children.Add(fadeOutAnimation);
 
-            imgClose.Source = ImageLoader.Load(Path.Combine(Infrastructure.Constant.ProgramDirectory, "Images\\close.png"));
+            _ = LoadImageAsync();
+            
             imgClose.MouseUp += imgClose_MouseUp;
         }
 
+        private async System.Threading.Tasks.Task LoadImageAsync()
+        {
+            imgClose.Source = await ImageLoader.LoadAsync(Path.Combine(Infrastructure.Constant.ProgramDirectory, "Images\\close.png"));
+        }
+
         void imgClose_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (!closing)
@@ -56,7 +62,7 @@ namespace Flow.Launcher
             Close();
         }
 
-        public void Show(string title, string subTitle, string iconPath)
+        public async void Show(string title, string subTitle, string iconPath)
         {
             tbTitle.Text = title;
             tbSubTitle.Text = subTitle;
@@ -66,15 +72,15 @@ namespace Flow.Launcher
             }
             if (!File.Exists(iconPath))
             {
-                imgIco.Source = ImageLoader.Load(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));
+                imgIco.Source = await ImageLoader.LoadAsync(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));
             }
             else {
-                imgIco.Source = ImageLoader.Load(iconPath);
+                imgIco.Source = await ImageLoader.LoadAsync(iconPath);
             }
 
             Show();
 
-            Dispatcher.InvokeAsync(async () =>
+            await Dispatcher.InvokeAsync(async () =>
                                    {
                                        if (!closing)
                                        {

Flow.Launcher/ResultListBox.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     MaxHeight="{Binding MaxHeight}"
-    Margin="{Binding Margin}"
+    Margin="{DynamicResource ResultMargin}"
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
     d:DesignHeight="100"
@@ -17,6 +17,10 @@
     ItemsSource="{Binding Results}"
     KeyboardNavigation.DirectionalNavigation="Cycle"
     PreviewMouseDown="ListBox_PreviewMouseDown"
+    PreviewMouseLeftButtonDown="ResultList_PreviewMouseLeftButtonDown"
+    PreviewMouseLeftButtonUp="ResultListBox_OnPreviewMouseUp"
+    PreviewMouseMove="ResultList_MouseMove"
+    PreviewMouseRightButtonDown="ResultListBox_OnPreviewMouseRightButtonDown"
     SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
     SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
     SelectionChanged="OnSelectionChanged"
@@ -25,15 +29,12 @@
     VirtualizingStackPanel.IsVirtualizing="True"
     VirtualizingStackPanel.VirtualizationMode="Standard"
     Visibility="{Binding Visbility}"
-    mc:Ignorable="d"
-    PreviewMouseMove="ResultList_MouseMove"
-    PreviewMouseLeftButtonDown="ResultList_PreviewMouseLeftButtonDown">
+    mc:Ignorable="d">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
     <ListBox.ItemTemplate>
         <DataTemplate>
-            <Button
-                HorizontalAlignment="Stretch">
+            <Button HorizontalAlignment="Stretch">
                 <Button.Template>
                     <ControlTemplate>
                         <ContentPresenter Content="{TemplateBinding Button.Content}" />
@@ -54,19 +55,19 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="60" />
                             <ColumnDefinition Width="9*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" MinWidth="8" />
                         </Grid.ColumnDefinitions>
                         <StackPanel
                             Grid.Column="2"
                             Margin="0,0,10,0"
+                            VerticalAlignment="Center"
                             Visibility="{Binding ShowOpenResultHotkey}">
                             <TextBlock
                                 x:Name="Hotkey"
                                 Margin="12,0,12,0"
-                                Padding="0,10,0,10"
+                                Padding="0,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
-                                Opacity="0.8"
                                 Style="{DynamicResource ItemHotkeyStyle}">
                                 <TextBlock.Visibility>
                                     <Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
@@ -79,55 +80,77 @@
                                 </TextBlock.Text>
                             </TextBlock>
                         </StackPanel>
-                        <Border
-                            Margin="9,0,0,0"
-                            BorderBrush="Transparent"
-                            BorderThickness="0">
-                            <Image
-                                x:Name="ImageIcon"
-                                Width="{Binding IconXY}"
-                                Height="{Binding IconXY}"
-                                Margin="0,0,0,0" IsHitTestVisible="False"
-                                HorizontalAlignment="Center"
-                                Source="{Binding Image, TargetNullValue={x:Null}}"
-                                Stretch="Uniform"
-                                Visibility="{Binding ShowIcon}">
-                                <Image.Clip>
-                                    <EllipseGeometry RadiusX="{Binding IconRadius}" RadiusY="{Binding IconRadius}" Center="16 16"/>
-                                </Image.Clip>
-                            </Image>
-                        </Border>
-                        <Border
-                            Margin="9,0,0,0"
-                            BorderBrush="Transparent"
-                            BorderThickness="0">
-                            <TextBlock
+
+                        <Grid Grid.Column="0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <Border
+                                x:Name="Bullet"
                                 Grid.Column="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                FontFamily="{Binding Glyph.FontFamily}"
-                                Style="{DynamicResource ItemGlyph}"
-                                Text="{Binding Glyph.Glyph}"
-                                Visibility="{Binding ShowGlyph}" />
-                        </Border>
+                                Style="{DynamicResource BulletStyle}" />
+
+                            <Border
+                                Grid.Column="1"
+                                Margin="9,0,0,0"
+                                BorderBrush="Transparent"
+                                BorderThickness="1">
+                                <Image
+                                    x:Name="ImageIcon"
+                                    Width="{Binding IconXY}"
+                                    Height="{Binding IconXY}"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Center"
+                                    IsHitTestVisible="False"
+                                    Source="{Binding Image, TargetNullValue={x:Null}}"
+                                    Stretch="Uniform"
+                                    Visibility="{Binding ShowIcon}">
+                                    <Image.Clip>
+                                        <EllipseGeometry
+                                            Center="16 16"
+                                            RadiusX="{Binding IconRadius}"
+                                            RadiusY="{Binding IconRadius}" />
+                                    </Image.Clip>
+                                </Image>
+                            </Border>
+                            <Border
+                                Grid.Column="1"
+                                Margin="9,0,0,0"
+                                BorderBrush="Transparent"
+                                BorderThickness="0">
+                                <TextBlock
+                                    x:Name="GlyphIcon"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="{Binding Glyph.FontFamily}"
+                                    Style="{DynamicResource ItemGlyph}"
+                                    Text="{Binding Glyph.Glyph}"
+                                    Visibility="{Binding ShowGlyph}" />
+                            </Border>
+                        </Grid>
+
                         <Grid
                             Grid.Column="1"
                             Margin="6,0,10,0"
-                            HorizontalAlignment="Stretch">
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center">
                             <Grid.RowDefinitions>
-                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
                                 <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
                             <ProgressBar
                                 x:Name="progressbarResult"
+                                Grid.Row="0"
                                 Foreground="{Binding Result.ProgressBarColor}"
                                 Value="{Binding ResultProgress, Mode=OneWay}">
                                 <ProgressBar.Style>
-                                    <Style TargetType="ProgressBar" BasedOn="{StaticResource ProgressBarResult}">
-                                        <Setter Property="Visibility" Value="Visible"/>
+                                    <Style BasedOn="{StaticResource ProgressBarResult}" TargetType="ProgressBar">
+                                        <Setter Property="Visibility" Value="Visible" />
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
+                                                <Setter Property="Visibility" Value="Collapsed" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
@@ -135,12 +158,15 @@
                             </ProgressBar>
                             <TextBlock
                                 x:Name="Title"
+                                Grid.Row="0"
                                 VerticalAlignment="Center"
                                 DockPanel.Dock="Left"
-                                IsHitTestVisible="False"
+                                IsEnabled="False"
                                 Style="{DynamicResource ItemTitleStyle}"
                                 Text="{Binding Result.Title}"
-                                ToolTip="{Binding ShowTitleToolTip}">
+                                TextTrimming="CharacterEllipsis"
+                                ToolTip="{Binding ShowTitleToolTip}"
+                                ToolTipService.ShowOnDisabled="True">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.Title" />
@@ -151,11 +177,12 @@
                             <TextBlock
                                 x:Name="SubTitle"
                                 Grid.Row="1"
-                                IsHitTestVisible="False"
+                                IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"
                                 Text="{Binding Result.SubTitle}"
-                                ToolTip="{Binding ShowSubTitleToolTip}" />
-
+                                TextTrimming="CharacterEllipsis"
+                                ToolTip="{Binding ShowSubTitleToolTip}"
+                                ToolTipService.ShowOnDisabled="True" />
                         </Grid>
 
                     </Grid>
@@ -164,10 +191,12 @@
             <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
+                    <Setter TargetName="Bullet" Property="Style" Value="{DynamicResource ItemBulletSelectedStyle}" />
                     <Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
                     <Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
                     <Setter TargetName="Hotkey" Property="Style" Value="{DynamicResource ItemHotkeySelectedStyle}" />
                     <Setter TargetName="ImageIcon" Property="Style" Value="{DynamicResource ItemImageSelectedStyle}" />
+                    <Setter TargetName="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
@@ -186,8 +215,10 @@
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
                         <Border
                             x:Name="Bd"
+                            Margin="{DynamicResource ItemMargin}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
+                            CornerRadius="{DynamicResource ItemRadius}"
                             SnapsToDevicePixels="True">
                             <ContentPresenter
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

Flow.Launcher/ResultListBox.xaml.cs

@@ -17,6 +17,36 @@ namespace Flow.Launcher
             InitializeComponent();
         }
 
+        public static readonly DependencyProperty RightClickResultCommandProperty =
+            DependencyProperty.Register("RightClickResultCommand", typeof(ICommand), typeof(ResultListBox), new UIPropertyMetadata(null));
+
+        public ICommand RightClickResultCommand
+        {
+            get
+            {
+                return (ICommand)GetValue(RightClickResultCommandProperty);
+            }
+            set
+            {
+                SetValue(RightClickResultCommandProperty, value);
+            }
+        }
+
+        public static readonly DependencyProperty LeftClickResultCommandProperty =
+            DependencyProperty.Register("LeftClickResultCommand", typeof(ICommand), typeof(ResultListBox), new UIPropertyMetadata(null));
+
+        public ICommand LeftClickResultCommand
+        {
+            get
+            {
+                return (ICommand)GetValue(LeftClickResultCommandProperty);
+            }
+            set
+            {
+                SetValue(LeftClickResultCommandProperty, value);
+            }
+        }
+
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.AddedItems.Count > 0 && e.AddedItems[0] != null)
@@ -98,10 +128,24 @@ namespace Flow.Launcher
                 path
             });
             DragDrop.DoDragDrop((DependencyObject)sender, data, DragDropEffects.Move | DragDropEffects.Copy);
-            
+
             App.API.ChangeQuery(query, true);
-            
+
             e.Handled = true;
         }
+        private void ResultListBox_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (Mouse.DirectlyOver is not FrameworkElement { DataContext: ResultViewModel result })
+                return;
+
+            RightClickResultCommand?.Execute(result.Result);
+        }
+        private void ResultListBox_OnPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (Mouse.DirectlyOver is not FrameworkElement { DataContext: ResultViewModel result })
+                return;
+
+            LeftClickResultCommand?.Execute(null);
+        }
     }
 }

Flow.Launcher/SettingWindow.xaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="Flow.Launcher.SettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -42,7 +42,7 @@
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <converters:TextConverter x:Key="TextConverter" />
-        <converters:TranlationConverter x:Key="TranlationConverter" />
+        <converters:TranlationConverter x:Key="TranslationConverter" />
         <CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}">
             <CollectionViewSource.SortDescriptions>
                 <scm:SortDescription PropertyName="Source" />
@@ -1815,13 +1815,26 @@
                                                     </Grid.RowDefinitions>
                                                     <Border Grid.Row="0">
                                                         <TextBox
+                                                            x:Name="QueryTextBox"
                                                             IsReadOnly="True"
                                                             Style="{DynamicResource QueryBoxStyle}"
                                                             Text="{DynamicResource hiThere}" />
                                                     </Border>
-                                                    <StackPanel x:Name="ClockPanel" Style="{DynamicResource ClockPanel}">
-                                                        <TextBlock x:Name="DateBox" Style="{DynamicResource DateBox}" />
-                                                        <TextBlock x:Name="ClockBox" Style="{DynamicResource ClockBox}" />
+                                                    <StackPanel
+                                                        x:Name="ClockPanel"
+                                                        IsHitTestVisible="False"
+                                                        Style="{DynamicResource ClockPanel}"
+                                                        Visibility="Visible">
+                                                        <TextBlock
+                                                            x:Name="ClockBox"
+                                                            Style="{DynamicResource ClockBox}"
+                                                            Text="{Binding ClockText}"
+                                                            Visibility="{Binding Settings.UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                        <TextBlock
+                                                            x:Name="DateBox"
+                                                            Style="{DynamicResource DateBox}"
+                                                            Text="{Binding DateText}"
+                                                            Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                     </StackPanel>
                                                     <Canvas Style="{DynamicResource SearchIconPosition}">
                                                         <Path
@@ -1999,8 +2012,8 @@
                                             Margin="10"
                                             HorizontalAlignment="Right"
                                             DockPanel.Dock="Top">
-                                            <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                                <Run Text="{DynamicResource howToCreateTheme}" />
+                                            <Hyperlink NavigateUri="{Binding ThemeGallery, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{DynamicResource browserMoreThemes}" />
                                             </Hyperlink>
                                         </TextBlock>
                                     </Border>
@@ -2162,6 +2175,12 @@
                                                             Grid.Row="0"
                                                             Grid.Column="2"
                                                             Orientation="Horizontal">
+                                                            <TextBlock
+                                                                Margin="0,0,10,0"
+                                                                VerticalAlignment="Center"
+                                                                FontSize="14"
+                                                                Foreground="{DynamicResource Color04B}"
+                                                                Text="{Binding ClockText}" />
                                                             <ComboBox
                                                                 x:Name="TimeFormat"
                                                                 Grid.Column="2"
@@ -2170,14 +2189,12 @@
                                                                 VerticalAlignment="Center"
                                                                 FontSize="14"
                                                                 ItemsSource="{Binding TimeFormatList}"
-                                                                SelectedValue="{Binding Settings.TimeFormat}"
-                                                                SelectionChanged="PreviewClockAndDate" />
+                                                                SelectedItem="{Binding TimeFormat}" />
                                                             <ui:ToggleSwitch
                                                                 IsOn="{Binding UseClock, Mode=TwoWay}"
                                                                 OffContent="{DynamicResource disable}"
                                                                 OnContent="{DynamicResource enable}"
-                                                                Style="{DynamicResource SideToggleSwitch}"
-                                                                Toggled="PreviewClockAndDate" />
+                                                                Style="{DynamicResource SideToggleSwitch}" />
                                                         </StackPanel>
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xec92;
@@ -2200,6 +2217,12 @@
                                                             Grid.Row="0"
                                                             Grid.Column="2"
                                                             Orientation="Horizontal">
+                                                            <TextBlock
+                                                                Margin="0,0,10,0"
+                                                                VerticalAlignment="Center"
+                                                                FontSize="14"
+                                                                Foreground="{DynamicResource Color04B}"
+                                                                Text="{Binding DateText}" />
                                                             <ComboBox
                                                                 x:Name="DateFormat"
                                                                 Grid.Column="2"
@@ -2208,14 +2231,12 @@
                                                                 VerticalAlignment="Center"
                                                                 FontSize="14"
                                                                 ItemsSource="{Binding DateFormatList}"
-                                                                SelectedValue="{Binding Settings.DateFormat}"
-                                                                SelectionChanged="PreviewClockAndDate" />
+                                                                SelectedItem="{Binding DateFormat}" />
                                                             <ui:ToggleSwitch
                                                                 IsOn="{Binding UseDate, Mode=TwoWay}"
                                                                 OffContent="{DynamicResource disable}"
                                                                 OnContent="{DynamicResource enable}"
-                                                                Style="{DynamicResource SideToggleSwitch}"
-                                                                Toggled="PreviewClockAndDate" />
+                                                                Style="{DynamicResource SideToggleSwitch}" />
                                                         </StackPanel>
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xe787;
@@ -2302,7 +2323,7 @@
                                             </ItemsControl>
                                         </Border>
 
-                                        <Border Margin="0,0,0,18" Style="{DynamicResource SettingGroupBox}">
+                                        <Border Margin="0,0,0,0" Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
@@ -2320,6 +2341,16 @@
                                                 </TextBlock>
                                             </ItemsControl>
                                         </Border>
+                                        <Border>
+                                            <TextBlock
+                                                Margin="10,10,10,18"
+                                                HorizontalAlignment="Right"
+                                                DockPanel.Dock="Top">
+                                                <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                    <Run Text="{DynamicResource howToCreateTheme}" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                        </Border>
                                     </StackPanel>
                                 </StackPanel>
                             </Grid>
@@ -2594,7 +2625,7 @@
                                             <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
                                                 <GridViewColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" />
+                                                        <TextBlock Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
                                                     </DataTemplate>
                                                 </GridViewColumn.CellTemplate>
                                             </GridViewColumn>
@@ -2827,13 +2858,29 @@
                                                 Text="{Binding Version}" />
                                             <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource version}" />
                                         </StackPanel>
-                                        <Button
-                                            Grid.Column="1"
-                                            Margin="0,0,-14,0"
-                                            HorizontalAlignment="Right"
-                                            Click="OnCheckUpdates"
-                                            Content="{DynamicResource checkUpdates}"
-                                            Style="{StaticResource AccentButtonStyle}" />
+                                        <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                            <Button
+                                                Margin="0,0,10,0"
+                                                HorizontalAlignment="Right"
+                                                Click="OnCheckUpdates"
+                                                Content="{DynamicResource checkUpdates}" />
+                                            <Button
+                                                Margin="0,0,14,0"
+                                                Padding="0"
+                                                HorizontalAlignment="Right"
+                                                Style="{StaticResource AccentButtonStyle}">
+                                                <Hyperlink
+                                                    NavigateUri="{Binding SponsorPage, Mode=OneWay}"
+                                                    RequestNavigate="OnRequestNavigate"
+                                                    TextDecorations="None">
+                                                    <TextBlock
+                                                        Padding="10,5,10,5"
+                                                        Foreground="White"
+                                                        Text="{DynamicResource BecomeASponsor}" />
+                                                </Hyperlink>
+                                            </Button>
+
+                                        </StackPanel>
                                         <TextBlock Style="{StaticResource Glyph}">
                                             &#xe946;
                                         </TextBlock>

Flow.Launcher/SettingWindow.xaml.cs

@@ -10,17 +10,16 @@ using Flow.Launcher.ViewModel;
 using ModernWpf;
 using ModernWpf.Controls;
 using System;
-using System.Drawing.Printing;
+using System.Diagnostics;
 using System.IO;
+using System.Security.Policy;
 using System.Windows;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Navigation;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 using Button = System.Windows.Controls.Button;
 using Control = System.Windows.Controls.Control;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
@@ -44,6 +43,7 @@ namespace Flow.Launcher
             API = api;
             InitializePosition();
             InitializeComponent();
+
         }
 
         #region General
@@ -64,7 +64,6 @@ namespace Flow.Launcher
             pluginStoreView.Filter = PluginStoreFilter;
 
             InitializePosition();
-            ClockDisplay();
         }
 
         private void OnSelectPythonDirectoryClick(object sender, RoutedEventArgs e)
@@ -514,34 +513,6 @@ namespace Flow.Launcher
             }
         }
 
-        private void PreviewClockAndDate(object sender, RoutedEventArgs e)
-        {
-            ClockDisplay();
-        }
-
-        public void ClockDisplay()
-        {
-            if (settings.UseClock)
-            {
-                ClockBox.Visibility = Visibility.Visible;
-                ClockBox.Text = DateTime.Now.ToString(settings.TimeFormat);
-            }
-            else
-            {
-                ClockBox.Visibility = Visibility.Collapsed;
-            }
-
-            if (settings.UseDate)
-            {
-                DateBox.Visibility = Visibility.Visible;
-                DateBox.Text = DateTime.Now.ToString(settings.DateFormat);
-            }
-            else
-            {
-                DateBox.Visibility = Visibility.Collapsed;
-            }
-        }
-
         public void InitializePosition()
         {
             if (settings.SettingWindowTop >= 0 && settings.SettingWindowLeft >= 0)
@@ -556,6 +527,7 @@ namespace Flow.Launcher
             }
             WindowState = settings.SettingWindowState;
         }
+
         public double WindowLeft()
         {
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);

Flow.Launcher/Themes/Base.xaml

@@ -3,18 +3,32 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
-    
+    <CornerRadius x:Key="ItemRadius">0</CornerRadius>
+    <Thickness x:Key="ItemMargin">0</Thickness>
+    <Thickness x:Key="ResultMargin">0</Thickness>
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
+
+    <Style x:Key="BaseBulletStyle" TargetType="{x:Type Border}" />
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}" />
+    <Style
+        x:Key="ItemBulletSelectedStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}" />
+
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
         <Setter Property="Margin" Value="16,7,0,7" />
         <Setter Property="Padding" Value="0,4,68,0" />
-        <Setter Property="Background" Value="#2F2F2F" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
@@ -48,6 +62,13 @@
     </Style>
 
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
+    <Style x:Key="BaseQueryBoxBgStyle" TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="0,2,0,0" />
+    </Style>
+    <Style
+        x:Key="QueryBoxBgStyle"
+        BasedOn="{StaticResource BaseQueryBoxBgStyle}"
+        TargetType="{x:Type Border}" />
     <Style
         x:Key="BaseQuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
@@ -66,6 +87,8 @@
         <Setter Property="Background" Value="#2F2F2F" />
         <Setter Property="Padding" Value="0,0,0,0" />
         <Setter Property="CornerRadius" Value="5" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
         <Setter Property="Width" Value="600" />
@@ -79,29 +102,39 @@
         <Setter Property="Stroke" Value="Blue" />
     </Style>
 
-    <Style x:Key="BaseClockPosition" TargetType="{x:Type Canvas}" />
+    <Style x:Key="BaseClockPanelPosition" TargetType="{x:Type Canvas}" />
 
     <Style x:Key="BaseClockPanel" TargetType="{x:Type StackPanel}">
         <Setter Property="Orientation" Value="Horizontal" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Height" Value="Auto" />
-        <Setter Property="Margin" Value="0,0,14,0" />
+        <Setter Property="Margin" Value="0,0,66,0" />
         <Setter Property="Visibility" Value="Collapsed" />
     </Style>
     <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="22" />
+        <Setter Property="FontSize" Value="20" />
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,2,0" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
+                <Setter Property="FontSize" Value="14" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
     <Style x:Key="BaseDateBox" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontSize" Value="18" />
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,10,0" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
+                <Setter Property="FontSize" Value="14" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style
@@ -120,8 +153,8 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource BaseClockPanel}"
         TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,66,0" />
-        <Setter Property="Visibility" Value="Visible" />
+        <Setter Property="Orientation" Value="Vertical" />
+        <Setter Property="Visibility" Value="Collapsed" />
         <Style.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
@@ -129,30 +162,19 @@
                     <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
                     <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
                 </MultiDataTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" />
                 <MultiDataTrigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
                             <DoubleAnimation
                                 Storyboard.TargetProperty="Opacity"
                                 From="0.0"
-                                To="1.0"
-                                Duration="0:0:0.2" />
+                                To="1"
+                                Duration="0:0:0.25" />
                         </Storyboard>
                     </BeginStoryboard>
                 </MultiDataTrigger.EnterActions>
-                <MultiDataTrigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetProperty="Opacity"
-                                To="0.0"
-                                Duration="0:0:0.2" />
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiDataTrigger.ExitActions>
-
             </MultiDataTrigger>
-
         </Style.Triggers>
 
     </Style>
@@ -197,6 +219,14 @@
         <Setter Property="Height" Value="25" />
         <Setter Property="FontSize" Value="25" />
     </Style>
+    <Style x:Key="BaseGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
@@ -368,6 +398,12 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
+    <Style
+        x:Key="ClockPanelPosition"
+        BasedOn="{StaticResource BaseClockPanelPosition}"
+        TargetType="{x:Type Canvas}">
+        <Setter Property="Margin" Value="0,2,66,0" />
+    </Style>
     <Style
         x:Key="ItemHotkeyStyle"
         BasedOn="{StaticResource BaseItemHotkeyStyle}"
@@ -384,4 +420,15 @@
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="Opacity" Value="0.5" />
     </Style>
+    <Style
+        x:Key="ItemGlyphSelectedStyle"
+        BasedOn="{StaticResource BaseGlyphSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+
 </ResourceDictionary>

Flow.Launcher/Themes/BlackAndWhite.xaml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="ItemGlyph"  BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#000000" />
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#000000" />
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
-        <Setter Property="CornerRadius" Value="4" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#494949" />
-        <Setter Property="Background" Value="#000000" />
-    </Style>
-    <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" />
-    <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="White" />
-    </Style>
-    <Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#FFFFF8" />
-    </Style>
-    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#FFFFF8" />
-    </Style>
-    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#494949</SolidColorBrush>
-    <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}" />
-    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" />
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.FontWeight" Value="Bold" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#b2b2b2" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#b2b2b2" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/BlurBlack Darker.xaml

@@ -71,7 +71,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
@@ -85,7 +84,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style

Flow.Launcher/Themes/BlurBlack.xaml

@@ -68,7 +68,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
@@ -81,7 +80,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style

Flow.Launcher/Themes/BlurWhite.xaml

@@ -65,7 +65,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FF000000" />
     </Style>
     <Style
@@ -78,7 +77,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ff000000" />
     </Style>
     <Style

Flow.Launcher/Themes/Bullet Light.xaml

@@ -0,0 +1,184 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="42" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style
+        x:Key="ItemBulletSelectedStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="42" />
+        <Setter Property="CornerRadius" Value="2" />
+        <Setter Property="Background" Value="#8897ea" />
+    </Style>
+    <Style
+        x:Key="ItemGlyph"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#2b2b2e" />
+        <Setter Property="Margin" Value="-4,0,0,0" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Foreground" Value="#999aa3" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
+    </Style>
+
+    <Style
+        x:Key="QuerySuggestionBoxStyle"
+        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#d9d9d9" />
+    </Style>
+
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#e2e2e2" />
+        <Setter Property="Background" Value="#fffeff" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+    </Style>
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}" />
+    <Style
+        x:Key="PendingLineStyle"
+        BasedOn="{StaticResource BasePendingLineStyle}"
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#2b2b2e" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#949394" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#f6f5f9" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+    <Style x:Key="HighlightStyle" />
+    <Style
+        x:Key="ItemTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#2b2b2e" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#949394" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#f1f1f1</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
+    <Style
+        x:Key="ThumbStyle"
+        BasedOn="{StaticResource BaseThumbStyle}"
+        TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        Background="#d9d9d9"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        DockPanel.Dock="Right" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="ScrollBarStyle"
+        BasedOn="{StaticResource BaseScrollBarStyle}"
+        TargetType="{x:Type ScrollBar}" />
+    <Style
+        x:Key="SearchIconStyle"
+        BasedOn="{StaticResource BaseSearchIconStyle}"
+        TargetType="{x:Type Path}">
+        <Setter Property="Fill" Value="#d9d9d9" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="#fffeff" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#87888b" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#87888b" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#808dd5" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">5</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
+    </Style>
+    <Style
+        x:Key="ClockBox"
+        BasedOn="{StaticResource BaseClockBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c1c1c1" />
+    </Style>
+    <Style
+        x:Key="DateBox"
+        BasedOn="{StaticResource BaseDateBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c1c1c1" />
+    </Style>
+</ResourceDictionary>

Flow.Launcher/Themes/Circle Light.xaml

@@ -1,7 +1,8 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -9,48 +10,43 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9fb2bf" />
+        <Setter Property="Foreground" Value="#9da1aa" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#515a6b" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="#282c34" />
-        <Setter Property="Foreground" Value="#61afef" />
-        <Setter Property="CaretBrush" Value="#ffb86c" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
+        <Setter Property="Foreground" Value="#999aa3" />
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
     </Style>
+
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#282c34" />
-        <Setter Property="Foreground" Value="#454e61" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#d9d9d9" />
     </Style>
+
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="#44475a" />
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background" Value="#282c34" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#e2e2e2" />
+        <Setter Property="Background" Value="White" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
         x:Key="WindowStyle"
         BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
+        TargetType="{x:Type Window}" />
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
@@ -61,71 +57,47 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9fb2bf" />
+        <Setter Property="Foreground" Value="#3d434a" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6272a4 " />
-        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#9da1aa" />
     </Style>
     <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6272a4" />
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#f6f6f6" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
     </Style>
+    <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#e5c07b" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#c678dd" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2c313c</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#e06c75 " />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#6272a4" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#56b6c2" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5046e5</SolidColorBrush>
+
     <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
         TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Width" Value="2" />
-        <Setter Property="Focusable" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#b4b5b7"
+                        Background="#a0a8b5"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -138,33 +110,57 @@
         x:Key="ScrollBarStyle"
         BasedOn="{StaticResource BaseScrollBarStyle}"
         TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#495162" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
-    </Style>
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#495162" />
+        <Setter Property="Fill" Value="#9da1aa" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="White" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.8" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#9da1aa" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">8</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#495162" />
+        <Setter Property="Foreground" Value="#999aa3" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#495162" />
+        <Setter Property="Foreground" Value="#999aa3" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/Circle System.xaml

@@ -0,0 +1,167 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:m="http://schemas.modernwpf.com/2019"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="ItemGlyph"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#9da1aa" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
+    </Style>
+
+    <Style
+        x:Key="QuerySuggestionBoxStyle"
+        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseMediumLowBrush}" />
+    </Style>
+
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
+        <Setter Property="Background" Value="{m:DynamicColor SystemControlBackgroundChromeMediumLowBrush}" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+    </Style>
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}" />
+    <Style
+        x:Key="PendingLineStyle"
+        BasedOn="{StaticResource BasePendingLineStyle}"
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseMediumBrush}" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="{m:DynamicColor SystemControlPageBackgroundListLowBrush}" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+    <Style x:Key="HighlightStyle" />
+    <Style
+        x:Key="ItemTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor SystemAccentColorLight1}" />
+
+    <!--  button style in the middle of the scrollbar  -->
+    <Style
+        x:Key="ThumbStyle"
+        BasedOn="{StaticResource BaseThumbStyle}"
+        TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        Background="#a0a8b5"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        DockPanel.Dock="Right" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="ScrollBarStyle"
+        BasedOn="{StaticResource BaseScrollBarStyle}"
+        TargetType="{x:Type ScrollBar}" />
+    <Style
+        x:Key="SearchIconStyle"
+        BasedOn="{StaticResource BaseSearchIconStyle}"
+        TargetType="{x:Type Path}">
+        <Setter Property="Fill" Value="#9da1aa" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#9da1aa" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">8</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
+    </Style>
+    <Style
+        x:Key="ClockBox"
+        BasedOn="{StaticResource BaseClockBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#999aa3" />
+    </Style>
+    <Style
+        x:Key="DateBox"
+        BasedOn="{StaticResource BaseDateBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#999aa3" />
+    </Style>
+</ResourceDictionary>

Flow.Launcher/Themes/Cyan Dark.xaml

@@ -0,0 +1,186 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="50" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style
+        x:Key="ItemBulletSelectedStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="50" />
+        <Setter Property="Background" Value="#58c2b4" />
+    </Style>
+
+    <Style
+        x:Key="ItemGlyph"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#bbc1c3" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="CaretBrush" Value="#336766" />
+        <Setter Property="Foreground" Value="#e7e9eb" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
+    </Style>
+
+    <Style
+        x:Key="QuerySuggestionBoxStyle"
+        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#768084" />
+    </Style>
+
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#09181e" />
+        <Setter Property="Background" Value="#0f1f26" />
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+    </Style>
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}" />
+    <Style
+        x:Key="PendingLineStyle"
+        BasedOn="{StaticResource BasePendingLineStyle}"
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#eff2f2" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#768084" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#1e292f" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,4" />
+    </Style>
+    <Style x:Key="HighlightStyle" />
+    <Style
+        x:Key="ItemTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#eff2f2" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#768084" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#1e292f</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
+    <Style
+        x:Key="ThumbStyle"
+        BasedOn="{StaticResource BaseThumbStyle}"
+        TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        Background="#768084"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        DockPanel.Dock="Right" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="ScrollBarStyle"
+        BasedOn="{StaticResource BaseScrollBarStyle}"
+        TargetType="{x:Type ScrollBar}" />
+    <Style
+        x:Key="SearchIconStyle"
+        BasedOn="{StaticResource BaseSearchIconStyle}"
+        TargetType="{x:Type Path}">
+        <Setter Property="Fill" Value="#57c0b2" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="#0f1f26" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#9da1aa" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#58c2b4" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">0</CornerRadius>
+    <Thickness x:Key="ItemMargin">0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
+    </Style>
+    <Style
+        x:Key="ClockBox"
+        BasedOn="{StaticResource BaseClockBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#57c0b2" />
+    </Style>
+    <Style
+        x:Key="DateBox"
+        BasedOn="{StaticResource BaseDateBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#57c0b2" />
+    </Style>
+</ResourceDictionary>

Flow.Launcher/Themes/Darker Glass.xaml

@@ -24,7 +24,8 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="Transparent" />
+        <Setter Property="Foreground" Value="#ebebeb" />
+        <Setter Property="Opacity" Value="0.2" />
     </Style>
 
     <Style
@@ -62,7 +63,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ebebeb" />
     </Style>
     <Style
@@ -75,7 +75,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
@@ -131,12 +130,10 @@
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#787878" />
-        <Setter Property="Opacity" Value="0.1" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#787878" />
-        <Setter Property="Opacity" Value="0.1" />
     </Style>
     <Style
         x:Key="ClockBox"

Flow.Launcher/Themes/Darker.xaml

@@ -1,97 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#6e6e6e" />
-        <Setter Property="SelectionBrush" Value="#4D4D4D" />
-    </Style>
-
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}" />
-
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}" />
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4d4d4d</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}" />
-
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6e6e6e" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6e6e6e" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Discord Dark.xaml

@@ -16,7 +16,6 @@
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#dcddde" />
-        <Setter Property="Background" Value="#36393f" />
         <Setter Property="CaretBrush" Value="#ffffff" />
         <Setter Property="SelectionBrush" Value="#0a68d8" />
         <Setter Property="Height" Value="42" />

Flow.Launcher/Themes/Dracula.xaml

@@ -17,7 +17,6 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="SelectionBrush" Value="#ff79c6" />
         <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="#282a36" />
         <Setter Property="Foreground" Value="#f8f8f2" />
         <Setter Property="CaretBrush" Value="#ffb86c" />
         <Setter Property="FontSize" Value="26" />

Flow.Launcher/Themes/Gray.xaml

@@ -1,36 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="LightGray" />
-        <Setter Property="Foreground" Value="#222222" />
-    </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="#c6c8cb" />
+        <Setter Property="Margin" Value="-4,0,0,0" />
     </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Foreground" Value="#eeeff0" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Height" Value="42" />
+    </Style>
+
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="LightGray" />
-        <Setter Property="Foreground" Value="#b8b8b8" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="42" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Foreground" Value="#7e838d" />
     </Style>
 
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="LightGray" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Background" Value="LightGray" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#747881" />
+        <Setter Property="Background" Value="#686d77" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
         x:Key="WindowStyle"
@@ -40,40 +50,46 @@
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
         TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
     <Style
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#333333" />
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#9ea1a7" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#747881" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="White" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="Silver" />
-        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#787878</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#797d86</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
@@ -82,7 +98,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#eeeeee"
+                        Background="#848890"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -91,39 +107,61 @@
             </Setter.Value>
         </Setter>
     </Style>
-
     <Style
         x:Key="ScrollBarStyle"
         BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}">
-        <Setter Property="Width" Value="3" />
-    </Style>
+        TargetType="{x:Type ScrollBar}" />
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#a4a4a4" />
+        <Setter Property="Fill" Value="#c7c9cc" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="#686d77" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
+
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#a3a3a3" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#9ea1a7" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#a3a3a3" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#eeeff0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">0</CornerRadius>
+    <Thickness x:Key="ItemMargin">0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/League.xaml

@@ -9,7 +9,6 @@
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#161614" />
         <Setter Property="Foreground" Value="#b88f3a" />
         <Setter Property="CaretBrush" Value="#b88f3a" />
         <Setter Property="Padding" Value="0,0,66,0" />
@@ -52,6 +51,14 @@
         TargetType="{x:Type Line}">
         <Setter Property="Stroke" Value="#32EC32" />
     </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#785a28" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+    </Style>
     <Style
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"

Flow.Launcher/Themes/Light.xaml

@@ -1,73 +0,0 @@
-<ResourceDictionary  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml"></ResourceDictionary>
-    </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="ItemGlyph"  BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="White "/>
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="FontSize" Value="22" />
-    </Style>
-
-    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="White"/>
-        <Setter Property="Foreground" Value="#d9d9d9" />
-        <Setter Property="FontSize" Value="22" />
-    </Style>
-
-    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="LightGray" />
-        <Setter Property="BorderThickness" Value="1"></Setter>
-        <Setter Property="Background" Value="White"></Setter>
-    </Style>
-    <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
-    </Style>
-    <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" >
-    </Style>
-
-    <!-- Item Style -->
-    <Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}" >
-        <Setter Property="Foreground" Value="#000000"></Setter>
-    </Style>
-    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
-        <Setter Property="Foreground"  Value="#A8A8A8"></Setter>
-    </Style>
-    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#d9d9d9</SolidColorBrush>
-
-    <!-- button style in the middle of the scrollbar -->
-    <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#C3C3C3" BorderBrush="Transparent" BorderThickness="0" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
-    </Style>
-    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
-        <Setter Property="Fill" Value="#d9d9d9" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#a3a3a3" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#a3a3a3" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Metro Server.xaml

@@ -1,113 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#FFFFFF" />
-        <Setter Property="Background" Value="#001e4e" />
-        <Setter Property="Padding" Value="0,0,18,0" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#344c71" />
-        <Setter Property="Background" Value="#001e4e" />
-        <Setter Property="Padding" Value="0,0,18,0" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="#001e4e" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A5A5A5" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A5A5A5" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#04152E</SolidColorBrush>
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}" />
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#1d427d" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style
-        x:Key="ClockPanel"
-        BasedOn="{StaticResource BaseClockPanel}"
-        TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,22,0" />
-        <Setter Property="Visibility" Value="Visible" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Midnight.xaml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -7,33 +10,38 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Foreground" Value="#6a7181" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#4c566a" />
-        <Setter Property="Foreground" Value="#eceff4" />
-        <Setter Property="FontSize" Value="25" />
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Foreground" Value="#fbfdff" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
     </Style>
 
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#4c566a" />
-        <Setter Property="Foreground" Value="#eceff4" />
-        <Setter Property="FontSize" Value="25" />
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#253041" />
     </Style>
 
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#2e3440" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="#4c566a" />
+        <Setter Property="BorderBrush" Value="#111828" />
+        <Setter Property="Background" Value="#111828" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
         x:Key="WindowStyle"
@@ -42,41 +50,45 @@
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="White" />
-    </Style>
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
     <Style
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#e5e9f0" />
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#798090" />
+        <Setter Property="Foreground" Value="#6a7181" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#798090" />
+        <Setter Property="Foreground" Value="#5f6673" />
     </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#202938" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+    <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#FFFFFF" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9498A0" />
+        <Setter Property="Foreground" Value="#5f6673" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#596479</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#202938</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
@@ -85,7 +97,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#2e3440"
+                        Background="#202938"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -97,35 +109,58 @@
     <Style
         x:Key="ScrollBarStyle"
         BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}">
-        <Setter Property="Width" Value="3" />
-    </Style>
+        TargetType="{x:Type ScrollBar}" />
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#687693" />
+        <Setter Property="Fill" Value="#202938" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="#111828" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
+
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#687693" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#5f6673" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#687693" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#5f6673" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">8</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8394B6" />
+        <Setter Property="Foreground" Value="#5f6673" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8394B6" />
+        <Setter Property="Foreground" Value="#5f6673" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/Nord Darker.xaml

@@ -13,7 +13,6 @@
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#2e3440" />
         <Setter Property="Foreground" Value="#eceff4" />
         <Setter Property="FontSize" Value="30" />
     </Style>

Flow.Launcher/Themes/Pink.xaml

@@ -12,7 +12,6 @@
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#1f1d1f" />
         <Setter Property="Foreground" Value="#cc1081" />
         <Setter Property="CaretBrush" Value="#cc1081" />
         <Setter Property="SelectionBrush" Value="#e564b1" />
@@ -123,6 +122,7 @@
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
+        <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="#71114b" />
     </Style>
 </ResourceDictionary>

Flow.Launcher/Themes/Sublime.xaml

@@ -16,7 +16,6 @@
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="#303840" />
         <Setter Property="Foreground" Value="#d2d8e5" />
         <Setter Property="CaretBrush" Value="#FFAA47" />
         <Setter Property="FontSize" Value="26" />

Flow.Launcher/Themes/Ubuntu.xaml

@@ -0,0 +1,191 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="50" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style
+        x:Key="ItemBulletSelectedStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="50" />
+        <Setter Property="Background" Value="#fa7941" />
+    </Style>
+    <Style
+        x:Key="ItemGlyph"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c2c2c2" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="CaretBrush" Value="#fa7941" />
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
+    </Style>
+
+    <Style
+        x:Key="QuerySuggestionBoxStyle"
+        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#949394" />
+    </Style>
+
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="BorderBrush" Value="#e2e2e2" />
+        <Setter Property="Background">
+            <Setter.Value>
+                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                    <GradientStop Offset="0.0" Color="#383838" />
+                    <GradientStop Offset="0.9" Color="#2e2e2e" />
+                    <GradientStop Offset="1.0" Color="#2e2e2e" />
+                </LinearGradientBrush>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+    </Style>
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}" />
+    <Style
+        x:Key="PendingLineStyle"
+        BasedOn="{StaticResource BasePendingLineStyle}"
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c2c2c2" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#7e7e7e" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#3b3b3b" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+    <Style x:Key="HighlightStyle" />
+    <Style
+        x:Key="ItemTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#949394" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4d4d4d</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
+    <Style
+        x:Key="ThumbStyle"
+        BasedOn="{StaticResource BaseThumbStyle}"
+        TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        Background="#262626"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        DockPanel.Dock="Right" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="ScrollBarStyle"
+        BasedOn="{StaticResource BaseScrollBarStyle}"
+        TargetType="{x:Type ScrollBar}" />
+    <Style
+        x:Key="SearchIconStyle"
+        BasedOn="{StaticResource BaseSearchIconStyle}"
+        TargetType="{x:Type Path}">
+        <Setter Property="Fill" Value="#c2c2c2" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#7e7e7e" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#c2c2c2" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#fa7941" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">0</CornerRadius>
+    <Thickness x:Key="ItemMargin">0 0 0 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
+    </Style>
+    <Style
+        x:Key="ClockBox"
+        BasedOn="{StaticResource BaseClockBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c2c2c2" />
+    </Style>
+    <Style
+        x:Key="DateBox"
+        BasedOn="{StaticResource BaseDateBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#c2c2c2" />
+    </Style>
+</ResourceDictionary>

Flow.Launcher/Themes/Win10Light.xaml

@@ -18,11 +18,9 @@
         <Setter Property="SelectionBrush" Value="#0a68d8" />
         <Setter Property="FontSize" Value="24" />
         <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="Background" Value="#dddddd" />
         <Setter Property="CaretBrush" Value="#000000" />
         <Setter Property="BorderBrush" Value="Black" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="28" />
         <Setter Property="Height" Value="42" />
         <Setter Property="Padding" Value="0,4,66,0" />
     </Style>
@@ -32,7 +30,7 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#dddddd" />
         <Setter Property="Foreground" Value="#c6c6c6" />
-        <Setter Property="FontSize" Value="28" />
+        <Setter Property="FontSize" Value="24" />
         <Setter Property="Padding" Value="0,4,66,0" />
         <Setter Property="Height" Value="42" />
     </Style>
@@ -159,12 +157,12 @@
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#b2b2b2" />
+        <Setter Property="Foreground" Value="#818181" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#b2b2b2" />
+        <Setter Property="Foreground" Value="#818181" />
     </Style>
 </ResourceDictionary>

Flow.Launcher/Themes/Win11Dark.xaml

@@ -17,7 +17,6 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="SelectionBrush" Value="#4a5459" />
         <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="#202020" />
         <Setter Property="Foreground" Value="#FFFFFF" />
         <Setter Property="CaretBrush" Value="#FFFFFF" />
         <Setter Property="FontSize" Value="26" />

Flow.Launcher/Themes/Win11Light.xaml

@@ -11,6 +11,12 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#000000" />
     </Style>
+    <Style
+        x:Key="ItemGlyphSelectedStyle"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#000000" />
+    </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
@@ -89,14 +95,12 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="Foreground" Value="#000000" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="Foreground" Value="#72767d" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
@@ -169,6 +173,7 @@
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="FontSize" Value="22" />
     </Style>
     <Style
         x:Key="DateBox"

Flow.Launcher/Themes/Win11System.xaml

@@ -12,13 +12,18 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
+    <Style
+        x:Key="ItemGlyphSelectedStyle"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
         <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="{DynamicResource Color01B}" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
         <Setter Property="FontSize" Value="26" />

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -23,6 +23,7 @@ using ISavable = Flow.Launcher.Plugin.ISavable;
 using System.IO;
 using System.Collections.Specialized;
 using CommunityToolkit.Mvvm.Input;
+using System.Globalization;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -64,9 +65,10 @@ namespace Flow.Launcher.ViewModel
             Settings = settings;
             Settings.PropertyChanged += (_, args) =>
             {
-                if (args.PropertyName == nameof(Settings.WindowSize))
-                {
-                    OnPropertyChanged(nameof(MainWindowWidth));
+                switch (args.PropertyName) {
+                    case nameof(Settings.WindowSize):
+                        OnPropertyChanged(nameof(MainWindowWidth));
+                        break;
                 }
             };
 
@@ -77,12 +79,21 @@ namespace Flow.Launcher.ViewModel
             _userSelectedRecord = _userSelectedRecordStorage.Load();
             _topMostRecord = _topMostRecordStorage.Load();
 
-            ContextMenu = new ResultsViewModel(Settings);
-            Results = new ResultsViewModel(Settings);
-            History = new ResultsViewModel(Settings);
+
+            ContextMenu = new ResultsViewModel(Settings)
+            {
+                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+            };
+            Results = new ResultsViewModel(Settings)
+            {
+                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+            };
+            History = new ResultsViewModel(Settings)
+            {
+                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+            };
             _selectedResults = Results;
 
-            InitializeKeyCommands();
 
             RegisterViewUpdate();
             RegisterResultsUpdatedEvent();
@@ -157,165 +168,164 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-
-
-        private void InitializeKeyCommands()
+        [RelayCommand]
+        private async Task ReloadPluginDataAsync()
         {
-            EscCommand = new RelayCommand(_ =>
+            Hide();
+
+            await PluginManager.ReloadDataAsync().ConfigureAwait(false);
+            Notification.Show(InternationalizationManager.Instance.GetTranslation("success"), InternationalizationManager.Instance.GetTranslation("completedSuccessfully"));
+        }
+        [RelayCommand]
+        private void LoadHistory()
+        {
+            if (SelectedIsFromQueryResults())
             {
-                if (!SelectedIsFromQueryResults())
-                {
-                    SelectedResults = Results;
-                }
-                else
-                {
-                    Hide();
-                }
-            });
-
-            ClearQueryCommand = new RelayCommand(_ =>
+                SelectedResults = History;
+                History.SelectedIndex = _history.Items.Count - 1;
+            }
+            else
             {
-                if (!string.IsNullOrEmpty(QueryText))
-                {
-                    ChangeQueryText(string.Empty);
-
-                    // Push Event to UI SystemQuery has changed
-                    //OnPropertyChanged(nameof(SystemQueryText));
-                }
-            });
-
-            SelectNextItemCommand = new RelayCommand(_ => { SelectedResults.SelectNextResult(); });
-
-            SelectPrevItemCommand = new RelayCommand(_ => { SelectedResults.SelectPrevResult(); });
-
-            SelectNextPageCommand = new RelayCommand(_ => { SelectedResults.SelectNextPage(); });
-
-            SelectPrevPageCommand = new RelayCommand(_ => { SelectedResults.SelectPrevPage(); });
-
-            SelectFirstResultCommand = new RelayCommand(_ => SelectedResults.SelectFirstResult());
-
-            StartHelpCommand = new RelayCommand(_ =>
+                SelectedResults = Results;
+            }
+        }
+        [RelayCommand]
+        private void LoadContextMenu()
+        {
+            if (SelectedIsFromQueryResults())
             {
-                PluginManager.API.OpenUrl("https://github.com/Flow-Launcher/Flow.Launcher/wiki/Flow-Launcher/");
-            });
-            OpenSettingCommand = new RelayCommand(_ => { App.API.OpenSettingDialog(); });
-            OpenResultCommand = new RelayCommand(async index =>
+                // When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
+                // i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
+                if (SelectedResults.SelectedItem != null)
+                    SelectedResults = ContextMenu;
+            }
+            else
             {
-                var results = SelectedResults;
+                SelectedResults = Results;
+            }
+        }
+        [RelayCommand]
+        private void Backspace(object index)
+        {
+            var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
 
-                if (index != null)
+            // GetPreviousExistingDirectory does not require trailing '\', otherwise will return empty string
+            var path = FilesFolders.GetPreviousExistingDirectory((_) => true, query.Search.TrimEnd('\\'));
+
+            var actionKeyword = string.IsNullOrEmpty(query.ActionKeyword) ? string.Empty : $"{query.ActionKeyword} ";
+
+            ChangeQueryText($"{actionKeyword}{path}");
+        }
+        [RelayCommand]
+        private void AutocompleteQuery()
+        {
+            var result = SelectedResults.SelectedItem?.Result;
+            if (result != null && SelectedIsFromQueryResults()) // SelectedItem returns null if selection is empty.
+            {
+                var autoCompleteText = result.Title;
+
+                if (!string.IsNullOrEmpty(result.AutoCompleteText))
                 {
-                    results.SelectedIndex = int.Parse(index.ToString()!);
+                    autoCompleteText = result.AutoCompleteText;
+                }
+                else if (!string.IsNullOrEmpty(SelectedResults.SelectedItem?.QuerySuggestionText))
+                {
+                    autoCompleteText = SelectedResults.SelectedItem.QuerySuggestionText;
                 }
 
-                var result = results.SelectedItem?.Result;
-                if (result == null)
+                var specialKeyState = GlobalHotkey.CheckModifiers();
+                if (specialKeyState.ShiftPressed)
                 {
-                    return;
+                    autoCompleteText = result.SubTitle;
                 }
-                var hideWindow = await result.ExecuteAsync(new ActionContext
+
+                ChangeQueryText(autoCompleteText);
+            }
+        }
+        [RelayCommand]
+        private async Task OpenResultAsync(string index)
+        {
+            var results = SelectedResults;
+            if (index is not null)
+            {
+                results.SelectedIndex = int.Parse(index);
+            }
+            var result = results.SelectedItem?.Result;
+            if (result == null)
+            {
+                return;
+            }
+            var hideWindow = await result.ExecuteAsync(new ActionContext
                 {
                     SpecialKeyState = GlobalHotkey.CheckModifiers()
-                }).ConfigureAwait(false);
+                })
+                .ConfigureAwait(false);
 
-                if (hideWindow)
-                {
-                    Hide();
-                }
-
-                if (SelectedIsFromQueryResults())
-                {
-                    _userSelectedRecord.Add(result);
-                    _history.Add(result.OriginQuery.RawQuery);
-                }
-                else
-                {
-                    SelectedResults = Results;
-                }
-            });
-
-            AutocompleteQueryCommand = new RelayCommand(_ =>
-            {
-                var result = SelectedResults.SelectedItem?.Result;
-                if (result != null && SelectedIsFromQueryResults()) // SelectedItem returns null if selection is empty.
-                {
-                    var autoCompleteText = result.Title;
-
-                    if (!string.IsNullOrEmpty(result.AutoCompleteText))
-                    {
-                        autoCompleteText = result.AutoCompleteText;
-                    }
-                    else if (!string.IsNullOrEmpty(SelectedResults.SelectedItem?.QuerySuggestionText))
-                    {
-                        autoCompleteText = SelectedResults.SelectedItem.QuerySuggestionText;
-                    }
-
-                    var specialKeyState = GlobalHotkey.CheckModifiers();
-                    if (specialKeyState.ShiftPressed)
-                    {
-                        autoCompleteText = result.SubTitle;
-                    }
-
-                    ChangeQueryText(autoCompleteText);
-                }
-            });
-
-            BackspaceCommand = new RelayCommand(index =>
-            {
-                var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
-
-                // GetPreviousExistingDirectory does not require trailing '\', otherwise will return empty string
-                var path = FilesFolders.GetPreviousExistingDirectory((_) => true, query.Search.TrimEnd('\\'));
-
-                var actionKeyword = string.IsNullOrEmpty(query.ActionKeyword) ? string.Empty : $"{query.ActionKeyword} ";
-
-                ChangeQueryText($"{actionKeyword}{path}");
-            });
-
-            LoadContextMenuCommand = new RelayCommand(_ =>
-            {
-                if (SelectedIsFromQueryResults())
-                {
-                    // When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
-                    // i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
-                    if (SelectedResults.SelectedItem != null)
-                        SelectedResults = ContextMenu;
-                }
-                else
-                {
-                    SelectedResults = Results;
-                }
-            });
-
-            LoadHistoryCommand = new RelayCommand(_ =>
-            {
-                if (SelectedIsFromQueryResults())
-                {
-                    SelectedResults = History;
-                    History.SelectedIndex = _history.Items.Count - 1;
-                }
-                else
-                {
-                    SelectedResults = Results;
-                }
-            });
-
-            ReloadPluginDataCommand = new RelayCommand(_ =>
+            if (hideWindow)
             {
                 Hide();
+            }
 
-                _ = PluginManager
-                    .ReloadDataAsync()
-                    .ContinueWith(_ =>
-                        Application.Current.Dispatcher.Invoke(() =>
-                        {
-                            Notification.Show(
-                                InternationalizationManager.Instance.GetTranslation("success"),
-                                InternationalizationManager.Instance.GetTranslation("completedSuccessfully")
-                            );
-                        }), TaskScheduler.Default)
-                    .ConfigureAwait(false);
-            });
+            if (SelectedIsFromQueryResults())
+            {
+                _userSelectedRecord.Add(result);
+                _history.Add(result.OriginQuery.RawQuery);
+            }
+            else
+            {
+                SelectedResults = Results;
+            }
+        }
+        [RelayCommand]
+        private void OpenSetting()
+        {
+            App.API.OpenSettingDialog();
+        }
+
+        [RelayCommand]
+        private void SelectHelp()
+        {
+            PluginManager.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
+        }
+
+        [RelayCommand]
+        private void SelectFirstResult()
+        {
+            SelectedResults.SelectFirstResult();
+        }
+        [RelayCommand]
+        private void SelectPrevPage()
+        {
+            SelectedResults.SelectPrevPage();
+        }
+
+        [RelayCommand]
+        private void SelectNextPage()
+        {
+            SelectedResults.SelectNextPage();
+        }
+        [RelayCommand]
+        private void SelectPrevItem()
+        {
+            SelectedResults.SelectPrevResult();
+        }
+        [RelayCommand]
+        private void SelectNextItem()
+        {
+            SelectedResults.SelectNextResult();
+        }
+
+        [RelayCommand]
+        private void Esc()
+        {
+            if (!SelectedIsFromQueryResults())
+            {
+                SelectedResults = Results;
+            }
+            else
+            {
+                Hide();
+            }
         }
 
         #endregion
@@ -323,8 +333,9 @@ namespace Flow.Launcher.ViewModel
         #region ViewModel Properties
 
         public Settings Settings { get; }
-        public object ClockText { get; private set; }
+        public string ClockText { get; private set; }
         public string DateText { get; private set; }
+        public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
 
         private async Task RegisterClockAndDateUpdateAsync()
         {
@@ -333,11 +344,12 @@ namespace Flow.Launcher.ViewModel
             while (await timer.WaitForNextTickAsync().ConfigureAwait(false))
             {
                 if (Settings.UseClock)
-                    ClockText = DateTime.Now.ToString(Settings.TimeFormat);
+                    ClockText = DateTime.Now.ToString(Settings.TimeFormat, Culture);
                 if (Settings.UseDate)
-                    DateText = DateTime.Now.ToString(Settings.DateFormat);
+                    DateText = DateTime.Now.ToString(Settings.DateFormat, Culture);
             }
         }
+
         public ResultsViewModel Results { get; private set; }
 
         public ResultsViewModel ContextMenu { get; private set; }
@@ -363,9 +375,9 @@ namespace Flow.Launcher.ViewModel
         {
             if (MainWindowWidth + 100 > 1920 || Settings.WindowSize == 1920)
             {
-                Settings.WindowSize = 1920;        
+                Settings.WindowSize = 1920;
             }
-            else 
+            else
             {
                 Settings.WindowSize += 100;
                 Settings.WindowLeft -= 50;
@@ -411,6 +423,7 @@ namespace Flow.Launcher.ViewModel
         /// but we don't want to move cursor to end when query is updated from TextBox
         /// </summary>
         /// <param name="queryText"></param>
+        /// <param name="reQuery">Force query even when Query Text doesn't change</param>
         public void ChangeQueryText(string queryText, bool reQuery = false)
         {
             if (QueryText != queryText)
@@ -489,25 +502,6 @@ namespace Flow.Launcher.ViewModel
 
         public string PluginIconPath { get; set; } = null;
 
-        public ICommand EscCommand { get; set; }
-        public ICommand BackspaceCommand { get; set; }
-        public ICommand SelectNextItemCommand { get; set; }
-        public ICommand SelectPrevItemCommand { get; set; }
-        public ICommand SelectNextPageCommand { get; set; }
-        public ICommand SelectPrevPageCommand { get; set; }
-        public ICommand SelectFirstResultCommand { get; set; }
-        public ICommand StartHelpCommand { get; set; }
-        public ICommand LoadContextMenuCommand { get; set; }
-        public ICommand LoadHistoryCommand { get; set; }
-        public ICommand OpenResultCommand { get; set; }
-        public ICommand OpenSettingCommand { get; set; }
-        public ICommand ReloadPluginDataCommand { get; set; }
-        public ICommand ClearQueryCommand { get; private set; }
-
-        public ICommand CopyToClipboard { get; set; }
-
-        public ICommand AutocompleteQueryCommand { get; set; }
-
         public string OpenResultCommandModifiers { get; private set; }
 
         public string Image => Constant.QueryTextBoxIconImagePath;
@@ -648,7 +642,7 @@ namespace Flow.Launcher.ViewModel
 
             if (currentCancellationToken.IsCancellationRequested)
                 return;
-            
+
 
             // handle the exclusiveness of plugin using action keyword
             RemoveOldQueryResults(query);

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Media;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Infrastructure.Image;
@@ -24,7 +25,23 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        public ImageSource Image => ImageLoader.Load(PluginPair.Metadata.IcoPath);
+
+        private async void LoadIconAsync()
+        {
+            Image = await ImageLoader.LoadAsync(PluginPair.Metadata.IcoPath);
+        }
+
+        public ImageSource Image
+        {
+            get
+            {
+                if (_image == ImageLoader.DefaultImage)
+                    LoadIconAsync();
+
+                return _image;
+            }
+            set => _image = value;
+        }
         public bool PluginState
         {
             get => !PluginPair.Metadata.Disabled;
@@ -50,6 +67,7 @@ namespace Flow.Launcher.ViewModel
                         ? new Control() 
                         : settingProvider.CreateSettingPanel() 
                 : null;
+        private ImageSource _image = ImageLoader.DefaultImage;
 
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";

Flow.Launcher/ViewModel/ResultViewModel.cs

@@ -15,7 +15,7 @@ namespace Flow.Launcher.ViewModel
     public class ResultViewModel : BaseModel
     {
         private static PrivateFontCollection fontCollection = new();
-        private static Dictionary<string, string> fonts = new(); 
+        private static Dictionary<string, string> fonts = new();
 
         public ResultViewModel(Result result, Settings settings)
         {
@@ -145,7 +145,7 @@ namespace Flow.Launcher.ViewModel
 
         public GlyphInfo Glyph { get; set; }
 
-        private async ValueTask LoadImageAsync()
+        private async Task LoadImageAsync()
         {
             var imagePath = Result.IcoPath;
             if (string.IsNullOrEmpty(imagePath) && Result.Icon != null)
@@ -168,12 +168,12 @@ namespace Flow.Launcher.ViewModel
             if (ImageLoader.CacheContainImage(imagePath))
             {
                 // will get here either when icoPath has value\icon delegate is null\when had exception in delegate
-                image = ImageLoader.Load(imagePath, loadFullImage);
+                image = await ImageLoader.LoadAsync(imagePath, loadFullImage);
                 return;
             }
 
             // We need to modify the property not field here to trigger the OnPropertyChanged event
-            Image = await Task.Run(() => ImageLoader.Load(imagePath, loadFullImage)).ConfigureAwait(false);
+            Image = await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
         }
 
         public Result Result { get; }

Flow.Launcher/ViewModel/ResultsViewModel.cs

@@ -8,6 +8,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Input;
+using JetBrains.Annotations;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -49,6 +51,9 @@ namespace Flow.Launcher.ViewModel
         public ResultViewModel SelectedItem { get; set; }
         public Thickness Margin { get; set; }
         public Visibility Visbility { get; set; } = Visibility.Collapsed;
+        
+        public ICommand RightClickResultCommand { get; init; }
+        public ICommand LeftClickResultCommand { get; init; }
 
         #endregion
 
@@ -166,12 +171,10 @@ namespace Flow.Launcher.ViewModel
             switch (Visbility)
             {
                 case Visibility.Collapsed when Results.Count > 0:
-                    Margin = new Thickness { Top = 0 };
                     SelectedIndex = 0;
                     Visbility = Visibility.Visible;
                     break;
                 case Visibility.Visible when Results.Count == 0:
-                    Margin = new Thickness { Top = 0 };
                     Visbility = Visibility.Collapsed;
                     break;
             }

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -21,6 +21,7 @@ using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.Input;
+using System.Globalization;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -46,8 +47,21 @@ namespace Flow.Launcher.ViewModel
                     case nameof(Settings.WindowSize):
                         OnPropertyChanged(nameof(WindowWidthSize));
                         break;
+                    case nameof(Settings.UseDate):
+                    case nameof(Settings.DateFormat):
+                        OnPropertyChanged(nameof(DateText));
+                        break;
+                    case nameof(Settings.UseClock):
+                    case nameof(Settings.TimeFormat):
+                        OnPropertyChanged(nameof(ClockText));
+                        break;
+                    case nameof(Settings.Language):
+                        OnPropertyChanged(nameof(ClockText));
+                        OnPropertyChanged(nameof(DateText));
+                        break;
                 }
             };
+
         }
 
         public Settings Settings { get; set; }
@@ -56,7 +70,7 @@ namespace Flow.Launcher.ViewModel
         {
             await _updater.UpdateAppAsync(App.API, false);
         }
-        
+
         public bool AutoUpdates
         {
             get => Settings.AutoUpdates;
@@ -71,6 +85,8 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
+
         public bool StartFlowLauncherOnSystemStartup
         {
             get => Settings.StartFlowLauncherOnSystemStartup;
@@ -157,7 +173,10 @@ namespace Flow.Launcher.ViewModel
             {
                 var key = $"LastQuery{e}";
                 var display = _translater.GetTranslation(key);
-                var m = new LastQueryMode { Display = display, Value = e, };
+                var m = new LastQueryMode
+                {
+                    Display = display, Value = e,
+                };
                 modes.Add(m);
             }
             return modes;
@@ -302,11 +321,11 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        private  IList<PluginStoreItemViewModel> LabelMaker(IList<UserPlugin> list)
+        private IList<PluginStoreItemViewModel> LabelMaker(IList<UserPlugin> list)
         {
-            return list.Select(p=>new PluginStoreItemViewModel(p))
+            return list.Select(p => new PluginStoreItemViewModel(p))
                 .OrderByDescending(p => p.Category == PluginStoreItemViewModel.NewRelease)
-                .ThenByDescending(p=>p.Category == PluginStoreItemViewModel.RecentlyUpdated)
+                .ThenByDescending(p => p.Category == PluginStoreItemViewModel.RecentlyUpdated)
                 .ThenByDescending(p => p.Category == PluginStoreItemViewModel.None)
                 .ThenByDescending(p => p.Category == PluginStoreItemViewModel.Installed)
                 .ToList();
@@ -340,20 +359,20 @@ namespace Flow.Launcher.ViewModel
 
         internal void DisplayPluginQuery(string queryToDisplay, PluginPair plugin, int actionKeywordPosition = 0)
         {
-            var actionKeyword = plugin.Metadata.ActionKeywords.Count == 0 
-                ? string.Empty 
+            var actionKeyword = plugin.Metadata.ActionKeywords.Count == 0
+                ? string.Empty
                 : plugin.Metadata.ActionKeywords[actionKeywordPosition];
-            
+
             App.API.ChangeQuery($"{actionKeyword} {queryToDisplay}");
             App.API.ShowMainWindow();
         }
 
-
         #endregion
 
         #region theme
 
         public static string Theme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";
+        public static string ThemeGallery => @"https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438";
 
         public string SelectedTheme
         {
@@ -413,8 +432,7 @@ namespace Flow.Launcher.ViewModel
                     var display = _translater.GetTranslation(key);
                     var m = new ColorScheme
                     {
-                        Display = display,
-                        Value = e,
+                        Display = display, Value = e,
                     };
                     modes.Add(m);
                 }
@@ -422,8 +440,6 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-
-
         public class SearchWindowPosition
         {
             public string Display { get; set; }
@@ -440,32 +456,62 @@ namespace Flow.Launcher.ViewModel
                 {
                     var key = $"SearchWindowPosition{e}";
                     var display = _translater.GetTranslation(key);
-                    var m = new SearchWindowPosition { Display = display, Value = e, };
+                    var m = new SearchWindowPosition
+                    {
+                        Display = display, Value = e,
+                    };
                     modes.Add(m);
                 }
                 return modes;
             }
         }
 
-        public List<string> TimeFormatList { get; set; } = new List<string>()
+        public List<string> TimeFormatList { get; } = new()
         {
+            "h:mm",
             "hh:mm",
+            "H:mm",
             "HH:mm",
+            "tt h:mm",
             "tt hh:mm",
+            "h:mm tt",
             "hh:mm tt"
         };
 
-        public List<string> DateFormatList { get; set; } = new List<string>()
+        public List<string> DateFormatList { get; } = new()
         {
             "MM'/'dd dddd",
             "MM'/'dd ddd",
             "MM'/'dd",
+            "MM'-'dd",
+            "MMMM', 'dd",
             "dd'/'MM",
+            "dd'-'MM",
             "ddd MM'/'dd",
             "dddd MM'/'dd",
-            "dddd"
+            "dddd",
+            "ddd dd'/'MM",
+            "dddd dd'/'MM",
+            "dddd dd', 'MMMM",
+            "dd', 'MMMM"
         };
 
+        public string TimeFormat
+        {
+            get => Settings.TimeFormat;
+            set => Settings.TimeFormat = value;
+        }
+
+        public string DateFormat
+        {
+            get => Settings.DateFormat;
+            set => Settings.DateFormat = value;
+        }
+
+        public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);
+
+        public string DateText => DateTime.Now.ToString(DateFormat, Culture);
+
         public double WindowWidthSize
         {
             get => Settings.WindowSize;
@@ -707,7 +753,7 @@ namespace Flow.Launcher.ViewModel
 
             string deleteWarning = string.Format(
                 InternationalizationManager.Instance.GetTranslation("deleteCustomShortcutWarning"),
-                    item?.Key, item?.Value);
+                item.Key, item.Value);
             if (MessageBox.Show(deleteWarning, InternationalizationManager.Instance.GetTranslation("delete"),
                     MessageBoxButton.YesNo) == MessageBoxResult.Yes)
             {
@@ -754,6 +800,7 @@ namespace Flow.Launcher.ViewModel
         #region about
 
         public string Website => Constant.Website;
+        public string SponsorPage => Constant.SponsorPage;
         public string ReleaseNotes => _updater.GitHubRepository + @"/releases/latest";
         public string Documentation => Constant.Documentation;
         public string Docs => Constant.Docs;
@@ -773,34 +820,37 @@ namespace Flow.Launcher.ViewModel
             }
         }
         public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
-        
+
         public string CheckLogFolder
         {
-            get 
+            get
             {
                 var dirInfo = new DirectoryInfo(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
                 long size = dirInfo.EnumerateFiles("*", SearchOption.AllDirectories).Sum(file => file.Length);
-                
-                return _translater.GetTranslation("clearlogfolder") + " (" + FormatBytes(size) + ")" ;
+
+                return _translater.GetTranslation("clearlogfolder") + " (" + FormatBytes(size) + ")";
             }
         }
 
         internal void ClearLogFolder()
         {
             var directory = new DirectoryInfo(
-                                        Path.Combine(
-                                            DataLocation.DataDirectory(),
-                                            Constant.Logs,
-                                            Constant.Version));
+                Path.Combine(
+                    DataLocation.DataDirectory(),
+                    Constant.Logs,
+                    Constant.Version));
 
             directory.EnumerateFiles()
-                     .ToList()
-                     .ForEach(x => x.Delete());
+                .ToList()
+                .ForEach(x => x.Delete());
         }
         internal string FormatBytes(long bytes)
         {
             const int scale = 1024;
-            string[] orders = new string[] { "GB", "MB", "KB", "Bytes" };
+            string[] orders = new string[]
+            {
+                "GB", "MB", "KB", "Bytes"
+            };
             long max = (long)Math.Pow(scale, orders.Length - 1);
 
             foreach (string order in orders)
@@ -812,6 +862,7 @@ namespace Flow.Launcher.ViewModel
             }
             return "0 Bytes";
         }
+
         #endregion
     }
 }

Plugins/Flow.Launcher.Plugin.Calculator/Main.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -61,7 +61,7 @@ namespace Flow.Launcher.Plugin.Caculator
                 switch (_settings.DecimalSeparator)
                 {
                     case DecimalSeparator.Comma:
-                    case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
+                    case DecimalSeparator.UseSystemLocale when CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
                         expression = query.Search.Replace(",", ".");
                         break;
                     default:
@@ -157,7 +157,7 @@ namespace Flow.Launcher.Plugin.Caculator
 
         private string GetDecimalSeparator()
         {
-            string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            string systemDecimalSeperator = CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator;
             switch (_settings.DecimalSeparator)
             {
                 case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;

Plugins/Flow.Launcher.Plugin.Program/Programs/ShellLinkHelper.cs

@@ -97,8 +97,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
         }
 
         // To initialize the app description
-        public String description = String.Empty;
-
+        public string description = string.Empty;
+        public string arguments = string.Empty;
 
         // Retrieve the target path using Shell Link
         public string retrieveTargetPath(string path)
@@ -122,13 +122,16 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 buffer = new StringBuilder(MAX_PATH);
                 ((IShellLinkW)link).GetDescription(buffer, MAX_PATH);
                 description = buffer.ToString();
+
+                buffer.Clear();
+                ((IShellLinkW)link).GetArguments(buffer, MAX_PATH);
+                arguments = buffer.ToString();
             }
             
             // To release unmanaged memory
             Marshal.ReleaseComObject(link);
 
             return target;
-
         }
     }
-}
+}

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -26,18 +26,17 @@ namespace Flow.Launcher.Plugin.Program.Programs
         public string UniqueIdentifier { get => _uid; set => _uid = value == null ? string.Empty : value.ToLowerInvariant(); }  // For path comparison
         public string IcoPath { get; set; }
         /// <summary>
-        /// Path of the file. It's the path of .lnk or .url for .lnk and .url.
+        /// Path of the file. It's the path of .lnk and .url for .lnk and .url files.
         /// </summary>
         public string FullPath { get; set; }
         /// <summary>
-        /// Path of the excutable for .lnk, or the URL for .url.
+        /// Path of the excutable for .lnk, or the URL for .url. Arguments are included if any.
         /// </summary>
         public string LnkResolvedPath { get; set; }
         /// <summary>
         /// Path of the actual executable file.
         /// </summary>
         public string ExecutablePath => LnkResolvedPath ?? FullPath;
-        public string WorkingDir => Directory.GetParent(ExecutablePath)?.FullName ?? string.Empty;
         public string ParentDirectory { get; set; }
         public string ExecutableName { get; set; }
         public string Description { get; set; }
@@ -140,8 +139,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                     var info = new ProcessStartInfo
                     {
-                        FileName = ExecutablePath,
-                        WorkingDirectory = WorkingDir,
+                        FileName = FullPath,
+                        WorkingDirectory = ParentDirectory,
                         UseShellExecute = true,
                         Verb = runAsAdmin ? "runas" : null
                     };
@@ -167,8 +166,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     {
                         var info = new ProcessStartInfo
                         {
-                            FileName = ExecutablePath,
-                            WorkingDirectory = WorkingDir,
+                            FileName = FullPath,
+                            WorkingDirectory = ParentDirectory,
                             UseShellExecute = true
                         };
 
@@ -186,8 +185,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     {
                         var info = new ProcessStartInfo
                         {
-                            FileName = ExecutablePath,
-                            WorkingDirectory = WorkingDir,
+                            FileName = FullPath,
+                            WorkingDirectory = ParentDirectory,
                             Verb = "runas",
                             UseShellExecute = true
                         };
@@ -221,8 +220,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
             return Name;
         }
 
-        public static List<FileSystemWatcher> Watchers = new List<FileSystemWatcher>();
-
+        private static List<FileSystemWatcher> Watchers = new List<FileSystemWatcher>();
 
         private static Win32 Win32Program(string path)
         {
@@ -277,6 +275,12 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         program.LnkResolvedPath = Path.GetFullPath(target);
                         program.ExecutableName = Path.GetFileName(target);
 
+                        var args = _helper.arguments;
+                        if(!string.IsNullOrEmpty(args))
+                        {
+                            program.LnkResolvedPath += " " + args;
+                        }
+
                         var description = _helper.description;
                         if (!string.IsNullOrEmpty(description))
                         {
@@ -573,6 +577,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
         private static IEnumerable<Win32> ProgramsHasher(IEnumerable<Win32> programs)
         {
+            // TODO: Unable to distinguish multiple lnks to the same excutable but with different params
             return programs.GroupBy(p => p.ExecutablePath.ToLowerInvariant())
                 .AsParallel()
                 .SelectMany(g =>

Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs

@@ -30,7 +30,7 @@ namespace Flow.Launcher.Plugin.WebSearch
             Initilize(sources, context, Action.Add);
         }
 
-        private void Initilize(IList<SearchSource> sources, PluginInitContext context, Action action)
+        private async void Initilize(IList<SearchSource> sources, PluginInitContext context, Action action)
         {
             InitializeComponent();
             DataContext = _viewModel;
@@ -42,7 +42,7 @@ namespace Flow.Launcher.Plugin.WebSearch
 
             _viewModel.SetupCustomImagesDirectory();
 
-            imgPreviewIcon.Source = _viewModel.LoadPreviewIcon(_searchSource.IconPath);
+            imgPreviewIcon.Source = await _viewModel.LoadPreviewIconAsync(_searchSource.IconPath);
         }
 
         private void OnCancelButtonClick(object sender, RoutedEventArgs e)
@@ -125,7 +125,7 @@ namespace Flow.Launcher.Plugin.WebSearch
             }
         }
 
-        private void OnSelectIconClick(object sender, RoutedEventArgs e)
+        private async void OnSelectIconClick(object sender, RoutedEventArgs e)
         {
             const string filter = "Image files (*.jpg, *.jpeg, *.gif, *.png, *.bmp) |*.jpg; *.jpeg; *.gif; *.png; *.bmp";
             var dialog = new OpenFileDialog {InitialDirectory = Main.CustomImagesDirectory, Filter = filter};
@@ -140,7 +140,7 @@ namespace Flow.Launcher.Plugin.WebSearch
                     if (_viewModel.ShouldProvideHint(selectedNewIconImageFullPath))
                         MessageBox.Show(_api.GetTranslation("flowlauncher_plugin_websearch_iconpath_hint"));
                     
-                    imgPreviewIcon.Source = _viewModel.LoadPreviewIcon(selectedNewIconImageFullPath);
+                    imgPreviewIcon.Source = await _viewModel.LoadPreviewIconAsync(selectedNewIconImageFullPath);
                 }
             }
         }
@@ -151,4 +151,4 @@ namespace Flow.Launcher.Plugin.WebSearch
         Add,
         Edit
     }
-}
+}

Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceViewModel.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Drawing;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
@@ -57,9 +58,9 @@ namespace Flow.Launcher.Plugin.WebSearch
             return Directory.GetParent(fullPathToSelectedImage).ToString() == Main.DefaultImagesDirectory;
         }
 
-        internal ImageSource LoadPreviewIcon(string pathToPreviewIconImage)
+        internal async ValueTask<ImageSource> LoadPreviewIconAsync(string pathToPreviewIconImage)
         {
-            return ImageLoader.Load(pathToPreviewIconImage);
+            return await ImageLoader.LoadAsync(pathToPreviewIconImage);
         }
     }
 }

Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs

@@ -21,8 +21,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
             try
             {
                 const string api = "https://api.bing.com/qsonhs.aspx?q=";
-                
-                using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
+
+                await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
 
                 using var json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token));
                 var root = json.RootElement.GetProperty("AS");
@@ -31,16 +31,16 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
                     return new List<string>();
 
                 return root.GetProperty("Results")
-                           .EnumerateArray()
-                           .SelectMany(r => r.GetProperty("Suggests")
-                                             .EnumerateArray()
-                                             .Select(s => s.GetProperty("Txt").GetString()))
-                           .ToList();
+                    .EnumerateArray()
+                    .SelectMany(r => r.GetProperty("Suggests")
+                        .EnumerateArray()
+                        .Select(s => s.GetProperty("Txt").GetString()))
+                    .ToList();
 
 
 
             }
-            catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
+            catch (Exception e) when (e is HttpRequestException or { InnerException: TimeoutException })
             {
                 Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
@@ -49,7 +49,7 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
             {
                 Log.Exception("|Bing.Suggestions|can't parse suggestions", e);
                 return new List<string>();
-            } 
+            }
         }
 
         public override string ToString()

Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs

@@ -20,13 +20,10 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
             {
                 const string api = "https://www.google.com/complete/search?output=chrome&q=";
 
-                using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query)).ConfigureAwait(false);
+                await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);
 
                 using var json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);
 
-                if (json == null)
-                    return new List<string>();
-
                 var results = json.RootElement.EnumerateArray().ElementAt(1);
 
                 return results.EnumerateArray().Select(o => o.GetString()).ToList();

Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json

@@ -1,6 +1,6 @@
 {
   "ID": "5043CETYU6A748679OPA02D27D99677A",
-  "ActionKeyword": "*",
+  "ActionKeyword": "s",
   "Description": "Search settings inside Control Panel and Settings App",
   "Name": "Windows Settings",
   "Author": "TobiasSekan",