Merge remote-tracking branch 'onesounds/240605-Fix-RightTop-Position' into fork/240605-Fix-RightTop-Position

.cm/gitstream.cm

@@ -0,0 +1,79 @@
+# -*- mode: yaml -*-
+# This example configuration for provides basic automations to get started with gitStream.
+# View the gitStream quickstart for more examples: https://docs.gitstream.cm/examples/
+manifest:
+  version: 1.0
+
+
+automations:
+  # Add a label that indicates how many minutes it will take to review the PR.
+  estimated_time_to_review:
+    if:
+      - true
+    run:
+      - action: add-label@v1
+        args:
+          label: "{{ calc.etr }} min review"
+          color: {{ colors.red if (calc.etr >= 20) else ( colors.yellow if (calc.etr >= 5) else colors.green ) }}
+  # Post a comment that lists the best experts for the files that were modified.
+  explain_code_experts:
+    if:
+      - true
+    run:
+      - action: explain-code-experts@v1
+        args:
+          gt: 10
+  # Post a comment that indicates what percentage of the PR is new code.
+  percent_new_code:
+    if:
+      - true
+    run:
+      - action: add-comment@v1
+        args:
+          comment: |
+            This PR is {{ changes.ratio }}% new code.
+  # Post a comment that request changes for a PR that contains a TODO statement.
+  review_todo_comments:
+    if:
+      - {{ source.diff.files | matchDiffLines(regex=r/^[+].*(TODO)|(todo)/) | some }}
+    run:
+      - action: request-changes@v1
+        args:
+          comment: |
+            This PR contains a TODO statement. Please check to see if they should be removed.
+  # Post a comment that request a before and after screenshot
+  request_screenshot:
+    # Triggered for PRs that lack an image file or link to an image in the PR description
+    if:
+      - {{ not (has.screenshot_link or has.image_uploaded) }}
+    run:
+      - action: add-comment@v1
+        args:
+          comment: |
+            Be a legend :trophy: by adding a before and after screenshot of the changes you made, especially if they are around UI/UX.
+
+
+# +----------------------------------------------------------------------------+
+# | Custom Expressions                                                         |
+# | https://docs.gitstream.cm/how-it-works/#custom-expressions                 |
+# +----------------------------------------------------------------------------+
+
+calc:
+  etr: {{ branch | estimatedReviewTime }}
+
+colors:
+  red: 'b60205'
+  yellow: 'fbca04'
+  green: '0e8a16'
+
+changes:
+  # Sum all the lines added/edited in the PR
+  additions: {{ branch.diff.files_metadata | map(attr='additions') | sum }}
+  # Sum all the line removed in the PR
+  deletions: {{ branch.diff.files_metadata | map(attr='deletions') | sum }}
+  # Calculate the ratio of new code
+  ratio: {{ (changes.additions / (changes.additions + changes.deletions)) * 100 | round(2) }}
+
+has:
+  screenshot_link: {{ pr.description | includes(regex=r/!\[.*\]\(.*(jpg|svg|png|gif|psd).*\)/) }}
+  image_uploaded: {{ pr.description | includes(regex=r/<img.*src.*(jpg|svg|png|gif|psd).*>/) }}

.github/actions/spelling/expect.txt

@@ -98,6 +98,7 @@ Português
 Português (Brasil)
 Italiano
 Slovenský
+quicklook
 Tiếng Việt
 Droplex
 Preinstalled

.github/pr-labeler.yml

@@ -0,0 +1,31 @@
+# The bot always updates the labels, add/remove as necessary [default: false]
+alwaysReplace: false
+# Treats the text and labels as case sensitive [default: true]
+caseSensitive: false
+# Array of labels to be applied to the PR [default: []]
+customLabels:
+  # Finds the `text` within the PR title and body and applies the `label`
+  - text: 'bug'
+    label: 'bug'
+  - text: 'fix'
+    label: 'bug'
+  - text: 'dependabot'
+    label: 'bug'
+  - text: 'New Crowdin updates'
+    label: 'bug'
+  - text: 'New Crowdin updates'
+    label: 'kind/i18n'
+  - text: 'feature'
+    label: 'enhancement'
+  - text: 'add new'
+    label: 'enhancement'
+  - text: 'refactor'
+    label: 'enhancement'
+  - text: 'refactor'
+    label: 'Code Refactor'
+# Search the body of the PR for the `text` [default: true]
+searchBody: true
+# Search the title of the PR for the `text` [default: true]
+searchTitle: true
+# Search for whole words only [default: false]
+wholeWords: false

.github/workflows/gitstream.yml

@@ -0,0 +1,49 @@
+# Code generated by gitStream GitHub app - DO NOT EDIT
+
+name: gitStream workflow automation
+run-name: |
+  /:\ gitStream: PR #${{ fromJSON(fromJSON(github.event.inputs.client_payload)).pullRequestNumber }} from ${{ github.event.inputs.full_repository }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      client_payload:
+        description: The Client payload
+        required: true
+      full_repository:
+        description: the repository name include the owner in `owner/repo_name` format
+        required: true
+      head_ref:
+        description: the head sha
+        required: true
+      base_ref:
+        description: the base ref
+        required: true
+      installation_id:
+        description: the installation id
+        required: false
+      resolver_url:
+        description: the resolver url to pass results to
+        required: true
+      resolver_token:
+        description: Optional resolver token for resolver service
+        required: false
+        default: ''
+
+jobs:
+  gitStream:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    name: gitStream workflow automation
+    steps:
+      - name: Evaluate Rules
+        uses: linear-b/gitstream-github-action@v2
+        id: rules-engine
+        with:
+          full_repository: ${{ github.event.inputs.full_repository }}
+          head_ref: ${{ github.event.inputs.head_ref }}
+          base_ref: ${{ github.event.inputs.base_ref }}
+          client_payload: ${{ github.event.inputs.client_payload }}
+          installation_id: ${{ github.event.inputs.installation_id }}
+          resolver_url: ${{ github.event.inputs.resolver_url }}
+          resolver_token: ${{ github.event.inputs.resolver_token }}

.github/workflows/pr_assignee.yml

@@ -0,0 +1,19 @@
+name: Assign PR to creator
+
+# Due to GitHub token limitation, only able to assign org members not authors from forks.
+# https://github.com/thomaseizinger/assign-pr-creator-action/issues/3
+
+on:
+  pull_request:
+    types: [opened]
+    branches-ignore:
+      - l10n_dev
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Assign PR to creator
+      uses: thomaseizinger/assign-pr-creator-action@v1.0.0
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_milestone.yml

@@ -0,0 +1,19 @@
+name: Set Milestone
+
+# Assigns the earliest created milestone that matches the below glob pattern.
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: set-milestone
+        uses: andrefcdias/add-to-milestone@v1.3.0
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          milestone: "+([0-9]).+([0-9]).+([0-9])"
+          use-expression: true

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -1,4 +1,4 @@
-using Flow.Launcher.Core.ExternalPlugins;
+using Flow.Launcher.Core.ExternalPlugins;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -90,6 +90,48 @@ namespace Flow.Launcher.Core.Plugin
             }).ToArray());
         }
 
+        public static async Task OpenExternalPreviewAsync(string path, bool sendFailToast = true)
+        {
+            await Task.WhenAll(AllPlugins.Select(plugin => plugin.Plugin switch
+            {
+                IAsyncExternalPreview p => p.OpenPreviewAsync(path, sendFailToast),
+                _ => Task.CompletedTask,
+            }).ToArray());
+        }
+
+        public static async Task CloseExternalPreviewAsync()
+        {
+            await Task.WhenAll(AllPlugins.Select(plugin => plugin.Plugin switch
+            {
+                IAsyncExternalPreview p => p.ClosePreviewAsync(),
+                _ => Task.CompletedTask,
+            }).ToArray());
+        }
+
+        public static async Task SwitchExternalPreviewAsync(string path, bool sendFailToast = true)
+        {
+            await Task.WhenAll(AllPlugins.Select(plugin => plugin.Plugin switch
+            {
+                IAsyncExternalPreview p => p.SwitchPreviewAsync(path, sendFailToast),
+                _ => Task.CompletedTask,
+            }).ToArray());
+        }
+
+        public static bool UseExternalPreview()
+        {
+            return GetPluginsForInterface<IAsyncExternalPreview>().Any(x => !x.Metadata.Disabled);
+        }
+
+        public static bool AllowAlwaysPreview()
+        {
+            var plugin = GetPluginsForInterface<IAsyncExternalPreview>().FirstOrDefault(x => !x.Metadata.Disabled);
+
+            if (plugin is null)
+                return false;
+
+            return ((IAsyncExternalPreview)plugin.Plugin).AllowAlwaysPreview();
+        }
+
         static PluginManager()
         {
             // validate user directory

Flow.Launcher.Core/Plugin/ProcessStreamPluginV2.cs

@@ -82,10 +82,10 @@ namespace Flow.Launcher.Core.Plugin
 
         public override async ValueTask DisposeAsync()
         {
+            await base.DisposeAsync();
             ClientProcess.Kill(true);
             await ClientProcess.WaitForExitAsync();
             ClientProcess.Dispose();
-            await base.DisposeAsync();
         }
     }
 }

Flow.Launcher.Core/Resource/Theme.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Xml;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
@@ -17,6 +18,10 @@ namespace Flow.Launcher.Core.Resource
 {
     public class Theme
     {
+        private const string ThemeMetadataNamePrefix = "Name:";
+        private const string ThemeMetadataIsDarkPrefix = "IsDark:";
+        private const string ThemeMetadataHasBlurPrefix = "HasBlur:";
+
         private const int ShadowExtraMargin = 32;
 
         private readonly List<string> _themeDirectories = new List<string>();
@@ -79,14 +84,14 @@ namespace Flow.Launcher.Core.Resource
             {
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
-                
+
                 // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
                 UpdateResourceDictionary(GetResourceDictionary(theme));
-                
+
                 Settings.Theme = theme;
 
-                
+
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
@@ -148,7 +153,7 @@ namespace Flow.Launcher.Core.Resource
         public ResourceDictionary GetResourceDictionary(string theme)
         {
             var dict = GetThemeResourceDictionary(theme);
-            
+
             if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
                 dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
@@ -187,7 +192,7 @@ namespace Flow.Launcher.Core.Resource
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                 Array.ForEach(
-                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
+                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
@@ -219,17 +224,53 @@ namespace Flow.Launcher.Core.Resource
             return  GetResourceDictionary(Settings.Theme);
         }
 
-        public List<string> LoadAvailableThemes()
+        public List<ThemeData> LoadAvailableThemes()
         {
-            List<string> themes = new List<string>();
+            List<ThemeData> themes = new List<ThemeData>();
             foreach (var themeDirectory in _themeDirectories)
             {
-                themes.AddRange(
-                    Directory.GetFiles(themeDirectory)
-                        .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml"))
-                        .ToList());
+                var filePaths = Directory
+                    .GetFiles(themeDirectory)
+                    .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml"))
+                    .Select(GetThemeDataFromPath);
+                themes.AddRange(filePaths);
             }
-            return themes.OrderBy(o => o).ToList();
+
+            return themes.OrderBy(o => o.Name).ToList();
+        }
+
+        private ThemeData GetThemeDataFromPath(string path)
+        {
+            using var reader = XmlReader.Create(path);
+            reader.Read();
+
+            var extensionlessName = Path.GetFileNameWithoutExtension(path);
+
+            if (reader.NodeType is not XmlNodeType.Comment)
+                return new ThemeData(extensionlessName, extensionlessName);
+
+            var commentLines = reader.Value.Trim().Split('\n').Select(v => v.Trim());
+
+            var name = extensionlessName;
+            bool? isDark = null;
+            bool? hasBlur = null;
+            foreach (var line in commentLines)
+            {
+                if (line.StartsWith(ThemeMetadataNamePrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    name = line.Remove(0, ThemeMetadataNamePrefix.Length).Trim();
+                }
+                else if (line.StartsWith(ThemeMetadataIsDarkPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    isDark = bool.Parse(line.Remove(0, ThemeMetadataIsDarkPrefix.Length).Trim());
+                }
+                else if (line.StartsWith(ThemeMetadataHasBlurPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    hasBlur = bool.Parse(line.Remove(0, ThemeMetadataHasBlurPrefix.Length).Trim());
+                }
+            }
+
+            return new ThemeData(extensionlessName, name, isDark, hasBlur);
         }
 
         private string GetThemePath(string themeName)
@@ -407,5 +448,7 @@ namespace Flow.Launcher.Core.Resource
             Marshal.FreeHGlobal(accentPtr);
         }
         #endregion
+
+        public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? HasBlur = null);
     }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -55,7 +55,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                 OnPropertyChanged(nameof(MaxResultsToShow));
             }
         }
-        public bool UseDropShadowEffect { get; set; } = false;
+        public bool UseDropShadowEffect { get; set; } = true;
 
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;
@@ -185,7 +185,9 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         /// when false Alphabet static service will always return empty results
         /// </summary>
         public bool ShouldUsePinyin { get; set; } = false;
+
         public bool AlwaysPreview { get; set; } = false;
+        
         public bool AlwaysStartEn { get; set; } = false;
 
         private SearchPrecisionScore _querySearchPrecision = SearchPrecisionScore.Regular;

Flow.Launcher.Plugin/Interfaces/IAsyncExternalPreview.cs

@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Plugin
+{
+    /// <summary>
+    /// This interface is for plugins that wish to provide file preview (external preview) 
+    /// via a third party app instead of the default preview.
+    /// </summary>
+    public interface IAsyncExternalPreview : IFeatures
+    {
+        /// <summary>
+        /// Method for opening/showing the preview.
+        /// </summary>
+        /// <param name="path">The file path to open the preview for</param>
+        /// <param name="sendFailToast">Whether to send a toast message notification on failure for the user</param>
+        public Task OpenPreviewAsync(string path, bool sendFailToast = true);
+
+        /// <summary>
+        /// Method for closing/hiding the preview.
+        /// </summary>
+        public Task ClosePreviewAsync();
+
+        /// <summary>
+        /// Method for switching the preview to the next file result. 
+        /// This requires the external preview be already open/showing
+        /// </summary>
+        /// <param name="path">The file path to switch the preview for</param>
+        /// <param name="sendFailToast">Whether to send a toast message notification on failure for the user</param>
+        public Task SwitchPreviewAsync(string path, bool sendFailToast = true);
+
+        /// <summary>
+        /// Allows the preview plugin to override the AlwaysPreview setting. Typically useful if plugin's preview does not
+        /// fully work well with being shown together when the query window appears with results.
+        /// When AlwaysPreview setting is on and this is set to false, the preview will not be shown when query 
+        /// window appears with results, instead the internal preview will be shown.
+        /// </summary>
+        /// <returns></returns>
+        public bool AllowAlwaysPreview();
+    }
+}

Flow.Launcher.Plugin/Result.cs

@@ -270,12 +270,12 @@ namespace Flow.Launcher.Plugin
             /// <summary>
             /// Full image used for preview panel
             /// </summary>
-            public string PreviewImagePath { get; set; }
+            public string PreviewImagePath { get; set; } = null;
 
             /// <summary>
             /// Determines if the preview image should occupy the full width of the preview panel.
             /// </summary>
-            public bool IsMedia { get; set; }
+            public bool IsMedia { get; set; } = false;
 
             /// <summary>
             /// Result description text that is shown at the bottom of the preview panel.
@@ -283,12 +283,17 @@ namespace Flow.Launcher.Plugin
             /// <remarks>
             /// When a value is not set, the <see cref="SubTitle"/> will be used.
             /// </remarks>
-            public string Description { get; set; }
+            public string Description { get; set; } = null;
 
             /// <summary>
             /// Delegate to get the preview panel's image
             /// </summary>
-            public IconDelegate PreviewDelegate { get; set; }
+            public IconDelegate PreviewDelegate { get; set; } = null;
+
+            /// <summary>
+            /// File path of the result. For third-party programs providing external preview.
+            /// </summary>
+            public string FilePath { get; set; } = null;
 
             /// <summary>
             /// Default instance of <see cref="PreviewInfo"/>
@@ -299,6 +304,7 @@ namespace Flow.Launcher.Plugin
                 Description = null,
                 IsMedia = false,
                 PreviewDelegate = null,
+                FilePath = null,
             };
         }
     }

Flow.Launcher/App.xaml

@@ -25,7 +25,7 @@
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

Flow.Launcher/Flow.Launcher.csproj

@@ -95,7 +95,6 @@
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="2.1.1" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
-    <PackageReference Include="SharpVectors" Version="1.8.2" />
     <PackageReference Include="VirtualizingWrapPanel" Version="1.5.8" />
   </ItemGroup>
 

Flow.Launcher/Languages/en.xaml

@@ -180,6 +180,8 @@
     <system:String x:Key="AnimationSpeedCustom">Custom</system:String>
     <system:String x:Key="Clock">Clock</system:String>
     <system:String x:Key="Date">Date</system:String>
+    <system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
+    <system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
 
 
     <!--  Setting Hotkey  -->
@@ -204,6 +206,7 @@
     <system:String x:Key="CycleHistoryUpHotkey">Cycle Previous Query</system:String>
     <system:String x:Key="CycleHistoryDownHotkey">Cycle Next Query</system:String>
     <system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
+    <system:String x:Key="OpenNativeContextMenuHotkey">Open Native Context Menu</system:String>
     <system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
     <system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
     <system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
@@ -348,6 +351,9 @@
     <system:String x:Key="commonCancel">Cancel</system:String>
     <system:String x:Key="commonReset">Reset</system:String>
     <system:String x:Key="commonDelete">Delete</system:String>
+    <system:String x:Key="commonOK">OK</system:String>
+    <system:String x:Key="commonYes">Yes</system:String>
+    <system:String x:Key="commonNo">No</system:String>
 
     <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Version</system:String>

Flow.Launcher/MainWindow.xaml

@@ -6,8 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Name="FlowMainWindow"
@@ -380,24 +378,24 @@
                 </ContentControl>
 
             </Grid>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" MinWidth="80" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="0.85*" MinWidth="244" />
-                </Grid.ColumnDefinitions>
-                <StackPanel
-                    x:Name="ResultArea"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="{Binding ResultAreaColumn}">
-                    <Border Style="{DynamicResource WindowRadius}">
-                        <Border.Clip>
-                            <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-                            </MultiBinding>
-                        </Border.Clip>
+            <Border Style="{DynamicResource WindowRadius}">
+                <Border.Clip>
+                    <MultiBinding Converter="{StaticResource BorderClipConverter}">
+                        <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                        <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                        <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
+                    </MultiBinding>
+                </Border.Clip>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" MinWidth="80" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="0.85*" MinWidth="244" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel
+                        x:Name="ResultArea"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="{Binding ResultAreaColumn}">
                         <ContentControl>
                             <flowlauncher:ResultListBox
                                 x:Name="ResultListBox"
@@ -405,15 +403,6 @@
                                 LeftClickResultCommand="{Binding LeftClickResultCommand}"
                                 RightClickResultCommand="{Binding RightClickResultCommand}" />
                         </ContentControl>
-                    </Border>
-                    <Border Style="{DynamicResource WindowRadius}">
-                        <Border.Clip>
-                            <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-                            </MultiBinding>
-                        </Border.Clip>
                         <ContentControl>
                             <flowlauncher:ResultListBox
                                 x:Name="ContextMenu"
@@ -421,15 +410,6 @@
                                 LeftClickResultCommand="{Binding LeftClickResultCommand}"
                                 RightClickResultCommand="{Binding RightClickResultCommand}" />
                         </ContentControl>
-                    </Border>
-                    <Border Style="{DynamicResource WindowRadius}">
-                        <Border.Clip>
-                            <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                                <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-                            </MultiBinding>
-                        </Border.Clip>
                         <ContentControl>
                             <flowlauncher:ResultListBox
                                 x:Name="History"
@@ -437,109 +417,114 @@
                                 LeftClickResultCommand="{Binding LeftClickResultCommand}"
                                 RightClickResultCommand="{Binding RightClickResultCommand}" />
                         </ContentControl>
-                    </Border>
-                </StackPanel>
-                <GridSplitter
-                    Grid.Column="1"
-                    Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}"
-                    Margin="0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Stretch"
-                    Background="Transparent"
-                    ShowsPreview="True" />
-                <Grid
-                    x:Name="Preview"
-                    Grid.Column="2"
-                    VerticalAlignment="Stretch"
-                    Style="{DynamicResource PreviewArea}"
-                    Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
-                    <Border
-                        MinHeight="380"
-                        d:DataContext="{d:DesignInstance vm:ResultViewModel}"
-                        DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
-                        Style="{DynamicResource PreviewBorderStyle}"
-                        Visibility="{Binding ShowDefaultPreview}">
-                        <Grid
-                            Margin="20 0 10 0"
-                            VerticalAlignment="Stretch"
-                            Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid Grid.Row="0" VerticalAlignment="Center">
+                    </StackPanel>
+                    <GridSplitter
+                        Grid.Column="1"
+                        Margin="0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Stretch"
+                        Background="Transparent"
+                        ShowsPreview="True"
+                        Visibility="{Binding InternalPreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <GridSplitter.Template>
+                            <ControlTemplate TargetType="{x:Type GridSplitter}">
+                                <Border Style="{DynamicResource PreviewBorderStyle}" />
+                            </ControlTemplate>
+                        </GridSplitter.Template>
+                    </GridSplitter>
+                    <Grid
+                        x:Name="Preview"
+                        Grid.Column="2"
+                        VerticalAlignment="Stretch"
+                        Style="{DynamicResource PreviewArea}"
+                        Visibility="{Binding InternalPreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <Border
+                            MinHeight="380"
+                            d:DataContext="{d:DesignInstance vm:ResultViewModel}"
+                            DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
+                            Visibility="{Binding ShowDefaultPreview}">
+                            <Grid
+                                Margin="0 0 10 5"
+                                VerticalAlignment="Stretch"
+                                Background="Transparent">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
-                                <TextBlock
-                                    x:Name="PreviewGlyphIcon"
-                                    Grid.Row="0"
-                                    Height="Auto"
-                                    Margin="0 16 0 0"
-                                    FontFamily="{Binding Glyph.FontFamily}"
-                                    Style="{DynamicResource PreviewGlyph}"
-                                    Text="{Binding Glyph.Glyph}"
-                                    Visibility="{Binding ShowGlyph}" />
-                                <Image
-                                    x:Name="PreviewImageIcon"
-                                    Grid.Row="0"
-                                    MaxHeight="320"
-                                    Margin="0 16 0 0"
-                                    HorizontalAlignment="Center"
-                                    Source="{Binding PreviewImage}"
-                                    StretchDirection="DownOnly"
-                                    Visibility="{Binding ShowPreviewImage}">
-                                    <Image.Style>
-                                        <Style TargetType="{x:Type Image}">
-                                            <Setter Property="MaxWidth" Value="96" />
+                                <Grid Grid.Row="0" VerticalAlignment="Center">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock
+                                        x:Name="PreviewGlyphIcon"
+                                        Grid.Row="0"
+                                        Height="Auto"
+                                        Margin="0 16 0 0"
+                                        FontFamily="{Binding Glyph.FontFamily}"
+                                        Style="{DynamicResource PreviewGlyph}"
+                                        Text="{Binding Glyph.Glyph}"
+                                        Visibility="{Binding ShowGlyph}" />
+                                    <Image
+                                        x:Name="PreviewImageIcon"
+                                        Grid.Row="0"
+                                        MaxHeight="320"
+                                        Margin="0 16 0 0"
+                                        HorizontalAlignment="Center"
+                                        Source="{Binding PreviewImage}"
+                                        StretchDirection="DownOnly"
+                                        Visibility="{Binding ShowPreviewImage}">
+                                        <Image.Style>
+                                            <Style TargetType="{x:Type Image}">
+                                                <Setter Property="MaxWidth" Value="96" />
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding UseBigThumbnail}" Value="True">
+                                                        <Setter Property="MaxWidth" Value="{Binding ElementName=Preview, Path=ActualWidth}" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Image.Style>
+                                    </Image>
+                                    <TextBlock
+                                        x:Name="PreviewTitle"
+                                        Grid.Row="1"
+                                        Margin="0 6 0 16"
+                                        HorizontalAlignment="Stretch"
+                                        Style="{DynamicResource PreviewItemTitleStyle}"
+                                        Text="{Binding Result.Title}"
+                                        TextAlignment="Center"
+                                        TextWrapping="Wrap" />
+                                </Grid>
+                                <StackPanel Grid.Row="1">
+                                    <StackPanel.Style>
+                                        <Style TargetType="{x:Type StackPanel}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding UseBigThumbnail}" Value="True">
-                                                    <Setter Property="MaxWidth" Value="{Binding ElementName=Preview, Path=ActualWidth}" />
+                                                <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
+                                                    <Setter Property="Visibility" Value="Collapsed" />
                                                 </DataTrigger>
                                             </Style.Triggers>
                                         </Style>
-                                    </Image.Style>
-                                </Image>
-                                <TextBlock
-                                    x:Name="PreviewTitle"
-                                    Grid.Row="1"
-                                    Margin="0 6 0 16"
-                                    HorizontalAlignment="Stretch"
-                                    Style="{DynamicResource PreviewItemTitleStyle}"
-                                    Text="{Binding Result.Title}"
-                                    TextAlignment="Center"
-                                    TextWrapping="Wrap" />
+                                    </StackPanel.Style>
+                                    <Separator Style="{DynamicResource PreviewSep}" />
+                                    <TextBlock
+                                        x:Name="PreviewSubTitle"
+                                        Style="{DynamicResource PreviewItemSubTitleStyle}"
+                                        Text="{Binding Result.SubTitle}" />
+                                </StackPanel>
                             </Grid>
-                            <StackPanel Grid.Row="1">
-                                <StackPanel.Style>
-                                    <Style TargetType="{x:Type StackPanel}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
-                                                <Setter Property="Visibility" Value="Collapsed" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </StackPanel.Style>
-                                <Separator Style="{DynamicResource PreviewSep}" />
-                                <TextBlock
-                                    x:Name="PreviewSubTitle"
-                                    Style="{DynamicResource PreviewItemSubTitleStyle}"
-                                    Text="{Binding Result.SubTitle}" />
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                    <Border
-                        MinHeight="380"
-                        MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
-                        d:DataContext="{d:DesignInstance vm:ResultViewModel}"
-                        DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
-                        Style="{DynamicResource PreviewBorderStyle}"
-                        Visibility="{Binding ShowCustomizedPreview}">
-                        <ContentControl Content="{Binding Result.PreviewPanel.Value}" />
-                    </Border>
+                        </Border>
+                        <Border
+                            MinHeight="380"
+                            MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
+                            Padding="0 0 10 10"
+                            d:DataContext="{d:DesignInstance vm:ResultViewModel}"
+                            DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
+                            Visibility="{Binding ShowCustomizedPreview}">
+                            <ContentControl Content="{Binding Result.PreviewPanel.Value}" />
+                        </Border>
+                    </Grid>
                 </Grid>
-            </Grid>
+            </Border>
         </StackPanel>
     </Border>
 </Window>

Flow.Launcher/MainWindow.xaml.cs

@@ -676,7 +676,7 @@ namespace Flow.Launcher
                 if (_settings.UseAnimation)
                     await Task.Delay(100);
 
-                if (_settings.HideWhenDeactivated)
+                if (_settings.HideWhenDeactivated && !_viewModel.ExternalPreviewVisible)
                 {
                     _viewModel.Hide();
                 }

Flow.Launcher/MessageBoxEx.xaml

@@ -0,0 +1,142 @@
+<Window
+    x:Class="Flow.Launcher.MessageBoxEx"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="MessageBoxWindow"
+    Width="420"
+    Height="Auto"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Window.InputBindings>
+        <KeyBinding Key="Escape" Command="Close" />
+    </Window.InputBindings>
+    <Window.CommandBindings>
+        <CommandBinding Command="Close" Executed="cmdEsc_OnPress" />
+    </Window.CommandBindings>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition MinHeight="68" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="4"
+                        Click="Button_Cancel"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Row="1" Margin="30 0 30 24">
+            <Grid Grid.Column="0" Margin="0 0 0 12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Image
+                    Name="Img"
+                    Grid.Column="0"
+                    Width="18"
+                    Height="18"
+                    Margin="0 0 0 0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    RenderOptions.BitmapScalingMode="Fant"
+                    Stretch="UniformToFill"
+                    Visibility="Collapsed" />
+                <TextBlock
+                    x:Name="TitleTextBlock"
+                    Grid.Column="1"
+                    MaxWidth="400"
+                    Margin="10 0 26 0"
+                    VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    TextAlignment="Left"
+                    TextWrapping="Wrap" />
+            </Grid>
+            <TextBlock
+                x:Name="DescTextBlock"
+                Grid.Column="1"
+                MaxWidth="400"
+                Margin="0 0 26 0"
+                HorizontalAlignment="Stretch"
+                FontSize="14"
+                TextAlignment="Left"
+                TextWrapping="Wrap" />
+        </StackPanel>
+        <Border
+            Grid.Row="2"
+            Margin="0 0 0 0"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0 1 0 0">
+            <WrapPanel
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    MinWidth="140"
+                    Margin="5 0 5 0"
+                    Click="Button_Click"
+                    Content="{DynamicResource commonCancel}" />
+                <Button
+                    x:Name="btnNo"
+                    MinWidth="140"
+                    Margin="5 0 5 0"
+                    Click="Button_Click"
+                    Content="{DynamicResource commonNo}" />
+                <Button
+                    x:Name="btnOk"
+                    MinWidth="140"
+                    Margin="5 0 5 0"
+                    Click="Button_Click"
+                    Content="{DynamicResource commonOK}" />
+                <Button
+                    x:Name="btnYes"
+                    MinWidth="140"
+                    Margin="5 0 5 0"
+                    Click="Button_Click"
+                    Content="{DynamicResource commonYes}" />
+            </WrapPanel>
+        </Border>
+    </Grid>
+</Window>

Flow.Launcher/MessageBoxEx.xaml.cs

@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.Image;
+using YamlDotNet.Core.Tokens;
+
+namespace Flow.Launcher
+{
+    public partial class MessageBoxEx : Window
+    {
+        public MessageBoxEx()
+        {
+            InitializeComponent();
+        }
+
+        public enum MessageBoxType
+        {
+            ConfirmationWithYesNo = 0,
+            ConfirmationWithYesNoCancel,
+            YesNo,
+            Information,
+            Error,
+            Warning
+        }
+
+        public enum MessageBoxImage
+        {
+            Warning = 0,
+            Question,
+            Information,
+            Error,
+            None
+        }
+
+        static MessageBoxEx msgBox;
+        static MessageBoxResult _result = MessageBoxResult.No;
+
+
+        /// 1 parameter
+        public static MessageBoxResult Show(string msg)
+        {
+            return Show(string.Empty, msg, MessageBoxButton.OK, MessageBoxImage.None);
+        }
+
+        // 2 parameter
+        public static MessageBoxResult Show(string caption, string text)
+        {
+            return Show(caption, text, MessageBoxButton.OK, MessageBoxImage.None);
+        }
+
+        /// 3 parameter
+        public static MessageBoxResult Show(string caption, string msg, MessageBoxType type) 
+        {
+            switch (type)
+            {
+                case MessageBoxType.ConfirmationWithYesNo:
+                    return Show(caption, msg, MessageBoxButton.YesNo,
+                    MessageBoxImage.Question);
+                case MessageBoxType.YesNo:
+                    return Show(caption, msg, MessageBoxButton.YesNo,
+                    MessageBoxImage.Question);
+                case MessageBoxType.ConfirmationWithYesNoCancel:
+                    return Show(caption, msg, MessageBoxButton.YesNoCancel,
+                    MessageBoxImage.Question);
+                case MessageBoxType.Information:
+                    return Show(caption, msg, MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                case MessageBoxType.Error:
+                    return Show(caption, msg, MessageBoxButton.OK,
+                    MessageBoxImage.Error);
+                case MessageBoxType.Warning:
+                    return Show(caption, msg, MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                default:
+                    return MessageBoxResult.No;
+            }
+        }
+
+        // 4 parameter, Final Display Message. 
+        public static MessageBoxResult Show(string caption, string text, MessageBoxButton button, MessageBoxImage image)
+        {
+            msgBox = new MessageBoxEx();
+            msgBox.TitleTextBlock.Text = text;
+            msgBox.DescTextBlock.Text = caption;
+            msgBox.Title = text;
+            SetVisibilityOfButtons(button);
+            SetImageOfMessageBox(image);
+            msgBox.ShowDialog();
+            return _result;
+        }
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender == btnOk)
+                _result = MessageBoxResult.OK;
+            else if (sender == btnYes)
+                _result = MessageBoxResult.Yes;
+            else if (sender == btnNo)
+                _result = MessageBoxResult.No;
+            else if (sender == btnCancel)
+                _result = MessageBoxResult.Cancel;
+            else
+                _result = MessageBoxResult.None;
+            msgBox.Close();
+            msgBox = null;
+        }
+
+        private static void SetVisibilityOfButtons(MessageBoxButton button)
+        {
+            switch (button)
+            {
+                case MessageBoxButton.OK:
+                    msgBox.btnCancel.Visibility = Visibility.Collapsed;
+                    msgBox.btnNo.Visibility = Visibility.Collapsed;
+                    msgBox.btnYes.Visibility = Visibility.Collapsed;
+                    msgBox.btnOk.Focus();
+                    break;
+                case MessageBoxButton.OKCancel:
+                    msgBox.btnNo.Visibility = Visibility.Collapsed;
+                    msgBox.btnYes.Visibility = Visibility.Collapsed;
+                    msgBox.btnCancel.Focus();
+                    break;
+                case MessageBoxButton.YesNo:
+                    msgBox.btnOk.Visibility = Visibility.Collapsed;
+                    msgBox.btnCancel.Visibility = Visibility.Collapsed;
+                    msgBox.btnNo.Focus();
+                    break;
+                case MessageBoxButton.YesNoCancel:
+                    msgBox.btnOk.Visibility = Visibility.Collapsed;
+                    msgBox.btnCancel.Focus();
+                    break;
+                default:
+                    break;
+            }
+        }
+        private static void SetImageOfMessageBox(MessageBoxImage image)
+        {
+            switch (image)
+            {
+                case MessageBoxImage.Warning:
+                    msgBox.SetImage("Warning.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
+                    break;
+                case MessageBoxImage.Question:
+                    msgBox.SetImage("Question.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
+                    break;
+                case MessageBoxImage.Information:
+                    msgBox.SetImage("Information.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
+                    break;
+                case MessageBoxImage.Error:
+                    msgBox.SetImage("Error.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
+                    break;
+                default:
+                    msgBox.Img.Visibility = Visibility.Collapsed;
+                    break;
+            }
+        }
+        private void SetImage(string imageName)
+        {
+            string uri = Constant.ProgramDirectory + "/Images/" + imageName;
+            var uriSource = new Uri(uri, UriKind.RelativeOrAbsolute);
+            Img.Source = new BitmapImage(uriSource);
+        }
+        private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+        private void Button_Cancel(object sender, RoutedEventArgs e)
+        {
+            msgBox.Close();
+            msgBox = null;
+        }
+
+    }
+}

Flow.Launcher/Resources/Dark.xaml

@@ -7,16 +7,17 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#7b7b7b" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#4d4d4d" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
     <SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
     <SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" />
-    <SolidColorBrush x:Key="SeparatorForeground" Color="#4d4d4d" />
+    <SolidColorBrush x:Key="SeparatorForeground" Color="#14ffffff" />
     <SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#4d4d4d" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
 

Flow.Launcher/Resources/Light.xaml

@@ -7,16 +7,17 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#b5b5b5" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#d8d2d0" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
     <SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
     <SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" />
-    <SolidColorBrush x:Key="SeparatorForeground" Color="#eaeaea" />
+    <SolidColorBrush x:Key="SeparatorForeground" Color="#14000000" />
     <SolidColorBrush x:Key="ThumbColor" Color="#868686" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#d3d3d3" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
     <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />

Flow.Launcher/Resources/SettingWindowStyle.xaml

@@ -8,6 +8,8 @@
     <converters:TextConverter x:Key="TextConverter" />
     <core:TranslationConverter x:Key="TranslationConverter" />
 
+    <!--  Icon for Theme Type Label  -->
+    <Geometry x:Key="circle_half_stroke_solid">F1 M512,512z M0,0z M448,256C448,150,362,64,256,64L256,448C362,448,448,362,448,256z M0,256A256,256,0,1,1,512,256A256,256,0,1,1,0,256z</Geometry>
     <Style x:Key="StoreItemFocusVisualStyleKey">
         <Setter Property="Control.Template">
             <Setter.Value>
@@ -25,7 +27,7 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Rectangle
-                        Margin="-8,-4,-8,-4"
+                        Margin="-8 -4 -8 -4"
                         RadiusX="5"
                         RadiusY="5"
                         Stroke="{DynamicResource Color05B}"
@@ -54,31 +56,72 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <Style x:Key="ThemeList" TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Margin" Value="4" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Border
+                        x:Name="Bd"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{DynamicResource Color12B}"
+                        BorderBrush="{DynamicResource Color03B}"
+                        BorderThickness="1 1 1 0"
+                        CornerRadius="4"
+                        SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd2"
+                            BorderBrush="{DynamicResource Color14B}"
+                            BorderThickness="0 0 0 2"
+                            CornerRadius="4">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
+                            <Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
+                            <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
     <Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
         <Setter Property="Background" Value="{DynamicResource Color00B}" />
         <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Margin" Value="0,5,0,0" />
-        <Setter Property="Padding" Value="0,15,0,15" />
+        <Setter Property="Margin" Value="0 5 0 0" />
+        <Setter Property="Padding" Value="0 15 0 15" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
     <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="TextWrapping" Value="Wrap" />
     </Style>
 
     <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Margin" Value="0,0,0,0" />
-        <Setter Property="Padding" Value="0,0,24,0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
+        <Setter Property="Padding" Value="0 0 24 0" />
         <Setter Property="TextWrapping" Value="WrapWithOverflow" />
     </Style>
     <Style x:Key="TextPanel" TargetType="{x:Type StackPanel}">
         <Setter Property="Grid.Column" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="Width" Value="Auto" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Left" />
@@ -89,7 +132,7 @@
         TargetType="{x:Type CheckBox}">
         <Setter Property="Width" Value="24" />
         <Setter Property="Grid.Column" Value="2" />
-        <Setter Property="Margin" Value="0,4,10,4" />
+        <Setter Property="Margin" Value="0 4 10 4" />
         <Setter Property="LayoutTransform">
             <Setter.Value>
                 <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -100,7 +143,7 @@
     <Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="Grid.Column" Value="1" />
-        <Setter Property="Margin" Value="0,0,-18,0" />
+        <Setter Property="Margin" Value="0 0 -18 0" />
     </Style>
 
 
@@ -123,8 +166,8 @@
                                     x:Name="Spacer"
                                     Width="Auto"
                                     Height="Auto"
-                                    Margin="0,10,5,0"
-                                    Padding="0,0,0,0"
+                                    Margin="0 10 5 0"
+                                    Padding="0 0 0 0"
                                     BorderBrush="Transparent"
                                     BorderThickness="0">
                                     <Border
@@ -133,7 +176,7 @@
                                         CornerRadius="5">
                                         <ContentPresenter
                                             x:Name="ContentSite"
-                                            Margin="12,12,0,12"
+                                            Margin="12 12 0 12"
                                             HorizontalAlignment="LEFT"
                                             VerticalAlignment="Center"
                                             ContentSource="Header"
@@ -165,8 +208,8 @@
                         <Border
                             x:Name="border"
                             Height="40"
-                            Margin="14,4,8,4"
-                            Padding="0,0,0,0"
+                            Margin="14 4 8 4"
+                            Padding="0 0 0 0"
                             HorizontalAlignment="Stretch"
                             Background="{DynamicResource Color01B}"
                             CornerRadius="5">
@@ -180,7 +223,7 @@
                                     Grid.Column="0"
                                     Width="4"
                                     Height="18"
-                                    Margin="0,11,0,11"
+                                    Margin="0 11 0 11"
                                     Fill="{DynamicResource ToggleSwitchFillOn}"
                                     RadiusX="2"
                                     RadiusY="2"
@@ -188,7 +231,7 @@
                                 <ContentPresenter
                                     x:Name="ContentSite"
                                     Grid.Column="1"
-                                    Margin="12,11,18,11"
+                                    Margin="12 11 18 11"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
                                     ContentSource="Header"
@@ -212,10 +255,10 @@
 
     <Style x:Key="PluginList" TargetType="ListBoxItem">
         <Setter Property="Background" Value="{DynamicResource Color00B}" />
-        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0 0 0 0" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Margin" Value="0,0,18,5" />
+        <Setter Property="Margin" Value="0 0 18 5" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
         <!--#region Template for blue highlight win10-->
@@ -255,7 +298,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
                             <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
-                            <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
+                            <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
 
 
                         </MultiTrigger>
@@ -267,7 +310,7 @@
                             <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
                             <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
                             <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
-                            <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
+                            <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
 
 
                         </MultiTrigger>
@@ -284,10 +327,10 @@
 
     <!--#region PluginStore Style-->
     <Style x:Key="StoreList" TargetType="ListViewItem">
-        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0 0 0 0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Margin" Value="0,0,8,8" />
+        <Setter Property="Margin" Value="0 0 8 8" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <!--#region Template for blue highlight win10-->
         <Setter Property="Template">
@@ -325,10 +368,10 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Grid Margin="20,0,0,0">
+                            <Grid Margin="20 0 0 0">
                                 <StackPanel>
                                     <TextBlock
-                                        Margin="0,20,0,4"
+                                        Margin="0 20 0 4"
                                         FontWeight="Bold"
                                         Text="{DynamicResource searchplugin_Noresult_Title}" />
                                     <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle}" />
@@ -351,10 +394,10 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Grid Margin="20,0,0,0">
+                            <Grid Margin="20 0 0 0">
                                 <StackPanel>
                                     <TextBlock
-                                        Margin="0,20,0,4"
+                                        Margin="0 20 0 4"
                                         FontWeight="Bold"
                                         Text="{DynamicResource searchplugin_Noresult_Title}" />
                                     <TextBlock Text="{DynamicResource searchplugin_Noresult}" />
@@ -394,7 +437,7 @@
                             x:Name="headerPanel"
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="2,2,2,0"
+                            Margin="2 2 2 0"
                             Panel.ZIndex="1"
                             Background="Transparent"
                             IsItemsHost="true"

Flow.Launcher/ResultListBox.xaml

@@ -62,13 +62,13 @@
                         <StackPanel
                             x:Name="HotkeyArea"
                             Grid.Column="2"
-                            Margin="0,0,10,0"
+                            Margin="0 0 10 0"
                             VerticalAlignment="Center"
                             Visibility="{Binding ShowOpenResultHotkey}">
                             <TextBlock
                                 x:Name="Hotkey"
-                                Margin="12,0,12,0"
-                                Padding="0,0,0,0"
+                                Margin="12 0 12 0"
+                                Padding="0 0 0 0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Style="{DynamicResource ItemHotkeyStyle}">
@@ -97,17 +97,18 @@
 
                             <Border
                                 Grid.Column="1"
-                                Margin="9,0,0,0"
+                                Margin="9 0 0 0"
                                 BorderBrush="Transparent"
                                 BorderThickness="1">
                                 <Image
                                     x:Name="ImageIcon"
-                                    Margin="0,0,0,0"
+                                    Margin="0 0 0 0"
                                     HorizontalAlignment="Center"
                                     IsHitTestVisible="False"
                                     RenderOptions.BitmapScalingMode="Fant"
                                     Source="{Binding Image, TargetNullValue={x:Null}}"
                                     Stretch="Uniform"
+                                    StretchDirection="DownOnly"
                                     Style="{DynamicResource ImageIconStyle}"
                                     Visibility="{Binding ShowIcon}">
                                     <Image.Clip>
@@ -130,7 +131,7 @@
                             </Border>
                             <Border
                                 Grid.Column="1"
-                                Margin="9,0,0,0"
+                                Margin="9 0 0 0"
                                 BorderBrush="Transparent"
                                 BorderThickness="0">
                                 <TextBlock
@@ -146,7 +147,7 @@
 
                         <Grid
                             Grid.Column="1"
-                            Margin="6,0,10,0"
+                            Margin="6 0 10 0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center">
                             <Grid.RowDefinitions>
@@ -172,7 +173,7 @@
                             <TextBlock
                                 x:Name="Title"
                                 Grid.Row="0"
-                                Margin="0,0,0,1"
+                                Margin="0 0 0 1"
                                 VerticalAlignment="Bottom"
                                 DockPanel.Dock="Left"
                                 FontSize="{Binding Settings.ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
@@ -192,7 +193,7 @@
                             <TextBlock
                                 x:Name="SubTitle"
                                 Grid.Row="1"
-                                Margin="0,1,0,0"
+                                Margin="0 1 0 0"
                                 VerticalAlignment="Top"
                                 FontSize="{Binding Settings.ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
@@ -221,9 +222,10 @@
     <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Height" Value="{Binding Settings.ItemHeightSize}" />
+            <Setter Property="Visibility" Value="Visible" />
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
             <EventSetter Event="MouseMove" Handler="OnMouseMove" />
-            <Setter Property="Height" Value="{Binding Settings.ItemHeightSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="Padding" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
@@ -256,4 +258,4 @@
             </Setter>
         </Style>
     </ListBox.ItemContainerStyle>
-</ListBox>
+</ListBox>

Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

@@ -11,6 +11,7 @@ using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using static Flow.Launcher.MessageBoxEx;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
@@ -62,10 +63,10 @@ public partial class SettingsPaneAboutViewModel : BaseModel
     [RelayCommand]
     private void AskClearLogFolderConfirmation()
     {
-        var confirmResult = MessageBox.Show(
+        var confirmResult = MessageBoxEx.Show(
             InternationalizationManager.Instance.GetTranslation("clearlogfolderMessage"),
             InternationalizationManager.Instance.GetTranslation("clearlogfolder"),
-            MessageBoxButton.YesNo
+            MessageBoxType.YesNo
         );
 
         if (confirmResult == MessageBoxResult.Yes)

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -22,17 +22,20 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
+    private const string DefaultFont = "Segoe UI";
     public Settings Settings { get; }
 
     public static string LinkHowToCreateTheme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";
     public static string LinkThemeGallery => "https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438";
 
-    public string SelectedTheme
+    private Theme.ThemeData _selectedTheme;
+    public Theme.ThemeData SelectedTheme
     {
-        get => Settings.Theme;
+        get => _selectedTheme ??= Themes.Find(v => v.FileNameWithoutExtension == Settings.Theme);
         set
         {
-            ThemeManager.Instance.ChangeTheme(value);
+            _selectedTheme = value;
+            ThemeManager.Instance.ChangeTheme(value.FileNameWithoutExtension);
 
             if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect)
                 DropShadowEffect = false;
@@ -80,6 +83,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         get => Settings.QueryBoxFontSize;
         set => Settings.QueryBoxFontSize = value;
     }
+
     public double ResultItemFontSize
     {
         get => Settings.ResultItemFontSize;
@@ -91,33 +95,13 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         get => Settings.ResultSubItemFontSize;
         set => Settings.ResultSubItemFontSize = value;
     }
-    public List<string> Themes =>
-        ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension).ToList();
 
+    private List<Theme.ThemeData> _themes;
+    public List<Theme.ThemeData> Themes => _themes ??= ThemeManager.Instance.LoadAvailableThemes();
 
-    public class ColorScheme
-    {
-        public string Display { get; set; }
-        public ColorSchemes Value { get; set; }
-    }
+    public class ColorSchemeData : DropdownDataGeneric<ColorSchemes> { }
 
-    public List<ColorScheme> ColorSchemes
-    {
-        get
-        {
-            List<ColorScheme> modes = new List<ColorScheme>();
-            var enums = (ColorSchemes[])Enum.GetValues(typeof(ColorSchemes));
-            foreach (var e in enums)
-            {
-                var key = $"ColorScheme{e}";
-                var display = InternationalizationManager.Instance.GetTranslation(key);
-                var m = new ColorScheme { Display = display, Value = e, };
-                modes.Add(m);
-            }
-
-            return modes;
-        }
-    }
+    public List<ColorSchemeData> ColorSchemes { get; } = DropdownDataGeneric<ColorSchemes>.GetValues<ColorSchemeData>("ColorScheme");
 
     public List<string> TimeFormatList { get; } = new()
     {
@@ -164,11 +148,13 @@ public partial class SettingsPaneThemeViewModel : BaseModel
     }
 
     public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
+
     public bool KeepMaxResults
     {
         get => Settings.KeepMaxResults;
         set => Settings.KeepMaxResults = value;
     }
+
     public string ClockText => DateTime.Now.ToString(TimeFormat, CultureInfo.CurrentCulture);
 
     public string DateText => DateTime.Now.ToString(DateFormat, CultureInfo.CurrentCulture);
@@ -185,29 +171,9 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         set => Settings.UseAnimation = value;
     }
 
-    public class AnimationSpeed
-    {
-        public string Display { get; set; }
-        public AnimationSpeeds Value { get; set; }
-    }
+    public class AnimationSpeedData : DropdownDataGeneric<AnimationSpeeds> { }
+    public List<AnimationSpeedData> AnimationSpeeds { get; } = DropdownDataGeneric<AnimationSpeeds>.GetValues<AnimationSpeedData>("AnimationSpeed");
 
-    public List<AnimationSpeed> AnimationSpeeds
-    {
-        get
-        {
-            List<AnimationSpeed> speeds = new List<AnimationSpeed>();
-            var enums = (AnimationSpeeds[])Enum.GetValues(typeof(AnimationSpeeds));
-            foreach (var e in enums)
-            {
-                var key = $"AnimationSpeed{e}";
-                var display = InternationalizationManager.Instance.GetTranslation(key);
-                var m = new AnimationSpeed { Display = display, Value = e, };
-                speeds.Add(m);
-            }
-
-            return speeds;
-        }
-    }
     public bool UseSound
     {
         get => Settings.UseSound;
@@ -326,7 +292,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
             return fontExists switch
             {
                 true => new FontFamily(Settings.QueryBoxFont),
-                _ => new FontFamily("Segoe UI")
+                _ => new FontFamily(DefaultFont)
             };
         }
         set
@@ -370,7 +336,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
             return fontExists switch
             {
                 true => new FontFamily(Settings.ResultFont),
-                _ => new FontFamily("Segoe UI")
+                _ => new FontFamily(DefaultFont)
             };
         }
         set
@@ -415,7 +381,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
             }
             else
             {
-                var font = new FontFamily("Segoe UI");
+                var font = new FontFamily(DefaultFont);
                 return font;
             }
         }
@@ -446,6 +412,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
             ThemeManager.Instance.ChangeTheme(Settings.Theme);
         }
     }
+
     public string ThemeImage => Constant.QueryTextBoxIconImagePath;
 
     [RelayCommand]
@@ -470,4 +437,22 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         Settings = settings;
     }
 
+    [RelayCommand]
+    public void Reset()
+    {
+        SelectedQueryBoxFont = new FontFamily(DefaultFont);
+        SelectedQueryBoxFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
+        QueryBoxFontSize = 20;
+
+        SelectedResultFont = new FontFamily(DefaultFont);
+        SelectedResultFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
+        ResultItemFontSize = 16;
+
+        SelectedResultSubFont = new FontFamily(DefaultFont);
+        SelectedResultSubFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
+        ResultSubItemFontSize = 13;
+
+        WindowHeightSize = 42;
+        ItemHeightSize = 58;
+    }
 }

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -137,7 +137,7 @@
                 Title="{DynamicResource AlwaysPreview}"
                 Margin="0 14 0 0"
                 Icon=""
-                Sub="{DynamicResource AlwaysPreviewToolTip}">
+                Sub="{Binding AlwaysPreviewToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.AlwaysPreview}"
                     OffContent="{DynamicResource disable}"

Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml

@@ -5,9 +5,9 @@
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-    xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     Title="Hotkey"
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneHotkeyViewModel}"
@@ -33,9 +33,9 @@
                 Sub="{DynamicResource flowlauncherHotkeyToolTip}">
                 <flowlauncher:HotkeyControl
                     ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
-                    HotkeySettings="{Binding Settings}"
                     DefaultHotkey="Alt+Space"
                     Hotkey="{Binding Settings.Hotkey}"
+                    HotkeySettings="{Binding Settings}"
                     ValidateKeyGesture="True"
                     WindowTitle="{DynamicResource flowlauncherHotkey}" />
             </cc:Card>
@@ -45,17 +45,15 @@
                 Icon="&#xe8a1;"
                 Sub="{DynamicResource previewHotkeyToolTip}">
                 <flowlauncher:HotkeyControl
-                    HotkeySettings="{Binding Settings}"
                     DefaultHotkey="F1"
                     Hotkey="{Binding Settings.PreviewHotkey}"
+                    HotkeySettings="{Binding Settings}"
                     ValidateKeyGesture="False"
                     WindowTitle="{DynamicResource previewHotkey}" />
             </cc:Card>
 
             <cc:CardGroup Margin="0 12 0 0">
-                <cc:Card
-                    Title="{DynamicResource openResultModifiers}"
-                    Sub="{DynamicResource openResultModifiersToolTip}">
+                <cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
                     <ComboBox
                         Width="120"
                         FontSize="14"
@@ -106,9 +104,9 @@
                         Icon="&#xede3;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey="Ctrl+I"
                             Hotkey="{Binding Settings.OpenContextMenuHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -117,15 +115,20 @@
                         Type="Inside">
                         <cc:HotkeyDisplay Keys="Shift+Enter" />
                     </cc:Card>
-
+                    <cc:Card
+                        Title="{DynamicResource OpenNativeContextMenuHotkey}"
+                        Icon="&#xede3;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Alt+Enter" />
+                    </cc:Card>
                     <cc:Card
                         Title="{DynamicResource SettingWindowHotkey}"
                         Icon="&#xe713;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey="Ctrl+I"
                             Hotkey="{Binding Settings.SettingWindowHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -172,9 +175,9 @@
                         Icon="&#xf0ad;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey=""
                             Hotkey="{Binding Settings.SelectPrevPageHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -182,9 +185,9 @@
                         Icon="&#xf0ae;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey=""
                             Hotkey="{Binding Settings.SelectNextPageHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
 
@@ -217,9 +220,9 @@
                 Sub="{DynamicResource autoCompleteHotkeyToolTip}">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Ctrl+Tab"
                         Hotkey="{Binding Settings.AutoCompleteHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -227,9 +230,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.AutoCompleteHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -240,9 +243,9 @@
                 Icon="&#xe74a;">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Shift+Tab"
                         Hotkey="{Binding Settings.SelectPrevItemHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -250,9 +253,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -263,9 +266,9 @@
                 Icon="&#xe74b;">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Tab"
                         Hotkey="{Binding Settings.SelectNextItemHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -273,9 +276,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.SelectNextItemHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -435,8 +438,7 @@
                                     <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate DataType="{x:Type userSettings:BuiltinShortcutModel}">
-                                                <TextBlock
-                                                    Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
+                                                <TextBlock Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
                                             </DataTemplate>
                                         </GridViewColumn.CellTemplate>
                                     </GridViewColumn>

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

@@ -39,7 +39,17 @@
                 TextAlignment="left"
                 Visibility="Collapsed" />
             <!--  Theme Preview and Editor  -->
-            <Grid Height="380">
+            <Grid>
+                <Grid.Style>
+                    <Style x:Name="PreviewArea" TargetType="Grid">
+                        <Setter Property="MaxHeight" Value="380" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ElementName=Editor, Path=IsChecked}" Value="True">
+                                <Setter Property="MaxHeight" Value="550" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Grid.Style>
                 <Grid.Resources>
                     <!--  Style for the second ColumnDefinition  -->
                     <Style x:Key="SecondColumnStyle" TargetType="ColumnDefinition">
@@ -245,14 +255,17 @@
                             <Button
                                 Margin="8"
                                 HorizontalAlignment="Stretch"
-                                Click="Reset_Click"
+                                Command="{Binding ResetCommand}"
                                 Content="{DynamicResource resetCustomize}" />
-
                         </StackPanel>
                     </ScrollViewer>
                 </Border>
                 <!--  Theme Preview  -->
-                <Border Grid.Column="0" Background="{Binding PreviewBackground}">
+                <Border
+                    Grid.Column="0"
+                    Background="{Binding PreviewBackground}"
+                    SnapsToDevicePixels="True"
+                    UseLayoutRounding="True">
                     <Border.Style>
                         <Style TargetType="{x:Type Border}">
                             <Setter Property="CornerRadius" Value="6 0 0 6" />
@@ -290,16 +303,8 @@
                                 Width="400"
                                 Margin="40 30 0 30"
                                 SnapsToDevicePixels="True"
-                                Style="{DynamicResource WindowBorderStyle}"
-                                UseLayoutRounding="True">
-                                <Border Style="{DynamicResource WindowRadius}">
-                                    <Border.Clip>
-                                        <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-                                        </MultiBinding>
-                                    </Border.Clip>
+                                Style="{DynamicResource WindowBorderStyle}">
+                                <Border BorderThickness="0" Style="{DynamicResource WindowRadius}">
                                     <Grid>
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
@@ -378,122 +383,99 @@
             </cc:Card>
 
             <!--  Theme  -->
-            <Border
-                Height="64"
+            <cc:ExCard
+                x:Name="ThemeCard"
+                Title="{DynamicResource theme}"
                 Margin="0 8 0 0"
-                CornerRadius="5 5 0 0"
-                Style="{DynamicResource SettingGroupBox}">
-                <ItemsControl Style="{StaticResource SettingGrid}">
-                    <StackPanel Style="{StaticResource TextPanel}">
-                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource theme}" />
+                Icon="&#xe790;">
+                <cc:ExCard.SideContent>
+                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                        <ui:PathIcon
+                            Width="12"
+                            Margin="0 1 8 0"
+                            VerticalAlignment="Center"
+                            Data="{DynamicResource circle_half_stroke_solid}"
+                            ToolTip="{DynamicResource TypeIsDarkToolTip}"
+                            ToolTipService.InitialShowDelay="0"
+                            Visibility="{Binding SelectedTheme.IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        <ui:FontIcon
+                            Margin="0 2 8 0"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Glyph="&#xEB42;"
+                            ToolTip="{DynamicResource TypeHasBlurToolTip}"
+                            ToolTipService.InitialShowDelay="0"
+                            Visibility="{Binding SelectedTheme.HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        <TextBlock Text="{Binding SelectedTheme.Name}" />
                     </StackPanel>
-                    <TextBlock Style="{StaticResource Glyph}">
-                        &#xe790;
-                    </TextBlock>
-                </ItemsControl>
-            </Border>
-
-            <Border
-                Margin="0"
-                Padding="0"
-                HorizontalAlignment="Stretch"
-                BorderThickness="1 0 1 1"
-                CornerRadius="0 0 5 5"
-                Style="{DynamicResource SettingGroupBox}">
+                </cc:ExCard.SideContent>
                 <ListBox
-                    Margin="12"
-                    HorizontalAlignment="Center"
-                    HorizontalContentAlignment="Center"
-                    ui:ScrollViewerHelper.AutoHideScrollBars="True"
-                    Background="#ffffff"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch"
+                    Background="Transparent"
+                    ItemContainerStyle="{DynamicResource ThemeList}"
                     ItemsSource="{Binding Themes}"
                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    SelectedItem="{Binding SelectedTheme}">
-                    <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                            <Setter Property="Background" Value="Transparent" />
-                            <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-                            <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-                            <Setter Property="Padding" Value="0" />
-                            <Setter Property="Margin" Value="4" />
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                                        <Border
-                                            x:Name="Bd"
-                                            Padding="{TemplateBinding Padding}"
-                                            Background="{DynamicResource Color12B}"
-                                            BorderBrush="{DynamicResource Color03B}"
-                                            BorderThickness="1 1 1 0"
-                                            CornerRadius="4"
-                                            SnapsToDevicePixels="true">
-                                            <Border
-                                                x:Name="Bd2"
-                                                BorderBrush="{DynamicResource Color14B}"
-                                                BorderThickness="0 0 0 2"
-                                                CornerRadius="4">
-                                                <ContentPresenter
-                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                            </Border>
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsMouseOver" Value="true">
-                                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
-                                            </Trigger>
-                                            <Trigger Property="IsSelected" Value="true">
-                                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
-                                                <Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
-                                                <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
-                                            </Trigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </ListBox.ItemContainerStyle>
-                    <ListBox.Template>
-                        <!--  For Scroll Wheel inside listbox area  -->
-                        <ControlTemplate>
-                            <ItemsPresenter />
-                        </ControlTemplate>
-                    </ListBox.Template>
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <Grid
-                                Width="Auto"
-                                Height="34"
-                                Margin="0">
-                                <TextBlock
-                                    x:Name="ThemeName"
-                                    Margin="0"
-                                    Padding="14 12"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Focusable="True"
-                                    FontSize="12"
-                                    Text="{Binding}"
-                                    TextWrapping="Wrap" />
-                            </Grid>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
+                    SelectedValue="{Binding SelectedTheme}">
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
                             <WrapPanel />
                         </ItemsPanelTemplate>
                     </ListBox.ItemsPanel>
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Grid
+                                Width="Auto"
+                                Height="34"
+                                Margin="0"
+                                Focusable="True">
+                                <StackPanel Margin="14 2 14 0" Orientation="Horizontal">
+                                    <TextBlock
+                                        Margin="0 0 0 0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Name}"
+                                        TextWrapping="Wrap" />
+                                    <ui:PathIcon
+                                        Width="12"
+                                        Margin="8 1 0 0"
+                                        VerticalAlignment="Center"
+                                        Data="{DynamicResource circle_half_stroke_solid}"
+                                        ToolTip="{DynamicResource TypeIsDarkToolTip}"
+                                        ToolTipService.InitialShowDelay="0"
+                                        Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    <ui:FontIcon
+                                        Margin="8 1 0 0"
+                                        VerticalAlignment="Center"
+                                        FontSize="12"
+                                        Glyph="&#xEB42;"
+                                        ToolTip="{DynamicResource TypeHasBlurToolTip}"
+                                        ToolTipService.InitialShowDelay="0"
+                                        Visibility="{Binding HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                </StackPanel>
+                            </Grid>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                    <ListBox.Template>
+                        <ControlTemplate>
+                            <Border
+                                Padding="18 12 18 12"
+                                BorderBrush="{DynamicResource Color03B}"
+                                BorderThickness="0 1 0 0">
+                                <ItemsPresenter />
+                            </Border>
+                        </ControlTemplate>
+                    </ListBox.Template>
                 </ListBox>
-
-            </Border>
-
+            </cc:ExCard>
             <cc:HyperLink
                 Margin="10"
                 HorizontalAlignment="Right"
                 Text="{DynamicResource browserMoreThemes}"
                 Uri="{Binding LinkThemeGallery}" />
 
+            <!--  Fixed Height  -->
             <cc:CardGroup Margin="0 20 0 0">
                 <cc:Card
                     Title="{DynamicResource KeepMaxResults}"

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

@@ -30,52 +30,4 @@ public partial class SettingsPaneTheme : Page
     {
         _viewModel.UpdateColorScheme();
     }
-
-    private void Reset_Click(object sender, RoutedEventArgs e)
-    {
-        /*The FamilyTypeface should initialize all of its various properties.*/
-        FamilyTypeface targetTypeface = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
-
-        QueryBoxFontSize.Value = 20;
-        QueryBoxFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", QueryBoxFontComboBox);
-        QueryBoxFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, QueryBoxFontStyleComboBox);
-
-        ResultItemFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", ResultItemFontComboBox);
-        ResultItemFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, ResultItemFontStyleComboBox);
-        ResultItemFontSize.Value = 16;
-
-        ResultSubItemFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", ResultSubItemFontComboBox);
-        ResultSubItemFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, ResultSubItemFontStyleComboBox);
-        ResultSubItemFontSize.Value = 13;
-
-        WindowHeightValue.Value = 42;
-        ItemHeightValue.Value = 58;
-    }
-
-    private int SearchFontIndex(string targetFont, ComboBox combo)
-    {
-        for (int i = 0; i < combo.Items.Count; i++)
-        {
-            if (combo.Items[i]?.ToString() == targetFont)
-            {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    private int SearchFontStyleIndex(FamilyTypeface targetTypeface, ComboBox combo)
-    {
-        for (int i = 0; i < combo.Items.Count; i++)
-        {
-            if (combo.Items[i] is FamilyTypeface typefaceItem &&
-                typefaceItem.Stretch == targetTypeface.Stretch &&
-                typefaceItem.Weight == targetTypeface.Weight &&
-                typefaceItem.Style == targetTypeface.Style)
-            {
-                return i;
-            }
-        }
-        return 0;
-    }
 }

Flow.Launcher/SettingWindow.xaml

@@ -214,7 +214,7 @@
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
 
-                        <ui:NavigationViewItem x:Name="Plugins" Content="{DynamicResource plugin}">
+                        <ui:NavigationViewItem x:Name="Plugins" Content="{DynamicResource plugins}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/plugins.png" />
                             </ui:NavigationViewItem.Icon>
@@ -235,7 +235,7 @@
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
 
-                        <ui:NavigationViewItem x:Name="Hotkey" Content="{DynamicResource hotkey}">
+                        <ui:NavigationViewItem x:Name="Hotkey" Content="{DynamicResource hotkeys}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/keyboard.png" />
                             </ui:NavigationViewItem.Icon>

Flow.Launcher/Themes/Base.xaml

@@ -29,7 +29,7 @@
         <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="Padding" Value="0 0 68 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Foreground" Value="#E3E0E3" />
@@ -69,7 +69,7 @@
 
     <!--  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" />
+        <Setter Property="Margin" Value="0 0 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxBgStyle"
@@ -83,9 +83,10 @@
         <Setter Property="Height" Value="48" />
         <Setter Property="Margin" Value="16 7 0 7" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0 4 68 0" />
+        <Setter Property="Padding" Value="0 0 68 0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@@ -97,6 +98,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="Width" Value="600" />
     </Style>
 
@@ -120,13 +122,15 @@
     </Style>
     <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="20" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0 0 0 0" />
+        <Setter Property="Margin" Value="0 0 0 3" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0 0 0 0" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
@@ -139,6 +143,7 @@
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0 0 0 3" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
@@ -398,16 +403,30 @@
     <Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0 2 18 0" />
+        <Setter Property="Margin" Value="0 0 18 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style x:Key="BasePreviewBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1 0 0 0" />
+        <Setter Property="Width" Value="5" />
         <Setter Property="BorderBrush" Value="#FFEAEAEA" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Margin" Value="0 0 10 10" />
+        <Setter Property="Background" Value="Transparent" />
+        <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Height" Value="0" />
+                    <Setter Property="Margin" Value="0" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+        </Style.Triggers>
     </Style>
+
     <Style x:Key="BasePreviewGlyph" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#555555" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -432,7 +451,7 @@
     <Style x:Key="PreviewSep" TargetType="{x:Type Separator}">
         <Setter Property="Visibility" Value="Visible" />
         <Setter Property="Background" Value="{Binding ElementName=MiddleSeparator, Path=Fill}" />
-        <Setter Property="Margin" Value="0 15 0 5" />
+        <Setter Property="Margin" Value="0 15 5 5" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
                 <Setter Property="Visibility" Value="Collapsed" />
@@ -444,6 +463,7 @@
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderBrush" Value="Gray" />
+
     </Style>
 
     <Style x:Key="PreviewArea" TargetType="{x:Type Grid}">
@@ -480,7 +500,7 @@
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0 2 18 0" />
+        <Setter Property="Margin" Value="0 0 18 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
@@ -488,7 +508,7 @@
         x:Key="ClockPanelPosition"
         BasedOn="{StaticResource BaseClockPanelPosition}"
         TargetType="{x:Type Canvas}">
-        <Setter Property="Margin" Value="0 2 66 0" />
+        <Setter Property="Margin" Value="0 0 66 0" />
     </Style>
     <Style
         x:Key="ItemHotkeyStyle"
@@ -530,7 +550,7 @@
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Margin" Value="0 6 0 10" />
+        <Setter Property="Margin" Value="5 6 0 10" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="LineHeight" Value="18" />
         <Setter Property="TextAlignment" Value="Left" />

Flow.Launcher/Themes/BlurBlack Darker.xaml

@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur Black Darker
+    IsDark: False
+    HasBlur: True
+-->
+<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">
@@ -53,7 +58,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#444444" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
 
     <Style

Flow.Launcher/Themes/BlurBlack.xaml

@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur Black
+    IsDark: False
+    HasBlur: True
+-->
+<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">
@@ -51,7 +56,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#444444" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
 
     <Style
@@ -168,4 +173,4 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/BlurWhite.xaml

@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur White
+    IsDark: False
+    HasBlur: True
+-->
+<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">
@@ -96,7 +101,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#c6c6c6" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
     <!--  button style in the middle of the scrollbar  -->
     <Style

Flow.Launcher/Themes/Bullet Light.xaml

@@ -1,209 +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="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="#e2e2e2" />
-        <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="Margin" Value="-4,0,0,0" />
-        <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>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Circle Light.xaml

@@ -1,190 +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="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <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="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="White" />
-        <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="#3d434a" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#e2e2e2" />
-        <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">#5046e5</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="#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="White" />
-        <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>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#3d434a" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Circle System.xaml

@@ -1,3 +1,8 @@
+<!--
+    Name: Circle
+    IsDark: True
+    HasBlur: False
+-->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -17,7 +22,7 @@
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,4,50,0" />
+        <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" />
@@ -27,7 +32,7 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Padding" Value="0 4 50 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="38" />
         <Setter Property="FontSize" Value="18" />
@@ -72,7 +77,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
+        <Setter Property="Margin" Value="0 0 0 8" />
     </Style>
     <Style x:Key="HighlightStyle" />
     <Style
@@ -123,7 +128,7 @@
         <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="Margin" Value="0 8 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
 
@@ -150,7 +155,7 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
+        <Setter Property="Margin" Value="0 0 54 0" />
     </Style>
     <Style
         x:Key="ClockBox"
@@ -188,4 +193,4 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#9da1aa" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/Cyan Dark.xaml

@@ -27,7 +27,7 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#bbc1c3" />
+        <Setter Property="Foreground" Value="#eff2f2" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
@@ -139,7 +139,7 @@
         <Setter Property="Height" Value="24" />
     </Style>
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="#0f1f26" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Margin" Value="0,8,8,0" />
@@ -155,7 +155,7 @@
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#58c2b4" />
+        <Setter Property="Foreground" Value="#eff2f2" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Width" Value="25" />

Flow.Launcher/Themes/Darker Glass.xaml

@@ -1,4 +1,4 @@
-<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">
@@ -171,4 +171,4 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#ebebeb" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/Discord Dark.xaml

@@ -1,4 +1,4 @@
-<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">
@@ -189,4 +189,4 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

Flow.Launcher/Themes/Dracula.xaml

@@ -28,7 +28,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#282a36" />
         <Setter Property="Foreground" Value="#6272a4" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Padding" Value="0,4,66,0" />
@@ -98,7 +97,7 @@
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#bd93f9" />
+        <Setter Property="Inline.FontWeight" Value="SemiBold" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />

Flow.Launcher/Themes/Gray.xaml

@@ -11,7 +11,6 @@
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#c6c8cb" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"

Flow.Launcher/Themes/League.xaml

@@ -1,4 +1,4 @@
-<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">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>

Flow.Launcher/Themes/Nord Darker.xaml

@@ -22,7 +22,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#2e3440" />
         <Setter Property="Foreground" Value="#50596b" />
         <Setter Property="FontSize" Value="30" />
     </Style>

Flow.Launcher/Themes/Pink.xaml

@@ -2,45 +2,46 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Foreground" Value="#0e172c" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#cc1081" />
-        <Setter Property="CaretBrush" Value="#cc1081" />
-        <Setter Property="SelectionBrush" Value="#e564b1" />
+        <Setter Property="Foreground" Value="#0E172C" />
+        <Setter Property="CaretBrush" Value="#0E172C" />
+        <Setter Property="SelectionBrush" Value="#a786df" />
     </Style>
 
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#1f1d1f" />
-        <Setter Property="Foreground" Value="#71114b" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="#E9819F" />
     </Style>
 
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="#1f1d1f" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="#000000" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="Background" Value="#fec7d7" />
+        <Setter Property="BorderThickness" Value="3" />
+        <Setter Property="BorderBrush" Value="#0e172c" />
     </Style>
     <Style
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
         TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#000000" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,4" />
+        <Setter Property="Fill" Value="#0e172c" />
+        <Setter Property="Height" Value="3" />
+        <Setter Property="Margin" Value="0 0 0 0" />
     </Style>
     <Style
         x:Key="WindowStyle"
@@ -50,34 +51,33 @@
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
         TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#cc1081" />
+        <Setter Property="Stroke" Value="#a786df" />
     </Style>
     <Style
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
+        <Setter Property="Foreground" Value="#0e172c" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
-        <Setter Property="Opacity" Value="0.5" />
+        <Setter Property="Foreground" Value="#0e172c" />
     </Style>
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
+        <Setter Property="Foreground" Value="#fffffe" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ed92c9" />
+        <Setter Property="Foreground" Value="#fffffe" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#cc1081</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#0e172c</SolidColorBrush>
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
@@ -86,7 +86,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#e564b1"
+                        Background="#E9819F"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -104,58 +104,61 @@
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="34" />
         <Setter Property="Height" Value="34" />
-        <Setter Property="Margin" Value="0,6,14,0" />
+        <Setter Property="Margin" Value="0 6 14 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#cc1081" />
+        <Setter Property="Fill" Value="#E9819F" />
         <Setter Property="Width" Value="28" />
         <Setter Property="Height" Value="28" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#ed92c9" />
+        <Setter Property="FontSize" Value="11" />
+        <Setter Property="Foreground" Value="#E9819F" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#ed92c9" />
+        <Setter Property="FontSize" Value="11" />
+        <Setter Property="Foreground" Value="#E9819F" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#71114b" />
+        <Setter Property="Foreground" Value="#E9819F" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="#71114b" />
+        <Setter Property="Foreground" Value="#E9819F" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#000000" />
+        <Setter Property="Margin" Value="0 0 10 0" />
+        <Setter Property="Width" Value="5" />
+        <Setter Property="BorderThickness" Value="3 0 0 0" />
+        <Setter Property="BorderBrush" Value="#0e172c" />
     </Style>
     <Style
         x:Key="PreviewItemTitleStyle"
         BasedOn="{StaticResource BasePreviewItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
+        <Setter Property="Foreground" Value="#0E172C" />
     </Style>
     <Style
         x:Key="PreviewItemSubTitleStyle"
         BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
+        <Setter Property="Foreground" Value="#0E172C" />
     </Style>
     <Style
         x:Key="PreviewGlyph"
         BasedOn="{StaticResource BasePreviewGlyph}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Foreground" Value="#0E172C" />
     </Style>
 </ResourceDictionary>

Flow.Launcher/Themes/SlimLight.xaml

@@ -179,15 +179,28 @@
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#8f8d90" />
+        <Setter Property="Foreground" Value="#bebebe" />
         <Setter Property="Margin" Value="0,0,10,0" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
+                <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0,0,10,3" />
+            </DataTrigger>
+        </Style.Triggers>
+
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#8f8d90" />
+        <Setter Property="Foreground" Value="#bebebe" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
+                <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0,0,0,3" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
     <Style
         x:Key="PreviewBorderStyle"

Flow.Launcher/Themes/Sublime.xaml

@@ -27,7 +27,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#303840" />
         <Setter Property="Foreground" Value="#798189" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Height" Value="42" />

Flow.Launcher/Themes/Ubuntu.xaml

@@ -160,7 +160,7 @@
         <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#fa7941" />
+        <Setter Property="Foreground" Value="#c2c2c2" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Width" Value="25" />
@@ -174,7 +174,7 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
+        <Setter Property="Margin" Value="0,0,54,2" />
     </Style>
     <Style
         x:Key="ClockBox"

Flow.Launcher/Themes/Win10Light.xaml

@@ -1,199 +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>
-    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        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}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#0a68d8" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="CaretBrush" Value="#000000" />
-        <Setter Property="BorderBrush" Value="Black" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#dddddd" />
-        <Setter Property="Foreground" Value="#c6c6c6" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#aaaaaa" />
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="Background" Value="#dddddd" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#0a68d8" />
-    </Style>
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        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">#ccd0d4</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="#0078d7" />
-    </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>
-    <!--  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="Focusable" Value="false" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#bebebe"
-                        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="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#c6c6c6" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,4" />
-    </Style>
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#555555" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#c6c6c6" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Win10System.xaml

@@ -1,3 +1,8 @@
+<!--
+    Name: Windows 10
+    IsDark: True
+    HasBlur: False
+-->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -24,21 +29,19 @@
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
-        <Setter Property="FontSize" Value="24" />
+        <Setter Property="FontSize" Value="22" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="{DynamicResource Color01B}" />
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style
@@ -55,7 +58,6 @@
         BasedOn="{StaticResource BaseWindowStyle}"
         TargetType="{x:Type Window}">
         <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
     </Style>
 
     <Style
@@ -105,7 +107,7 @@
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="{DynamicResource InlineHighlight}" />
+        <Setter Property="Inline.FontWeight" Value="SemiBold" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
@@ -151,28 +153,35 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
+        <Setter Property="Width" Value="30" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="1" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Margin" Value="0 0 16 0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
@@ -190,7 +199,6 @@
         x:Key="PreviewItemSubTitleStyle"
         BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
         <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
         <Setter Property="FontSize" Value="13" />
     </Style>

Flow.Launcher/Themes/Win11Dark.xaml

@@ -1,195 +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>
-    <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
-    <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="#4a5459" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Foreground" Value="#FFFFFF" />
-        <Setter Property="CaretBrush" Value="#FFFFFF" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#202020" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#3f3f3f" />
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background" Value="#202020" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="White" />
-    </Style>
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="FontWeight" Value="Regular" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <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="#7b7b7b" />
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="FontWeight" Value="Regular" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</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="#0078d7" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <!--  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="#9a9a9a"
-                        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="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#4d4d4d" />
-        <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="#4d4d4d" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#4d4d4d" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-</ResourceDictionary>

Flow.Launcher/Themes/Win11Light.xaml

@@ -1,72 +1,77 @@
+<!--
+    Name: Windows 11
+    IsDark: True
+    HasBlur: False
+-->
 <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>
-    <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="38" />
+        <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="38" />
+        <Setter Property="CornerRadius" Value="2" />
+        <Setter Property="Background" Value="{StaticResource SystemAccentColorLight1Brush}" />
+    </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         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" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="Margin" Value="-4 0 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#0a68d8" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="CaretBrush" Value="#000000" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="Padding" Value="0 0 50 0" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
+        <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
+        <Setter Property="FontSize" Value="18" />
         <Setter Property="Height" Value="42" />
     </Style>
+
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="#b5b5b5" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="Padding" Value="0 0 50 0" />
         <Setter Property="Height" Value="42" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
     </Style>
+
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#aaaaaa" />
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                    <GradientStop Offset="0" Color="#f4f1f8" />
-                    <GradientStop Offset="0.8" Color="#f9f2e8" />
-                    <GradientStop Offset="1" Color="#f9f0f3" />
-                </LinearGradientBrush>
-
-            </Setter.Value>
-        </Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
+        <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <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}"
@@ -77,69 +82,47 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </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="{DynamicResource SubTitleForeground}" />
     </Style>
     <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0 0 0 0" />
     </Style>
+    <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</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="#0078d7" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#acacac" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleSelectedForeground}" />
     </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor ItemSelectedBackgroundColorBrush}" />
+
     <!--  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="#868686"
+                        Background="{DynamicResource ThumbColor}"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -152,58 +135,84 @@
         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="#eaeaea" />
-        <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="#555555" />
+        <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
+        <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="Opacity" Value="0.2" />
+        <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="{DynamicResource HotkeyForeground}" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="-4 0 0 0" />
+        <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 5 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 10 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="#acacac" />
-        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#eaeaea" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SeparatorForeground}" />
+        <Setter Property="Margin" Value="5 0 10 0" />
     </Style>
     <Style
         x:Key="PreviewItemTitleStyle"
         BasedOn="{StaticResource BasePreviewItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="PreviewItemSubTitleStyle"
         BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
     </Style>
     <Style
         x:Key="PreviewGlyph"
         BasedOn="{StaticResource BasePreviewGlyph}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
 </ResourceDictionary>

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -407,6 +407,10 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        #endregion
+
+        #region BasicCommands
+
         [RelayCommand]
         private void OpenSetting()
         {
@@ -581,56 +585,6 @@ namespace Flow.Launcher.ViewModel
             Settings.MaxResultsToShow -= 1;
         }
 
-        [RelayCommand]
-        public void TogglePreview()
-        {
-            if (!PreviewVisible)
-            {
-                ShowPreview();
-            }
-            else
-            {
-                HidePreview();
-            }
-
-            ContextMenu.IsPreviewOn = PreviewVisible;
-            History.IsPreviewOn = PreviewVisible;
-            Results.IsPreviewOn = PreviewVisible;
-        }
-
-        private void ShowPreview()
-        {
-            ResultAreaColumn = 1;
-            PreviewVisible = true;
-            Results.SelectedItem?.LoadPreviewImage();
-        }
-
-        private void HidePreview()
-        {
-            ResultAreaColumn = 3;
-            PreviewVisible = false;
-        }
-
-        public void ResetPreview()
-        {
-            if (Settings.AlwaysPreview == true)
-            {
-                ShowPreview();
-            }
-            else
-            {
-                HidePreview();
-            }
-        }
-
-        private void UpdatePreview()
-        {
-            if (PreviewVisible)
-            {
-                Results.SelectedItem?.LoadPreviewImage();
-            }
-        }
-
         /// <summary>
         /// we need move cursor to end when we manually changed query
         /// but we don't want to move cursor to end when query is updated from TextBox
@@ -805,10 +759,186 @@ namespace Flow.Launcher.ViewModel
         public string Image => Constant.QueryTextBoxIconImagePath;
 
         public bool StartWithEnglishMode => Settings.AlwaysStartEn;
+        
+        #endregion
 
-        public bool PreviewVisible { get; set; } = false;
+        #region Preview
 
-        public int ResultAreaColumn { get; set; } = 1;
+        public bool InternalPreviewVisible
+        {
+            get
+            {
+                if (ResultAreaColumn == ResultAreaColumnPreviewShown)
+                    return true;
+
+                if (ResultAreaColumn == ResultAreaColumnPreviewHidden)
+                    return false;
+#if DEBUG
+                throw new NotImplementedException("ResultAreaColumn should match ResultAreaColumnPreviewShown/ResultAreaColumnPreviewHidden value");
+#else
+                Log.Error("MainViewModel", "ResultAreaColumnPreviewHidden/ResultAreaColumnPreviewShown int value not implemented", "InternalPreviewVisible");
+#endif
+                return false;
+            }
+        }
+
+        private static readonly int ResultAreaColumnPreviewShown = 1;
+
+        private static readonly int ResultAreaColumnPreviewHidden = 3;
+
+        public int ResultAreaColumn { get; set; } = ResultAreaColumnPreviewShown;
+
+        // This is not a reliable indicator of whether external preview is visible due to the
+        // ability of manually closing/exiting the external preview program which, does not inform flow that
+        // preview is no longer available.
+        public bool ExternalPreviewVisible { get; set; } = false;
+
+        private void ShowPreview()
+        {
+            var useExternalPreview = PluginManager.UseExternalPreview();
+
+            switch (useExternalPreview)
+            {
+                case true
+                    when CanExternalPreviewSelectedResult(out var path):
+                    // Internal preview may still be on when user switches to external
+                    if (InternalPreviewVisible)
+                        HideInternalPreview();
+                    OpenExternalPreview(path);
+                    break;
+
+                case true
+                    when !CanExternalPreviewSelectedResult(out var _):
+                    if (ExternalPreviewVisible)
+                        CloseExternalPreview();
+                    ShowInternalPreview();
+                    break;
+
+                case false:
+                    ShowInternalPreview();
+                    break;
+            }
+        }
+
+        private void HidePreview()
+        {            
+            if (PluginManager.UseExternalPreview())
+                CloseExternalPreview();
+
+            if (InternalPreviewVisible)
+                HideInternalPreview();
+        }
+
+        [RelayCommand]
+        private void TogglePreview()
+        {
+            if (InternalPreviewVisible || ExternalPreviewVisible)
+            {
+                HidePreview();
+            }
+            else
+            {
+                ShowPreview();
+            }
+        }
+
+        private void ToggleInternalPreview()
+        {
+            if (!InternalPreviewVisible)
+            {
+                ShowInternalPreview();
+            }
+            else
+            {
+                HideInternalPreview();
+            }
+        }
+
+        private void OpenExternalPreview(string path, bool sendFailToast = true)
+        {
+            _ = PluginManager.OpenExternalPreviewAsync(path, sendFailToast).ConfigureAwait(false);
+            ExternalPreviewVisible = true;
+        }
+
+        private void CloseExternalPreview()
+        {
+            _ = PluginManager.CloseExternalPreviewAsync().ConfigureAwait(false);
+            ExternalPreviewVisible = false;
+        }
+
+        private void SwitchExternalPreview(string path, bool sendFailToast = true)
+        {
+            _ = PluginManager.SwitchExternalPreviewAsync(path,sendFailToast).ConfigureAwait(false);
+        }
+
+        private void ShowInternalPreview()
+        {
+            ResultAreaColumn = ResultAreaColumnPreviewShown;
+            Results.SelectedItem?.LoadPreviewImage();
+        }
+
+        private void HideInternalPreview()
+        {
+            ResultAreaColumn = ResultAreaColumnPreviewHidden;
+        }
+
+        public void ResetPreview()
+        {
+            switch (Settings.AlwaysPreview)
+            {
+                case true
+                    when PluginManager.AllowAlwaysPreview() && CanExternalPreviewSelectedResult(out var path):
+                    OpenExternalPreview(path);
+                    break;
+
+                case true:
+                    ShowInternalPreview();
+                    break;
+
+                case false:
+                    HidePreview();
+                    break;
+            }
+        }
+        
+        private void UpdatePreview()
+        {
+            switch (PluginManager.UseExternalPreview())
+            {
+                case true
+                    when CanExternalPreviewSelectedResult(out var path):
+                    if (ExternalPreviewVisible)
+                    {
+                        SwitchExternalPreview(path, false);
+                    }
+                    else if (InternalPreviewVisible)
+                    {
+                        HideInternalPreview();
+                        OpenExternalPreview(path);
+                    }
+                    break;
+
+                case true
+                    when !CanExternalPreviewSelectedResult(out var _):
+                    if (ExternalPreviewVisible)
+                    {
+                        CloseExternalPreview();
+                        ShowInternalPreview();
+                    }
+                    break;
+
+                case false
+                    when InternalPreviewVisible:
+                    Results.SelectedItem?.LoadPreviewImage();
+                    break;
+            }
+        }
+
+        private bool CanExternalPreviewSelectedResult(out string path)
+        {
+            path = Results.SelectedItem?.Result?.Preview.FilePath;
+            return !string.IsNullOrEmpty(path);
+        }
 
         #endregion
 
@@ -1232,6 +1362,9 @@ namespace Flow.Launcher.ViewModel
             lastContextMenuResult = new Result();
             lastContextMenuResults = new List<Result>();
 
+            if (ExternalPreviewVisible)
+                CloseExternalPreview();
+
             if (!SelectedIsFromQueryResults())
             {
                 SelectedResults = Results;

Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs

@@ -9,6 +9,7 @@ using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 using System.Linq;
+using Flow.Launcher.Plugin.Explorer.Helper;
 using MessageBox = System.Windows.Forms.MessageBox;
 using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon;
 using MessageBoxButton = System.Windows.Forms.MessageBoxButtons;
@@ -222,34 +223,7 @@ namespace Flow.Launcher.Plugin.Explorer
                             if (record.Type is ResultType.Volume)
                                 return false;
 
-                            var screenWithMouseCursor = System.Windows.Forms.Screen.FromPoint(System.Windows.Forms.Cursor.Position);
-                            var xOfScreenCenter = screenWithMouseCursor.WorkingArea.Left + screenWithMouseCursor.WorkingArea.Width / 2;
-                            var yOfScreenCenter = screenWithMouseCursor.WorkingArea.Top + screenWithMouseCursor.WorkingArea.Height / 2;
-                            var showPosition = new System.Drawing.Point(xOfScreenCenter, yOfScreenCenter);
-
-                            switch (record.Type)
-                            {
-                                case ResultType.File:
-                                {
-                                    var fileInfos = new FileInfo[]
-                                    {
-                                        new(record.FullPath)
-                                    };
-
-                                    new Peter.ShellContextMenu().ShowContextMenu(fileInfos, showPosition);
-                                    break;
-                                }
-                                case ResultType.Folder:
-                                {
-                                    var directoryInfos = new DirectoryInfo[]
-                                    {
-                                        new(record.FullPath)
-                                    };
-
-                                    new Peter.ShellContextMenu().ShowContextMenu(directoryInfos, showPosition);
-                                    break;
-                                }
-                            }
+                            ResultManager.ShowNativeContextMenu(record.FullPath, record.Type);
 
                             return false;
                         },
@@ -279,6 +253,45 @@ namespace Flow.Launcher.Plugin.Explorer
                         IcoPath = Constants.DifferentUserIconImagePath,
                         Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue748"),
                     });
+
+                if (record.Type is ResultType.File or ResultType.Folder && Settings.ShowInlinedWindowsContextMenu)
+                {
+                    var includedItems = Settings
+                        .WindowsContextMenuIncludedItems
+                        .Replace("\r", "")
+                        .Split("\n")
+                        .Where(v => !string.IsNullOrWhiteSpace(v))
+                        .ToArray();
+                    var excludedItems = Settings
+                        .WindowsContextMenuExcludedItems
+                        .Replace("\r", "")
+                        .Split("\n")
+                        .Where(v => !string.IsNullOrWhiteSpace(v))
+                        .ToArray();
+                    var menuItems = ShellContextMenuDisplayHelper
+                        .GetContextMenuWithIcons(record.FullPath)
+                        .Where(contextMenuItem =>
+                            (includedItems.Length == 0 || includedItems.Any(filter =>
+                                contextMenuItem.Label.Contains(filter, StringComparison.OrdinalIgnoreCase)
+                            )) &&
+                            (excludedItems.Length == 0 || !excludedItems.Any(filter =>
+                                contextMenuItem.Label.Contains(filter, StringComparison.OrdinalIgnoreCase)
+                            ))
+                        );
+                    foreach (var menuItem in menuItems)
+                    {
+                        contextMenus.Add(new Result
+                        {
+                            Title = menuItem.Label,
+                            Icon = () => menuItem.Icon,
+                            Action = _ =>
+                            {
+                                ShellContextMenuDisplayHelper.ExecuteContextMenuItem(record.FullPath, menuItem.CommandId);
+                                return true;
+                            }
+                        });
+                    }
+                }
             }
 
             return contextMenus;

Plugins/Flow.Launcher.Plugin.Explorer/Helper/ShellContextMenuDisplayHelper.cs

@@ -0,0 +1,524 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Flow.Launcher.Plugin.Explorer.Helper;
+
+public static class ShellContextMenuDisplayHelper
+{
+    #region DllImport
+
+    [DllImport("shell32.dll")]
+    private static extern Int32 SHGetMalloc(out IntPtr hObject);
+
+    [DllImport("shell32.dll")]
+    private static extern Int32 SHParseDisplayName(
+        [MarshalAs(UnmanagedType.LPWStr)] string pszName,
+        IntPtr pbc,
+        out IntPtr ppidl,
+        UInt32 sfgaoIn,
+        out UInt32 psfgaoOut
+    );
+
+    [DllImport("shell32.dll")]
+    private static extern Int32 SHBindToParent(
+        IntPtr pidl,
+        [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
+        out IntPtr ppv,
+        ref IntPtr ppidlLast
+    );
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern IntPtr CreatePopupMenu();
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern bool DestroyMenu(IntPtr hMenu);
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern uint GetMenuItemCount(IntPtr hMenu);
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern uint GetMenuString(
+        IntPtr hMenu, uint uIDItem, StringBuilder lpString, int nMaxCount, uint uFlag
+    );
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern IntPtr GetSubMenu(IntPtr hMenu, int nPos);
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern bool GetMenuItemInfo(IntPtr hMenu, uint uItem, bool fByPosition, ref MENUITEMINFO lpmii);
+
+    [DllImport("gdi32.dll")]
+    private static extern bool DeleteObject(IntPtr hObject);
+
+    #endregion
+
+    #region Constants
+
+    private const uint ContextMenuStartId = 0x0001;
+    private const uint ContextMenuEndId = 0x7FFF;
+
+    private static readonly string[] IgnoredContextMenuCommands =
+    {
+        // We haven't managed to make these work, so we don't display them in the context menu.
+        "Share",
+        "Windows.ModernShare",
+        "PinToStartScreen",
+        "CopyAsPath",
+
+        // Hide functionality provided by the Explorer plugin itself
+        "Copy",
+        "Delete"
+    };
+
+    #endregion
+
+    #region Enums
+
+    [Flags]
+    enum ContextMenuFlags : uint
+    {
+        Normal = 0x00000000,
+        DefaultOnly = 0x00000001,
+        VerbsOnly = 0x00000002,
+        Explore = 0x00000004,
+        NoVerbs = 0x00000008,
+        CanRename = 0x00000010,
+        NoDefault = 0x00000020,
+        IncludeStatic = 0x00000040,
+        ItemMenu = 0x00000080,
+        ExtendedVerbs = 0x00000100,
+        DisabledVerbs = 0x00000200,
+        AsyncVerbState = 0x00000400,
+        OptimizeForInvoke = 0x00000800,
+        SyncCascadeMenu = 0x00001000,
+        DoNotPickDefault = 0x00002000,
+        Reserved = 0xffff0000
+    }
+
+    [Flags]
+    enum ContextMenuInvokeCommandFlags : uint
+    {
+        Icon = 0x00000010,
+        Hotkey = 0x00000020,
+        FlagNoUi = 0x00000400,
+        Unicode = 0x00004000,
+        NoConsole = 0x00008000,
+        AsyncOk = 0x00100000,
+        NoZoneChecks = 0x00800000,
+        ShiftDown = 0x10000000,
+        ControlDown = 0x40000000,
+        FlagLogUsage = 0x04000000,
+        PointInvoke = 0x20000000
+    }
+
+    [Flags]
+    enum MenuItemInformationMask : uint
+    {
+        Bitmap = 0x00000080,
+        Checkmarks = 0x00000008,
+        Data = 0x00000020,
+        Ftype = 0x00000100,
+        Id = 0x00000002,
+        State = 0x00000001,
+        String = 0x00000040,
+        Submenu = 0x00000004,
+        Type = 0x00000010
+    }
+
+    enum MenuItemFtype : uint
+    {
+        Bitmap = 0x00000004,
+        MenuBarBreak = 0x00000020,
+        MenuBreak = 0x00000040,
+        OwnerDraw = 0x00000100,
+        RadioCheck = 0x00000200,
+        RightJustify = 0x00004000,
+        RightOrder = 0x00002000,
+        Separator = 0x00000800,
+        String = 0x00000000,
+    }
+
+    enum GetCommandStringFlags : uint
+    {
+        VerbA = 0x00000000,
+        HelpTextA = 0x00000001,
+        ValidateA = 0x00000002,
+        Unicode = VerbW,
+        Verb = VerbW,
+        VerbW = 0x00000004,
+        HelpText = HelpTextW,
+        HelpTextW = 0x00000005,
+        Validate = ValidateW,
+        ValidateW = 0x00000006,
+        VerbIconW = 0x00000014
+    }
+    #endregion
+
+    private static IMalloc GetMalloc()
+    {
+        SHGetMalloc(out var pMalloc);
+        return (IMalloc)Marshal.GetTypedObjectForIUnknown(pMalloc, typeof(IMalloc));
+    }
+
+    public static void ExecuteContextMenuItem(string fileName, uint menuItemId)
+    {
+        IMalloc malloc = null;
+        IntPtr originalPidl = IntPtr.Zero;
+        IntPtr pShellFolder = IntPtr.Zero;
+        IntPtr pContextMenu = IntPtr.Zero;
+        IntPtr hMenu = IntPtr.Zero;
+        IContextMenu contextMenu = null;
+        IShellFolder shellFolder = null;
+
+        try
+        {
+            malloc = GetMalloc();
+            var hr = SHParseDisplayName(fileName, IntPtr.Zero, out var pidl, 0, out _);
+            if (hr != 0) throw new Exception("SHParseDisplayName failed");
+
+            originalPidl = pidl;
+
+            var guid = typeof(IShellFolder).GUID;
+            hr = SHBindToParent(pidl, guid, out pShellFolder, ref pidl);
+            if (hr != 0) throw new Exception("SHBindToParent failed");
+
+            shellFolder = (IShellFolder)Marshal.GetTypedObjectForIUnknown(pShellFolder, typeof(IShellFolder));
+            hr = shellFolder.GetUIObjectOf(
+                IntPtr.Zero, 1, new[] { pidl }, typeof(IContextMenu).GUID, IntPtr.Zero, out pContextMenu
+            );
+            if (hr != 0) throw new Exception("GetUIObjectOf failed");
+
+            contextMenu = (IContextMenu)Marshal.GetTypedObjectForIUnknown(pContextMenu, typeof(IContextMenu));
+
+            hMenu = CreatePopupMenu();
+            contextMenu.QueryContextMenu(hMenu, 0, ContextMenuStartId, ContextMenuEndId, (uint)ContextMenuFlags.Explore);
+
+            var directory = Path.GetDirectoryName(fileName);
+            var invokeCommandInfo = new CMINVOKECOMMANDINFO
+            {
+                cbSize = (uint)Marshal.SizeOf(typeof(CMINVOKECOMMANDINFO)),
+                fMask = (uint)ContextMenuInvokeCommandFlags.Unicode,
+                hwnd = IntPtr.Zero,
+                lpVerb = (IntPtr)(menuItemId - ContextMenuStartId),
+                lpParameters = null,
+                lpDirectory = null,
+                nShow = 1,
+                hIcon = IntPtr.Zero,
+            };
+
+            hr = contextMenu.InvokeCommand(ref invokeCommandInfo);
+            if (hr != 0)
+            {
+                throw new Exception($"InvokeCommand failed with code {hr:X}");
+            }
+        }
+        finally
+        {
+            if (hMenu != IntPtr.Zero)
+                DestroyMenu(hMenu);
+
+            if (contextMenu != null)
+                Marshal.ReleaseComObject(contextMenu);
+
+            if (pContextMenu != IntPtr.Zero)
+                Marshal.Release(pContextMenu);
+
+            if (shellFolder != null)
+                Marshal.ReleaseComObject(shellFolder);
+
+            if (pShellFolder != IntPtr.Zero)
+                Marshal.Release(pShellFolder);
+
+            if (originalPidl != IntPtr.Zero)
+                malloc?.Free(originalPidl);
+
+            if (malloc != null)
+                Marshal.ReleaseComObject(malloc);
+        }
+    }
+
+    public static List<ContextMenuItem> GetContextMenuWithIcons(string filePath)
+    {
+        IMalloc malloc = null;
+        IntPtr originalPidl = IntPtr.Zero;
+        IntPtr pShellFolder = IntPtr.Zero;
+        IntPtr pContextMenu = IntPtr.Zero;
+        IntPtr hMenu = IntPtr.Zero;
+        IShellFolder shellFolder = null;
+        IContextMenu contextMenu = null;
+
+        try
+        {
+            malloc = GetMalloc();
+            var hr = SHParseDisplayName(filePath, IntPtr.Zero, out var pidl, 0, out _);
+            if (hr != 0) throw new Exception("SHParseDisplayName failed");
+
+            originalPidl = pidl;
+
+            var guid = typeof(IShellFolder).GUID;
+            hr = SHBindToParent(pidl, guid, out pShellFolder, ref pidl);
+            if (hr != 0) throw new Exception("SHBindToParent failed");
+
+            shellFolder = (IShellFolder)Marshal.GetTypedObjectForIUnknown(pShellFolder, typeof(IShellFolder));
+            hr = shellFolder.GetUIObjectOf(
+                IntPtr.Zero, 1, new[] { pidl }, typeof(IContextMenu).GUID, IntPtr.Zero, out pContextMenu
+            );
+            if (hr != 0) throw new Exception("GetUIObjectOf failed");
+
+            contextMenu = (IContextMenu)Marshal.GetTypedObjectForIUnknown(pContextMenu, typeof(IContextMenu));
+
+            // Without waiting, some items, such as "Send to > Documents", don't always appear, which shifts item ids
+            // even though it shouldn't. Please replace this if you find a better way to fix this bug.
+            Thread.Sleep(200);
+
+            hMenu = CreatePopupMenu();
+            contextMenu.QueryContextMenu(hMenu, 0, ContextMenuStartId, ContextMenuEndId, (uint)ContextMenuFlags.Explore);
+
+            var menuItems = new List<ContextMenuItem>();
+            ProcessMenuWithIcons(hMenu, contextMenu, menuItems);
+
+            return menuItems;
+        }
+        finally
+        {
+            if (hMenu != IntPtr.Zero)
+                DestroyMenu(hMenu);
+
+            if (contextMenu != null)
+                Marshal.ReleaseComObject(contextMenu);
+
+            if (pContextMenu != IntPtr.Zero)
+                Marshal.Release(pContextMenu);
+
+            if (shellFolder != null)
+                Marshal.ReleaseComObject(shellFolder);
+
+            if (pShellFolder != IntPtr.Zero)
+                Marshal.Release(pShellFolder);
+
+            if (originalPidl != IntPtr.Zero)
+                malloc?.Free(originalPidl);
+
+            if (malloc != null)
+                Marshal.ReleaseComObject(malloc);
+        }
+    }
+
+
+    private static void ProcessMenuWithIcons(IntPtr hMenu, IContextMenu contextMenu, List<ContextMenuItem> menuItems, string prefix = "")
+    {
+        uint menuCount = GetMenuItemCount(hMenu);
+
+        for (uint i = 0; i < menuCount; i++)
+        {
+            var mii = new MENUITEMINFO
+            {
+                cbSize = (uint)Marshal.SizeOf(typeof(MENUITEMINFO)),
+                fMask = (uint)(MenuItemInformationMask.Bitmap | MenuItemInformationMask.Ftype |
+                               MenuItemInformationMask.Submenu | MenuItemInformationMask.Id)
+            };
+
+            GetMenuItemInfo(hMenu, i, true, ref mii);
+            var menuText = new StringBuilder(256);
+            uint result = GetMenuString(hMenu, mii.wID, menuText, menuText.Capacity, 0);
+
+            if (result == 0 || string.IsNullOrWhiteSpace(menuText.ToString()))
+            {
+                continue;
+            }
+
+            menuText.Replace("&", "");
+
+            IntPtr hSubMenu = GetSubMenu(hMenu, (int)i);
+            if (hSubMenu != IntPtr.Zero)
+            {
+                ProcessMenuWithIcons(hSubMenu, contextMenu, menuItems, prefix + menuText + " > ");
+            }
+            else if (!string.IsNullOrWhiteSpace(menuText.ToString()))
+            {
+                var commandBuilder = new StringBuilder(256);
+                contextMenu.GetCommandString(
+                    mii.wID - ContextMenuStartId,
+                    (uint)GetCommandStringFlags.Verb,
+                    IntPtr.Zero,
+                    commandBuilder,
+                    commandBuilder.Capacity
+                );
+                if (IgnoredContextMenuCommands.Contains(commandBuilder.ToString(), StringComparer.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                ImageSource icon = null;
+                if (mii.hbmpItem != IntPtr.Zero)
+                {
+                    icon = GetBitmapSourceFromHBitmap(mii.hbmpItem);
+                }
+                else if (mii.hbmpChecked != IntPtr.Zero)
+                {
+                    icon = GetBitmapSourceFromHBitmap(mii.hbmpChecked);
+                }
+
+                menuItems.Add(new ContextMenuItem(prefix + menuText, icon, mii.wID));
+            }
+        }
+    }
+
+    private static BitmapSource GetBitmapSourceFromHBitmap(IntPtr hBitmap)
+    {
+        try
+        {
+            var bitmapSource = Imaging.CreateBitmapSourceFromHBitmap(
+                hBitmap,
+                IntPtr.Zero,
+                Int32Rect.Empty,
+                BitmapSizeOptions.FromWidthAndHeight(16, 16)
+            );
+
+            if (!DeleteObject(hBitmap))
+            {
+                throw new Exception("Failed to delete HBitmap.");
+            }
+
+            return bitmapSource;
+        }
+        catch (COMException)
+        {
+            // ignore
+        }
+
+        return null;
+    }
+}
+
+#region Data Structures
+
+[ComImport]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("000214E6-0000-0000-C000-000000000046")]
+public interface IShellFolder
+{
+    [PreserveSig]
+    int ParseDisplayName(
+        IntPtr hwnd, IntPtr pbc, [In, MarshalAs(UnmanagedType.LPWStr)] string pszDisplayName, out uint pchEaten,
+        out IntPtr ppidl, ref uint pdwAttributes
+    );
+
+    [PreserveSig]
+    int EnumObjects(IntPtr hwnd, uint grfFlags, out IntPtr ppenumIDList);
+
+    [PreserveSig]
+    int BindToObject(IntPtr pidl, IntPtr pbc, [In, MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv);
+
+    [PreserveSig]
+    int BindToStorage(IntPtr pidl, IntPtr pbc, [In, MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv);
+
+    [PreserveSig]
+    int CompareIDs(IntPtr lParam, IntPtr pidl1, IntPtr pidl2);
+
+    [PreserveSig]
+    int CreateViewObject(IntPtr hwndOwner, [In, MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv);
+
+    [PreserveSig]
+    int GetAttributesOf(
+        uint cidl, [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] apidl, ref uint rgfInOut
+    );
+
+    [PreserveSig]
+    int GetUIObjectOf(
+        IntPtr hwndOwner, uint cidl, [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] apidl,
+        [In, MarshalAs(UnmanagedType.LPStruct)]
+        Guid riid, IntPtr rgfReserved, out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetDisplayNameOf(IntPtr pidl, uint uFlags, IntPtr pName);
+
+    [PreserveSig]
+    int SetNameOf(
+        IntPtr hwnd, IntPtr pidl, [In, MarshalAs(UnmanagedType.LPWStr)] string pszName, uint uFlags, out IntPtr ppidlOut
+    );
+}
+
+[ComImport]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("00000002-0000-0000-C000-000000000046")]
+public interface IMalloc
+{
+    [PreserveSig]
+    IntPtr Alloc(UInt32 cb);
+
+    [PreserveSig]
+    IntPtr Realloc(IntPtr pv, UInt32 cb);
+
+    [PreserveSig]
+    void Free(IntPtr pv);
+
+    [PreserveSig]
+    UInt32 GetSize(IntPtr pv);
+
+    [PreserveSig]
+    Int16 DidAlloc(IntPtr pv);
+
+    [PreserveSig]
+    void HeapMinimize();
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct CMINVOKECOMMANDINFO
+{
+    public uint cbSize;
+    public uint fMask;
+    public IntPtr hwnd;
+    public IntPtr lpVerb;
+    [MarshalAs(UnmanagedType.LPStr)] public string lpParameters;
+    [MarshalAs(UnmanagedType.LPStr)] public string lpDirectory;
+    public int nShow;
+    public uint dwHotKey;
+    public IntPtr hIcon;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct MENUITEMINFO
+{
+    public uint cbSize;
+    public uint fMask;
+    public uint fType;
+    public uint fState;
+    public uint wID;
+    public IntPtr hSubMenu;
+    public IntPtr hbmpChecked;
+    public IntPtr hbmpUnchecked;
+    public IntPtr dwItemData;
+    public IntPtr dwTypeData;
+    public uint cch;
+    public IntPtr hbmpItem;
+}
+
+[ComImport]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("000214E4-0000-0000-C000-000000000046")]
+public interface IContextMenu
+{
+    [PreserveSig]
+    int QueryContextMenu(IntPtr hmenu, uint indexMenu, uint idCmdFirst, uint idCmdLast, uint uFlags);
+
+    [PreserveSig]
+    int InvokeCommand(ref CMINVOKECOMMANDINFO pici);
+
+    [PreserveSig]
+    int GetCommandString(uint idcmd, uint uflags, IntPtr reserved, StringBuilder commandstring, int cch);
+}
+
+public record ContextMenuItem(string Label, ImageSource Icon, uint CommandId);
+
+#endregion

Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml

@@ -152,4 +152,9 @@
     <system:String x:Key="flowlauncher_plugin_everything_enable_content_search">Do you want to enable content search for Everything?</system:String>
     <system:String x:Key="flowlauncher_plugin_everything_enable_content_search_tips">It can be very slow without index (which is only supported in Everything v1.5+)</system:String>
 
+    <!--  Native Context Menu  -->
+    <system:String x:Key="plugin_explorer_native_context_menu_header">Native Context Menu</system:String>
+    <system:String x:Key="plugin_explorer_native_context_menu_display_context_menu">Display native context menu (experimental)</system:String>
+    <system:String x:Key="plugin_explorer_native_context_menu_include_patterns_guide">Below you can specify items you want to include in the context menu, they can be partial (e.g. 'pen wit') or complete ('Open with').</system:String>
+    <system:String x:Key="plugin_explorer_native_context_menu_exclude_patterns_guide">Below you can specify items you want to exclude from context menu, they can be partial (e.g. 'pen wit') or complete ('Open with')</system:String>
 </ResourceDictionary>

Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs

@@ -11,6 +11,7 @@ using System.Windows.Input;
 using Path = System.IO.Path;
 using System.Windows.Controls;
 using Flow.Launcher.Plugin.Explorer.Views;
+using Peter;
 
 namespace Flow.Launcher.Plugin.Explorer.Search
 {
@@ -70,6 +71,27 @@ namespace Flow.Launcher.Plugin.Explorer.Search
             };
         }
 
+        internal static void ShowNativeContextMenu(string path, ResultType type)
+        {
+            var screenWithMouseCursor = System.Windows.Forms.Screen.FromPoint(System.Windows.Forms.Cursor.Position);
+            var xOfScreenCenter = screenWithMouseCursor.WorkingArea.Left + screenWithMouseCursor.WorkingArea.Width / 2;
+            var yOfScreenCenter = screenWithMouseCursor.WorkingArea.Top + screenWithMouseCursor.WorkingArea.Height / 2;
+            var showPosition = new System.Drawing.Point(xOfScreenCenter, yOfScreenCenter);
+
+            switch (type)
+            {
+                case ResultType.File:
+                    var fileInfo = new FileInfo[] { new(path) };
+                    new ShellContextMenu().ShowContextMenu(fileInfo, showPosition);
+                    break;
+
+                case ResultType.Folder:
+                    var folderInfo = new System.IO.DirectoryInfo[] { new(path) };
+                    new ShellContextMenu().ShowContextMenu(folderInfo, showPosition);
+                    break;
+            }
+        }
+
         internal static Result CreateFolderResult(string title, string subtitle, string path, Query query, int score = 0, bool windowsIndexed = false)
         {
             return new Result
@@ -80,8 +102,17 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 AutoCompleteText = GetAutoCompleteText(title, query, path, ResultType.Folder),
                 TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
                 CopyText = path,
+                Preview = new Result.PreviewInfo
+                {
+                    FilePath = path,
+                },
                 Action = c =>
                 {
+                    if (c.SpecialKeyState.ToModifierKeys() == ModifierKeys.Alt)
+                    {
+                        ShowNativeContextMenu(path, ResultType.Folder);
+                        return false;
+                    }
                     // open folder
                     if (c.SpecialKeyState.ToModifierKeys() == (ModifierKeys.Control | ModifierKeys.Shift))
                     {
@@ -165,6 +196,10 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 Score = 500,
                 ProgressBar = progressValue,
                 ProgressBarColor = progressBarColor,
+                Preview = new Result.PreviewInfo
+                {
+                    FilePath = path,
+                },
                 Action = _ =>
                 {
                     OpenFolder(path);
@@ -218,8 +253,13 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 IcoPath = folderPath,
                 Score = 500,
                 CopyText = folderPath,
-                Action = _ =>
+                Action = c =>
                 {
+                    if (c.SpecialKeyState.ToModifierKeys() == ModifierKeys.Alt)
+                    {
+                        ShowNativeContextMenu(folderPath, ResultType.Folder);
+                        return false;
+                    }
                     OpenFolder(folderPath);
                     return true;
                 },
@@ -229,10 +269,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
 
         internal static Result CreateFileResult(string filePath, Query query, int score = 0, bool windowsIndexed = false)
         {
-            Result.PreviewInfo preview = IsMedia(Path.GetExtension(filePath))
-                ? new Result.PreviewInfo { IsMedia = true, PreviewImagePath = filePath, }
-                : Result.PreviewInfo.Default;
-
+            bool isMedia = IsMedia(Path.GetExtension(filePath));
             var title = Path.GetFileName(filePath);
 
 
@@ -243,7 +280,12 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 Title = title,
                 SubTitle = Path.GetDirectoryName(filePath),
                 IcoPath = filePath,
-                Preview = preview,
+                Preview = new Result.PreviewInfo
+                {
+                    IsMedia = isMedia,
+                    PreviewImagePath = isMedia ? filePath : null,
+                    FilePath = filePath,
+                },
                 AutoCompleteText = GetAutoCompleteText(title, query, filePath, ResultType.File),
                 TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
                 Score = score,
@@ -251,6 +293,11 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 PreviewPanel = new Lazy<UserControl>(() => new PreviewPanel(Settings, filePath)),
                 Action = c =>
                 {
+                    if (c.SpecialKeyState.ToModifierKeys() == ModifierKeys.Alt)
+                    {
+                        ShowNativeContextMenu(filePath, ResultType.File);
+                        return false;
+                    }
                     try
                     {
                         if (c.SpecialKeyState.ToModifierKeys() == (ModifierKeys.Control | ModifierKeys.Shift))

Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs

@@ -28,7 +28,11 @@ namespace Flow.Launcher.Plugin.Explorer
 
         public bool UseLocationAsWorkingDir { get; set; } = false;
 
-        public bool ShowWindowsContextMenu { get; set; } = true;
+        public bool ShowInlinedWindowsContextMenu { get; set; } = false;
+
+        public string WindowsContextMenuIncludedItems { get; set; } = string.Empty;
+
+        public string WindowsContextMenuExcludedItems { get; set; } = string.Empty;
 
         public bool DefaultOpenFolderInFileManager { get; set; } = false;
 
@@ -62,7 +66,7 @@ namespace Flow.Launcher.Plugin.Explorer
         public bool ShowModifiedDateInPreviewPanel { get; set; } = true;
 
         public string PreviewPanelDateFormat { get; set; } = "yyyy-MM-dd";
-        
+
         public string PreviewPanelTimeFormat { get; set; } = "HH:mm";
 
         private EverythingSearchManager _everythingManagerInstance;

Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs

@@ -102,6 +102,40 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
 
         #endregion
 
+        #region Native Context Menu
+
+        public bool ShowWindowsContextMenu
+        {
+            get => Settings.ShowInlinedWindowsContextMenu;
+            set
+            {
+                Settings.ShowInlinedWindowsContextMenu = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string WindowsContextMenuIncludedItems
+        {
+            get => Settings.WindowsContextMenuIncludedItems;
+            set
+            {
+                Settings.WindowsContextMenuIncludedItems = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string WindowsContextMenuExcludedItems
+        {
+            get => Settings.WindowsContextMenuExcludedItems;
+            set
+            {
+                Settings.WindowsContextMenuExcludedItems = value;
+                OnPropertyChanged();
+            }
+        }
+
+        #endregion
+
         #region Preview Panel
 
         public bool ShowFileSizeInPreviewPanel

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

@@ -22,7 +22,7 @@
 
                         <Border
                             x:Name="LayoutRoot"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             Padding="{TemplateBinding Padding}"
                             SnapsToDevicePixels="True">
                             <Grid>
@@ -105,13 +105,13 @@
             </Setter>
         </Style>
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
-            <TextBlock Margin="0,5,0,5" Text="{Binding Path, Mode=OneTime}" />
+            <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
         <core:TranslationConverter x:Key="TranslationConverter" />
         <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
                 <TextBlock
-                    Margin="0,5,0,0"
+                    Margin="0 5 0 0"
                     IsEnabled="{Binding Enabled}"
                     Text="{Binding Description, Mode=OneTime, Converter={StaticResource TranslationConverter}}">
                     <TextBlock.Style>
@@ -128,7 +128,7 @@
                     </TextBlock.Style>
                 </TextBlock>
                 <TextBlock
-                    Margin="250,5,0,0"
+                    Margin="250 5 0 0"
                     IsEnabled="{Binding Enabled}"
                     Text="{Binding Keyword}">
                     <TextBlock.Style>
@@ -160,20 +160,20 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_generalsetting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Grid.Row="0" Margin="30,10,0,0">
+                <StackPanel Grid.Row="0" Margin="30 10 0 0">
                     <StackPanel>
                         <StackPanel Orientation="Vertical">
                             <CheckBox
-                                Margin="0,10,0,0"
+                                Margin="0 10 0 0"
                                 HorizontalAlignment="Left"
                                 Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
                                 IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
                             <CheckBox
-                                Margin="0,10,0,0"
+                                Margin="0 10 0 0"
                                 HorizontalAlignment="Left"
                                 Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
                                 IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-                            <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                            <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
@@ -188,7 +188,7 @@
                                     <TextBlock
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="0,6,16,6"
+                                        Margin="0 6 16 6"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_file_editor_path}"
@@ -196,7 +196,7 @@
                                     <StackPanel
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Margin="0,6,6,6"
+                                        Margin="0 6 6 6"
                                         Orientation="Horizontal">
                                         <TextBox
                                             Width="250"
@@ -206,7 +206,7 @@
                                             TextWrapping="NoWrap" />
                                         <Button
                                             MinWidth="50"
-                                            Margin="5,0,0,0"
+                                            Margin="5 0 0 0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
                                             Command="{Binding OpenFileEditorPath}"
@@ -216,7 +216,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="0,6,16,6"
+                                        Margin="0 6 16 6"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_folder_editor_path}"
@@ -224,7 +224,7 @@
                                     <StackPanel
                                         Grid.Row="1"
                                         Grid.Column="1"
-                                        Margin="0,6,6,6"
+                                        Margin="0 6 6 6"
                                         Orientation="Horizontal">
                                         <TextBox
                                             Width="250"
@@ -234,7 +234,7 @@
                                             TextWrapping="NoWrap" />
                                         <Button
                                             MinWidth="50"
-                                            Margin="5,0,0,0"
+                                            Margin="5 0 0 0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
                                             Command="{Binding OpenFolderEditorPath}"
@@ -244,7 +244,7 @@
                                     <TextBlock
                                         Grid.Row="2"
                                         Grid.Column="0"
-                                        Margin="0,16,6,6"
+                                        Margin="0 16 6 6"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_shell_path}"
@@ -255,14 +255,14 @@
                                         Orientation="Horizontal">
                                         <TextBox
                                             Width="250"
-                                            Margin="0,10,0,0"
+                                            Margin="0 10 0 0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
                                             Text="{Binding ShellPath}"
                                             TextWrapping="NoWrap" />
                                         <Button
                                             MinWidth="50"
-                                            Margin="5,10,0,0"
+                                            Margin="5 10 0 0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
                                             Command="{Binding OpenShellPath}"
@@ -271,7 +271,7 @@
                                 </Grid>
                             </StackPanel>
 
-                            <StackPanel Margin="0,0,0,5" Orientation="Horizontal">
+                            <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
@@ -285,7 +285,7 @@
                                     <TextBlock
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="0,0,10,0"
+                                        Margin="0 0 10 0"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
                                         TextBlock.Foreground="{DynamicResource Color05B}" />
@@ -293,7 +293,7 @@
                                         Grid.Row="0"
                                         Grid.Column="1"
                                         Width="250"
-                                        Margin="10,15,10,10"
+                                        Margin="10 15 10 10"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         DisplayMemberPath="Description"
@@ -302,7 +302,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="0,0,10,0"
+                                        Margin="0 0 10 0"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
                                         TextBlock.Foreground="{DynamicResource Color05B}" />
@@ -319,7 +319,7 @@
                                     <TextBlock
                                         Grid.Row="2"
                                         Grid.Column="0"
-                                        Margin="0,0,10,0"
+                                        Margin="0 0 10 0"
                                         VerticalAlignment="Center"
                                         Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
                                         TextBlock.Foreground="{DynamicResource Color05B}" />
@@ -337,8 +337,8 @@
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
                                 <Button
-                                    Margin="0,10,10,20"
-                                    Padding="20,10,20,10"
+                                    Margin="0 10 10 20"
+                                    Padding="20 10 20 10"
                                     Click="btnOpenIndexingOptions_Click"
                                     Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
                             </StackPanel>
@@ -348,50 +348,106 @@
                     </StackPanel>
                 </StackPanel>
             </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_native_context_menu_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Margin="30 20 10 10">
+                    <CheckBox
+                        Margin="0 0 0 0"
+                        Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
+                        IsChecked="{Binding ShowWindowsContextMenu}" />
+
+                    <Grid Margin="0 10 20 10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="0 0 6 6"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Height="300"
+                            Margin="0 6 6 0"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuIncludedItems}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="6 0 0 6"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Height="300"
+                            Margin="6 6 0 0"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuExcludedItems}"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </StackPanel>
+            </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30,20,0,10">
+                <StackPanel Margin="30 20 0 10">
                     <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
                     <CheckBox
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
                         IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
 
                     <CheckBox
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
                         IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
 
                     <CheckBox
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
                         IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
 
                     <StackPanel
-                        Margin="0,20,0,0"
+                        Margin="0 20 0 0"
                         IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
                         Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
                         <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}" />
-                        <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
                             <ComboBox
                                 Width="200"
                                 ItemsSource="{Binding DateFormatList}"
                                 SelectedItem="{Binding PreviewPanelDateFormat}" />
                             <TextBlock
-                                Margin="12,0,0,0"
+                                Margin="12 0 0 0"
                                 VerticalAlignment="Center"
                                 Foreground="{DynamicResource Color05B}"
                                 Text="{Binding PreviewPanelDateFormatDemo}" />
                         </StackPanel>
-                        <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
                             <ComboBox
                                 Width="200"
                                 ItemsSource="{Binding TimeFormatList}"
                                 SelectedItem="{Binding PreviewPanelTimeFormat}" />
                             <TextBlock
-                                Margin="12,0,0,0"
+                                Margin="12 0 0 0"
                                 VerticalAlignment="Center"
                                 Foreground="{DynamicResource Color05B}"
                                 Text="{Binding PreviewPanelTimeFormatDemo}" />
@@ -405,12 +461,12 @@
                 Style="{DynamicResource ExplorerTabItem}">
                 <StackPanel Margin="10" Orientation="Vertical">
                     <CheckBox
-                        Margin="20,10,0,0"
+                        Margin="20 10 0 0"
                         HorizontalAlignment="Left"
                         Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
                         IsChecked="{Binding Settings.EverythingSearchFullPath}" />
                     <StackPanel Orientation="Horizontal">
-                        <Grid Margin="20,10,0,10">
+                        <Grid Margin="20 10 0 10">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="F" />
                                 <ColumnDefinition Width="Auto" />
@@ -423,7 +479,7 @@
                             <TextBlock
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                Margin="0,0,20,0"
+                                Margin="0 0 20 0"
                                 VerticalAlignment="Center"
                                 Text="{DynamicResource plugin_explorer_everything_sort_option}"
                                 TextBlock.Foreground="{DynamicResource Color05B}" />
@@ -447,7 +503,7 @@
                             <TextBlock
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                Margin="0,15,20,0"
+                                Margin="0 15 20 0"
                                 VerticalAlignment="Center"
                                 Text="{DynamicResource plugin_explorer_everything_installed_path}"
                                 TextBlock.Foreground="{DynamicResource Color05B}" />
@@ -455,14 +511,14 @@
                                 Grid.Row="2"
                                 Grid.Column="1"
                                 MinWidth="350"
-                                Margin="0,15,0,0"
+                                Margin="0 15 0 0"
                                 Text="{Binding EverythingInstalledPath}" />
                         </Grid>
                     </StackPanel>
                     <StackPanel>
                         <TextBlock
                             Name="tbFastSortWarning"
-                            Margin="20,10,10,10"
+                            Margin="20 10 10 10"
                             VerticalAlignment="Center"
                             DockPanel.Dock="Right"
                             Foreground="Orange"
@@ -479,7 +535,7 @@
                 Style="{DynamicResource ExplorerTabItem}">
                 <DockPanel HorizontalAlignment="Stretch">
                     <Border
-                        Margin="10,10,10,5"
+                        Margin="10 10 10 5"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
                         BorderThickness="1"
                         DockPanel.Dock="Top">
@@ -508,7 +564,7 @@
                 <ScrollViewer>
                     <DockPanel HorizontalAlignment="Stretch">
                         <Border
-                            Margin="10,10,10,5"
+                            Margin="10 10 10 5"
                             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
                             BorderThickness="1"
                             DockPanel.Dock="Top">
@@ -556,7 +612,7 @@
                 <ScrollViewer>
                     <DockPanel HorizontalAlignment="Stretch">
                         <Border
-                            Margin="10,10,10,5"
+                            Margin="10 10 10 5"
                             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
                             BorderThickness="1"
                             DockPanel.Dock="Top">

Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml

@@ -10,7 +10,7 @@
     mc:Ignorable="d">
     <Grid
         x:Name="PreviewGrid"
-        Margin="20 0 10 0"
+        Margin="0 0 0 0"
         VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -23,7 +23,7 @@
             </Grid.RowDefinitions>
             <Image
                 Grid.Row="0"
-                Margin="0 12 0 0"
+                Margin="5 12 8 0"
                 Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
                 <Image.Style>
                     <Style TargetType="Image">
@@ -38,7 +38,7 @@
             </Image>
             <Grid Grid.Row="1">
                 <TextBlock
-                    Margin="0 6 0 16"
+                    Margin="5 6 5 16"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Top"
                     Style="{DynamicResource PreviewItemTitleStyle}"
@@ -59,16 +59,18 @@
             </StackPanel.Style>
             <Rectangle
                 Width="Auto"
-                Margin="0 0 0 0"
+                Height="1"
+                Margin="0 0 5 0"
                 HorizontalAlignment="Stretch"
                 Style="{DynamicResource SeparatorStyle}" />
             <TextBlock
-                Margin="0 8 0 8"
+                Margin="5 8 8 8"
                 Style="{DynamicResource PreviewItemSubTitleStyle}"
                 Text="{Binding Result.SubTitle}" />
             <Rectangle
                 Width="Auto"
-                Margin="0 0 0 0"
+                Height="1"
+                Margin="0 0 5 0"
                 HorizontalAlignment="Stretch"
                 Style="{DynamicResource SeparatorStyle}" />
             <StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
@@ -86,7 +88,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="0 0 0 0"
+                        Margin="5 0 0 0"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
                         Text="{DynamicResource FileSize}"
@@ -95,7 +97,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="1"
-                        Margin="0"
+                        Margin="0 0 13 0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
@@ -106,7 +108,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="0 0 8 0"
+                        Margin="5 0 8 0"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
                         Text="{DynamicResource Created}"
@@ -115,7 +117,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="0"
+                        Margin="0 0 13 0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
@@ -126,7 +128,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="0 0 8 0"
+                        Margin="5 0 8 0"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
                         Text="{DynamicResource LastModified}"
@@ -135,7 +137,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="1"
-                        Margin="0"
+                        Margin="0 0 13 0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"

Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml

@@ -7,26 +7,21 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Grid Margin="70,15,0,15">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="400" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
+    <Grid Margin="70 15 18 15">
+        <Grid.ColumnDefinitions />
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <CheckBox
-            Grid.Column="0"
             Grid.Row="0"
-            Padding="8,0,0,0"
+            Padding="8 0 0 0"
             Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
             IsChecked="{Binding WarnFromUnknownSource}" />
         <CheckBox
-            Grid.Column="0"
             Grid.Row="1"
-            Margin="0,20,0,0"
-            Padding="8,0,0,0"
+            Margin="0 10 0 0"
+            Padding="8 0 0 0"
             Content="{DynamicResource plugin_pluginsmanager_plugin_settings_auto_restart}"
             IsChecked="{Binding AutoRestartAfterChanging}" />
     </Grid>

appveyor.yml

@@ -51,7 +51,7 @@ deploy:
   - provider: NuGet
     artifact: Plugin nupkg
     api_key:
-      secure: Uho7u3gk4RHzyWGgqgXZuOeI55NbqHLQ9tXahL7xmE4av2oiSldrNiyGgy/0AQYw
+      secure: sCSd5JWgdzJWDa9kpqECut5ACPKZqcoxKU8ERKC00k7VIjig3/+nFV5zzTcGb0w3
     on:
       APPVEYOR_REPO_TAG: true