From d41dd780ce631d1ef0aa61dd53a68204bb85fc72 Mon Sep 17 00:00:00 2001
From: Spencer Hedrick <shedric1@asu.edu>
Date: Sat, 9 Oct 2021 02:36:38 -0700
Subject: [PATCH 001/107] add initial ShellRun support for JsonRPC

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs |  6 ++++++
 Flow.Launcher/PublicAPIInstance.cs            | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index d9cdf5581..3cadae176 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -29,6 +29,12 @@ namespace Flow.Launcher.Plugin
         /// </summary>
         void RestartApp();
 
+        /// <summary>
+        /// Run a shell command or external program
+        /// </summary>
+        /// <param name="cmd">The command or program to run</param>
+        void ShellRun(string cmd);
+
         /// <summary>
         /// Save everything, all of Flow Launcher and plugins' data and settings
         /// </summary>
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 6f995671d..c528b8229 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -103,6 +103,16 @@ namespace Flow.Launcher
             });
         }
 
+        public void ShellRun(string cmd)
+        {
+            System.Diagnostics.Process process = new();
+            var startInfo = process.StartInfo;
+            startInfo.FileName = "cmd.exe";
+            startInfo.Arguments = $"/C {cmd}";
+            startInfo.CreateNoWindow = true;
+            process.Start();
+        }
+
         public void StartLoadingBar() => _mainVM.ProgressBarVisibility = Visibility.Visible;
 
         public void StopLoadingBar() => _mainVM.ProgressBarVisibility = Visibility.Collapsed;

From 342bf306ef27465671cdd575658b96901938c5a2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 12 Nov 2021 06:20:43 +0900
Subject: [PATCH 002/107] - Add Slide Up Animation - Chnage Toggle/Hide Code
 for animation - Change Tray Open menu to toggle

---
 Flow.Launcher/MainWindow.xaml            | 319 +++++++++++++++--------
 Flow.Launcher/MainWindow.xaml.cs         |  44 +++-
 Flow.Launcher/ViewModel/MainViewModel.cs |  19 +-
 3 files changed, 271 insertions(+), 111 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index daea406db..cf471beb7 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -1,105 +1,192 @@
-<Window x:Class="Flow.Launcher.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:converters="clr-namespace:Flow.Launcher.Converters"
-        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
-        mc:Ignorable="d"
-        Title="Flow Launcher"
-        Topmost="True"
-        SizeToContent="Height"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        WindowStartupLocation="Manual"
-        AllowDrop="True"
-        ShowInTaskbar="False"
-        Style="{DynamicResource WindowStyle}"
-        Icon="Images/app.png"
-        AllowsTransparency="True"
-        Background="Transparent"
-        Loaded="OnLoaded"
-        Initialized="OnInitialized"
-        Closing="OnClosing"
-        LocationChanged="OnLocationChanged"
-        Deactivated="OnDeactivated"
-        PreviewKeyDown="OnKeyDown"
-        MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
-        MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
-        Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-        d:DataContext="{d:DesignInstance vm:MainViewModel}">
+<Window
+    x:Class="Flow.Launcher.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Flow.Launcher.Converters"
+    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:vm="clr-namespace:Flow.Launcher.ViewModel"
+    Name="FlowMainWindow"
+    Title="Flow Launcher"
+    MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    d:DataContext="{d:DesignInstance vm:MainViewModel}"
+    AllowDrop="True"
+    AllowsTransparency="True"
+    Background="Transparent"
+    Closing="OnClosing"
+    Deactivated="OnDeactivated"
+    Icon="Images/app.png"
+    Initialized="OnInitialized"
+    Loaded="OnLoaded"
+    LocationChanged="OnLocationChanged"
+    Opacity="{Binding MainWindowOpacity, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+    PreviewKeyDown="OnKeyDown"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    SizeToContent="Height"
+    Style="{DynamicResource WindowStyle}"
+    Topmost="True"
+    Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+    WindowStartupLocation="Manual"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Resources>
-        <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter"/>
-        <converters:BorderClipConverter x:Key="BorderClipConverter"/>
+        <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
+        <converters:BorderClipConverter x:Key="BorderClipConverter" />
     </Window.Resources>
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
-        <KeyBinding Key="F1" Command="{Binding StartHelpCommand}"></KeyBinding>
-        <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}"></KeyBinding>
-        <KeyBinding Key="Tab" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="Tab" Modifiers="Shift" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="N" Modifiers="Ctrl" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="J" Modifiers="Ctrl" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="D" Modifiers="Ctrl" Command="{Binding SelectNextPageCommand}"></KeyBinding>
-        <KeyBinding Key="P" Modifiers="Ctrl" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="K" Modifiers="Ctrl" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="U" Modifiers="Ctrl" Command="{Binding SelectPrevPageCommand}"></KeyBinding>
-        <KeyBinding Key="Home" Modifiers="Alt" Command="{Binding SelectFirstResultCommand}"></KeyBinding>
-        <KeyBinding Key="O" Modifiers="Ctrl" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Left" Command="{Binding EscCommand}"></KeyBinding>
-        <KeyBinding Key="H" Modifiers="Ctrl" Command="{Binding LoadHistoryCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Ctrl+Shift" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Shift" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Ctrl" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Alt" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="D1" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="0"></KeyBinding>
-        <KeyBinding Key="D2" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="1"></KeyBinding>
-        <KeyBinding Key="D3" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="2"></KeyBinding>
-        <KeyBinding Key="D4" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="3"></KeyBinding>
-        <KeyBinding Key="D5" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="4"></KeyBinding>
-        <KeyBinding Key="D6" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="5"></KeyBinding>
-        <KeyBinding Key="D7" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="6"></KeyBinding>
-        <KeyBinding Key="D8" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="7"></KeyBinding>
-        <KeyBinding Key="D9" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="8"></KeyBinding>
+        <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
+        <KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
+        <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
+        <KeyBinding Key="Tab" Command="{Binding SelectNextItemCommand}" />
+        <KeyBinding
+            Key="Tab"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Shift" />
+        <KeyBinding
+            Key="N"
+            Command="{Binding SelectNextItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="J"
+            Command="{Binding SelectNextItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="D"
+            Command="{Binding SelectNextPageCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="P"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="K"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="U"
+            Command="{Binding SelectPrevPageCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Home"
+            Command="{Binding SelectFirstResultCommand}"
+            Modifiers="Alt" />
+        <KeyBinding
+            Key="O"
+            Command="{Binding LoadContextMenuCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
+        <KeyBinding Key="Left" Command="{Binding EscCommand}" />
+        <KeyBinding
+            Key="H"
+            Command="{Binding LoadHistoryCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Ctrl+Shift" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding LoadContextMenuCommand}"
+            Modifiers="Shift" />
+        <KeyBinding Key="Enter" Command="{Binding OpenResultCommand}" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Alt" />
+        <KeyBinding
+            Key="D1"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="0"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D2"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="1"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D3"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="2"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D4"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="3"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D5"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="4"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D6"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="5"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D7"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="6"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D8"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="7"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D9"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="8"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
     </Window.InputBindings>
     <Grid>
-        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
+        <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
             <StackPanel Orientation="Vertical">
                 <Grid>
-                    <TextBox x:Name="QueryTextSuggestionBox"
-                         Style="{DynamicResource QuerySuggestionBoxStyle}"
-                         IsEnabled="False">
+                    <TextBox
+                        x:Name="QueryTextSuggestionBox"
+                        IsEnabled="False"
+                        Style="{DynamicResource QuerySuggestionBoxStyle}">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
-                                <Binding ElementName="QueryTextBox" Path="Text"/>
-                                <Binding ElementName="ResultListBox" Path="SelectedItem"/>
+                                <Binding ElementName="QueryTextBox" Path="Text" />
+                                <Binding ElementName="ResultListBox" Path="SelectedItem" />
                             </MultiBinding>
                         </TextBox.Text>
                     </TextBox>
-                    <TextBox x:Name="QueryTextBox"
-                    Style="{DynamicResource QueryBoxStyle}"
-                     Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     PreviewDragOver="OnPreviewDragOver"
-                     AllowDrop="True"
-                     Visibility="Visible"
-                    Background="Transparent">
+                    <TextBox
+                        x:Name="QueryTextBox"
+                        AllowDrop="True"
+                        Background="Transparent"
+                        PreviewDragOver="OnPreviewDragOver"
+                        Style="{DynamicResource QueryBoxStyle}"
+                        Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="Visible">
                         <TextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Command="ApplicationCommands.Cut"/>
-                                <MenuItem Command="ApplicationCommands.Copy"/>
-                                <MenuItem Command="ApplicationCommands.Paste"/>
+                                <MenuItem Command="ApplicationCommands.Cut" />
+                                <MenuItem Command="ApplicationCommands.Copy" />
+                                <MenuItem Command="ApplicationCommands.Paste" />
                                 <Separator />
-                                <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
-                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}"/>
+                                <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}" />
+                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}" />
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
                     <Canvas Style="{DynamicResource SearchIconPosition}">
-                        <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                        <Path
+                            Margin="0"
+                            Data="{DynamicResource SearchIconImg}"
+                            Stretch="Fill"
+                            Style="{DynamicResource SearchIconStyle}" />
                     </Canvas>
                 </Grid>
 
@@ -121,49 +208,69 @@
                                 </Style.Triggers>
                             </Style>
                         </ContentControl.Style>
-                        <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}"/>
+                        <Rectangle
+                            Width="Auto"
+                            HorizontalAlignment="Stretch"
+                            Style="{DynamicResource SeparatorStyle}" />
                     </ContentControl>
-                    <Line x:Name="ProgressBar" HorizontalAlignment="Right"
-                  Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                  Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
-                    </Line>
+                    <Line
+                        x:Name="ProgressBar"
+                        Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
+                        Height="2"
+                        HorizontalAlignment="Right"
+                        StrokeThickness="1"
+                        Style="{DynamicResource PendingLineStyle}"
+                        Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        X1="-150"
+                        X2="-50"
+                        Y1="0"
+                        Y2="0" />
                 </Grid>
 
                 <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}"/>
+                            <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="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
+                        <flowlauncher:ResultListBox
+                            x:Name="ResultListBox"
+                            DataContext="{Binding Results}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
                     </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}"/>
+                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
                         </MultiBinding>
                     </Border.Clip>
-                     <ContentControl>
-                        <flowlauncher:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="ContextMenu"/>
-                      </ContentControl>
+                    <ContentControl>
+                        <flowlauncher:ResultListBox
+                            x:Name="ContextMenu"
+                            DataContext="{Binding ContextMenu}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                    </ContentControl>
                 </Border>
                 <Border Style="{DynamicResource WindowRadius}">
-                <Border.Clip>
+                    <Border.Clip>
                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
-                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
-                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}"/>
+                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
                         </MultiBinding>
-                </Border.Clip>
-                        <ContentControl>
-                        <flowlauncher:ResultListBox DataContext="{Binding History}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="History"/>
-                         </ContentControl>
+                    </Border.Clip>
+                    <ContentControl>
+                        <flowlauncher:ResultListBox
+                            x:Name="History"
+                            DataContext="{Binding History}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                    </ContentControl>
                 </Border>
             </StackPanel>
         </Border>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 16e4be8a0..9b44c7b78 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -196,7 +196,7 @@ namespace Flow.Launcher
                 Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit")
             };
 
-            open.Click += (o, e) => Visibility = Visibility.Visible;
+            open.Click += (o, e) => _viewModel.ToggleFlowLauncher();
             settings.Click += (o, e) => App.API.OpenSettingDialog();
             exit.Click += (o, e) => Close();
             contextMenu.Items.Add(header);
@@ -235,6 +235,48 @@ namespace Flow.Launcher
             isProgressBarStoryboardPaused = true;
         }
 
+        public void WindowAnimator()
+        {
+            InitializePosition();
+            Storyboard sb = new Storyboard();
+            var da = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                Duration = TimeSpan.FromSeconds(0.2),
+                FillBehavior = FillBehavior.Stop
+            };
+
+            var da2 = new DoubleAnimation
+            {
+                From = Top + 8,
+                To = Top,
+                Duration = TimeSpan.FromSeconds(0.2),
+                FillBehavior = FillBehavior.Stop
+            };
+
+            var da3 = new DoubleAnimation
+            {
+                From = Left,
+                To = Left,
+                Duration = TimeSpan.FromSeconds(0.1),
+                FillBehavior = FillBehavior.Stop
+            };
+            System.Diagnostics.Debug.WriteLine("Left: " + Left);
+            System.Diagnostics.Debug.WriteLine("Top: " + Top);
+            Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
+            sb.Children.Add(da3);
+            Storyboard.SetTarget(da, this);
+            Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
+            Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
+
+            sb.Children.Add(da);
+            sb.Children.Add(da2);
+
+            sb.Begin(FlowMainWindow);
+        }
+
+
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ChangedButton == MouseButton.Left) DragMove();
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 547228ee3..02f2908d2 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -380,6 +380,8 @@ namespace Flow.Launcher.ViewModel
 
         public Visibility ProgressBarVisibility { get; set; }
         public Visibility MainWindowVisibility { get; set; }
+        public double MainWindowOpacity { get; set; } = 1;
+        public bool WinToggleStatus { get; set; } = true;
 
         public double MainWindowWidth => _settings.WindowSize;
 
@@ -708,9 +710,12 @@ namespace Flow.Launcher.ViewModel
 
         public void ToggleFlowLauncher()
         {
-            if (MainWindowVisibility != Visibility.Visible)
+            if (WinToggleStatus != true)
             {
                 MainWindowVisibility = Visibility.Visible;
+                ((MainWindow)Application.Current.MainWindow).WindowAnimator();
+                WinToggleStatus = true;
+                MainWindowOpacity = 1;
             }
             else
             {
@@ -720,24 +725,30 @@ namespace Flow.Launcher.ViewModel
 
         public async void Hide()
         {
+            MainWindowOpacity = 0;
             switch (_settings.LastQueryMode)
             {
                 case LastQueryMode.Empty:
                     ChangeQueryText(string.Empty);
-                    Application.Current.MainWindow.Opacity = 0; // Trick for no delay
-                    await Task.Delay(100);
-                    Application.Current.MainWindow.Opacity = 1;
+                    MainWindowOpacity = 0; // Trick for no delay
+                    await Task.Delay(100); //Time for change to opacity
                     break;
                 case LastQueryMode.Preserved:
+                    MainWindowOpacity = 0;
+                    await Task.Delay(100);
                     LastQuerySelected = true;
                     break;
                 case LastQueryMode.Selected:
+                    MainWindowOpacity = 0;
+                    await Task.Delay(100);
                     LastQuerySelected = false;
                     break;
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
+            WinToggleStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
+
         }
 
         #endregion

From a4e941b954aefe8cf900c3ac0e281e2d6cf94117 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 12 Nov 2021 07:49:20 +0900
Subject: [PATCH 003/107] Change Property toggle base to Var from visibility

---
 Flow.Launcher/MainWindow.xaml.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 9b44c7b78..a0662e9ed 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -52,6 +52,8 @@ namespace Flow.Launcher
 
         private async void OnClosing(object sender, CancelEventArgs e)
         {
+            _settings.WindowTop = Top;
+            _settings.WindowLeft = Left;
             _notifyIcon.Visible = false;
             _viewModel.Save();
             e.Cancel = true;
@@ -79,9 +81,9 @@ namespace Flow.Launcher
             {
                 switch (e.PropertyName)
                 {
-                    case nameof(MainViewModel.MainWindowVisibility):
+                    case nameof(MainViewModel.WinToggleStatus):
                         {
-                            if (_viewModel.MainWindowVisibility == Visibility.Visible)
+                            if (_viewModel.WinToggleStatus == true)
                             {
                                 Activate();
                                 QueryTextBox.Focus();
@@ -157,7 +159,7 @@ namespace Flow.Launcher
             Top = WindowTop();
             Left = WindowLeft();
             _settings.WindowTop = Top;
-            _settings.WindowLeft = Left;
+            _settings.WindowLeft = Left; 
         }
 
         private void UpdateNotifyIconText()
@@ -237,7 +239,6 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
-            InitializePosition();
             Storyboard sb = new Storyboard();
             var da = new DoubleAnimation
             {

From 5a969b212f1b178ffade0df888aa4e983c5ea717 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 12 Nov 2021 09:18:16 +0900
Subject: [PATCH 004/107] Add InitPosition in WindowAnimator

---
 Flow.Launcher/MainWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index a0662e9ed..4b717298d 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -239,6 +239,7 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
+            InitializePosition();
             Storyboard sb = new Storyboard();
             var da = new DoubleAnimation
             {

From f1222f948f1eb81a01823cfaeedf30e7c2d6f4d5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 12 Nov 2021 12:14:37 +0900
Subject: [PATCH 005/107] Fix Positioning when turn on remember last launch
 position

---
 Flow.Launcher/MainWindow.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 4b717298d..61035da74 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -239,7 +239,8 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
-            InitializePosition();
+            //InitializePosition();
+            UpdatePosition();
             Storyboard sb = new Storyboard();
             var da = new DoubleAnimation
             {

From 6d8ee6411775e4dfa7341601285820dfb0542379 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 12 Nov 2021 13:02:59 +0900
Subject: [PATCH 006/107] - Change trigger animation Timing - Change
 HideOnStartup using Animator

---
 Flow.Launcher/App.xaml.cs                | 10 +++++++++-
 Flow.Launcher/ViewModel/MainViewModel.cs |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 8c869e941..52faf8658 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -101,7 +101,15 @@ namespace Flow.Launcher
 
                 API.SaveAppAllSettings();
 
-                _mainVM.MainWindowVisibility = _settings.HideOnStartup ? Visibility.Hidden : Visibility.Visible;
+                if (_settings.HideOnStartup)
+                {
+                    _mainVM.Hide(); 
+                }
+                else
+                {
+                    window.WindowAnimator();
+                }
+
                 Log.Info("|App.OnStartup|End Flow Launcher startup ----------------------------------------------------  ");
             });
         }
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 02f2908d2..4509d1fce 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -713,8 +713,8 @@ namespace Flow.Launcher.ViewModel
             if (WinToggleStatus != true)
             {
                 MainWindowVisibility = Visibility.Visible;
-                ((MainWindow)Application.Current.MainWindow).WindowAnimator();
                 WinToggleStatus = true;
+                ((MainWindow)Application.Current.MainWindow).WindowAnimator();
                 MainWindowOpacity = 1;
             }
             else

From 037c3439b5b3d6f54e1e1a3ecbdb30d9f4508456 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 02:09:25 +0900
Subject: [PATCH 007/107] - Change InitializePosition for load setting - add
 Save Position in onclosing - Remove Debug Log write

---
 Flow.Launcher/MainWindow.xaml.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 61035da74..02a21a44c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -87,7 +87,7 @@ namespace Flow.Launcher
                             {
                                 Activate();
                                 QueryTextBox.Focus();
-                                UpdatePosition();
+                                //UpdatePosition();
                                 _settings.ActivateTimes++;
                                 if (!_viewModel.LastQuerySelected)
                                 {
@@ -156,10 +156,22 @@ namespace Flow.Launcher
 
         private void InitializePosition()
         {
+            /*
             Top = WindowTop();
             Left = WindowLeft();
             _settings.WindowTop = Top;
             _settings.WindowLeft = Left; 
+            */
+            if (_settings.RememberLastLaunchLocation)
+            {
+                Left = _settings.WindowLeft;
+                Top = _settings.WindowTop;
+            }
+            else
+            {
+                Left = WindowLeft();
+                Top = WindowTop();
+            }
         }
 
         private void UpdateNotifyIconText()
@@ -265,17 +277,13 @@ namespace Flow.Launcher
                 Duration = TimeSpan.FromSeconds(0.1),
                 FillBehavior = FillBehavior.Stop
             };
-            System.Diagnostics.Debug.WriteLine("Left: " + Left);
-            System.Diagnostics.Debug.WriteLine("Top: " + Top);
             Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
-            sb.Children.Add(da3);
             Storyboard.SetTarget(da, this);
             Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
             Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
-
             sb.Children.Add(da);
             sb.Children.Add(da2);
-
+            sb.Children.Add(da3);
             sb.Begin(FlowMainWindow);
         }
 

From 4a8696268d111dd744f0ea3399b6ae030be5b353 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 04:54:17 +0900
Subject: [PATCH 008/107] - Fix RememberLastPosition when Re-Excute

---
 Flow.Launcher/MainWindow.xaml    |  1 +
 Flow.Launcher/MainWindow.xaml.cs | 33 +++++++++++++++++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index cf471beb7..359ddc7e6 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -26,6 +26,7 @@
     PreviewKeyDown="OnKeyDown"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    SizeChanged="OnSizeChanged"
     SizeToContent="Height"
     Style="{DynamicResource WindowStyle}"
     Topmost="True"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 02a21a44c..b17749e64 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -42,6 +42,7 @@ namespace Flow.Launcher
             DataContext = mainVM;
             _viewModel = mainVM;
             _settings = settings;
+            InitializePosition();
             InitializeComponent();
         }
 
@@ -69,10 +70,8 @@ namespace Flow.Launcher
         {
             // show notify icon when flowlauncher is hidden
             InitializeNotifyIcon();
-
             WindowsInteropHelper.DisableControlBox(this);
             InitProgressbarAnimation();
-            InitializePosition();
             // since the default main window visibility is visible
             // so we need set focus during startup
             QueryTextBox.Focus();
@@ -85,9 +84,9 @@ namespace Flow.Launcher
                         {
                             if (_viewModel.WinToggleStatus == true)
                             {
+                                UpdatePosition();
                                 Activate();
                                 QueryTextBox.Focus();
-                                //UpdatePosition();
                                 _settings.ActivateTimes++;
                                 if (!_viewModel.LastQuerySelected)
                                 {
@@ -156,21 +155,15 @@ namespace Flow.Launcher
 
         private void InitializePosition()
         {
-            /*
-            Top = WindowTop();
-            Left = WindowLeft();
-            _settings.WindowTop = Top;
-            _settings.WindowLeft = Left; 
-            */
             if (_settings.RememberLastLaunchLocation)
             {
-                Left = _settings.WindowLeft;
-                Top = _settings.WindowTop;
+                this.Top = this._settings.WindowTop;
+                this.Left = this._settings.WindowLeft;
             }
             else
             {
-                Left = WindowLeft();
-                Top = WindowTop();
+                this.Left = WindowLeft();
+                this.Top = WindowTop();
             }
         }
 
@@ -251,7 +244,6 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
-            //InitializePosition();
             UpdatePosition();
             Storyboard sb = new Storyboard();
             var da = new DoubleAnimation
@@ -277,10 +269,10 @@ namespace Flow.Launcher
                 Duration = TimeSpan.FromSeconds(0.1),
                 FillBehavior = FillBehavior.Stop
             };
-            Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
             Storyboard.SetTarget(da, this);
             Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
             Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
+            Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
             sb.Children.Add(da);
             sb.Children.Add(da2);
             sb.Children.Add(da3);
@@ -328,6 +320,7 @@ namespace Flow.Launcher
 
         private void OnDeactivated(object sender, EventArgs e)
         {
+            _viewModel.Save();
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();
@@ -348,6 +341,16 @@ namespace Flow.Launcher
             }
         }
 
+        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (_settings.RememberLastLaunchLocation)
+            {
+                return;
+                _settings.WindowLeft = Left;
+                _settings.WindowTop = Top;
+            }
+        }
+
         private void OnLocationChanged(object sender, EventArgs e)
         {
             if (_settings.RememberLastLaunchLocation)

From 6744e21775cc9b5cc70e5cc0f3c1061d1a804bdb Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Sat, 13 Nov 2021 14:48:46 -0600
Subject: [PATCH 009/107] Remove some unused code

---
 Flow.Launcher/MainWindow.xaml    |  1 -
 Flow.Launcher/MainWindow.xaml.cs | 24 ++++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 359ddc7e6..cf471beb7 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -26,7 +26,6 @@
     PreviewKeyDown="OnKeyDown"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
-    SizeChanged="OnSizeChanged"
     SizeToContent="Height"
     Style="{DynamicResource WindowStyle}"
     Topmost="True"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b17749e64..e6dc377a4 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -11,16 +11,11 @@ using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
-using Microsoft.AspNetCore.Authorization;
-using Application = System.Windows.Application;
 using Screen = System.Windows.Forms.Screen;
 using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
-using DataFormats = System.Windows.DataFormats;
 using DragEventArgs = System.Windows.DragEventArgs;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
-using MessageBox = System.Windows.MessageBox;
 using NotifyIcon = System.Windows.Forms.NotifyIcon;
-using System.Windows.Interop;
 
 namespace Flow.Launcher
 {
@@ -149,21 +144,19 @@ namespace Flow.Launcher
                         break;
                 }
             };
-
-            InitializePosition();
         }
 
         private void InitializePosition()
         {
             if (_settings.RememberLastLaunchLocation)
             {
-                this.Top = this._settings.WindowTop;
-                this.Left = this._settings.WindowLeft;
+                Top = _settings.WindowTop;
+                Left = _settings.WindowLeft;
             }
             else
             {
-                this.Left = WindowLeft();
-                this.Top = WindowTop();
+                Left = WindowLeft();
+                Top = WindowTop();
             }
         }
 
@@ -341,15 +334,6 @@ namespace Flow.Launcher
             }
         }
 
-        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (_settings.RememberLastLaunchLocation)
-            {
-                return;
-                _settings.WindowLeft = Left;
-                _settings.WindowTop = Top;
-            }
-        }
 
         private void OnLocationChanged(object sender, EventArgs e)
         {

From ca2d696791d676f7c584af0b1ee14b8ec7e63bd8 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Sat, 13 Nov 2021 15:16:02 -0600
Subject: [PATCH 010/107] Remove redundant animation and potential position
 change

---
 Flow.Launcher/MainWindow.xaml.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index e6dc377a4..db38f0fad 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -29,6 +29,7 @@ namespace Flow.Launcher
         private NotifyIcon _notifyIcon;
         private ContextMenu contextMenu;
         private MainViewModel _viewModel;
+        private bool _animating;
 
         #endregion
 
@@ -37,8 +38,8 @@ namespace Flow.Launcher
             DataContext = mainVM;
             _viewModel = mainVM;
             _settings = settings;
-            InitializePosition();
             InitializeComponent();
+            InitializePosition();
         }
 
         public MainWindow()
@@ -180,7 +181,7 @@ namespace Flow.Launcher
 
             var header = new MenuItem
             {
-                Header = "Flow Launcher", 
+                Header = "Flow Launcher",
                 IsEnabled = false
             };
             var open = new MenuItem
@@ -237,6 +238,10 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
+            if (_animating)
+                return;
+                
+            _animating = true;
             UpdatePosition();
             Storyboard sb = new Storyboard();
             var da = new DoubleAnimation
@@ -269,6 +274,7 @@ namespace Flow.Launcher
             sb.Children.Add(da);
             sb.Children.Add(da2);
             sb.Children.Add(da3);
+            sb.Completed += (_, _) => _animating = false;
             sb.Begin(FlowMainWindow);
         }
 
@@ -322,6 +328,9 @@ namespace Flow.Launcher
 
         private void UpdatePosition()
         {
+            if (_animating)
+                return;
+
             if (_settings.RememberLastLaunchLocation)
             {
                 Left = _settings.WindowLeft;
@@ -337,6 +346,8 @@ namespace Flow.Launcher
 
         private void OnLocationChanged(object sender, EventArgs e)
         {
+            if (_animating)
+                return;
             if (_settings.RememberLastLaunchLocation)
             {
                 _settings.WindowLeft = Left;

From 62eb1b6cff052df66a3e1540195581002187aa6c Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 07:45:47 +0900
Subject: [PATCH 011/107] - Add Sound - Add Sound/Animation in Setting - Add
 related String

---
 .../UserSettings/Settings.cs                  |   3 +
 Flow.Launcher/Languages/en.xaml               |   4 +
 Flow.Launcher/MainWindow.xaml.cs              |  73 +++++------
 Flow.Launcher/Resources/open.wav              | Bin 0 -> 4784 bytes
 Flow.Launcher/SettingWindow.xaml              | 119 ++++++++++++++----
 Flow.Launcher/ViewModel/MainViewModel.cs      |   7 ++
 .../ViewModel/SettingWindowViewModel.cs       |  12 ++
 7 files changed, 159 insertions(+), 59 deletions(-)
 create mode 100644 Flow.Launcher/Resources/open.wav

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 5f9082fe9..d0351af51 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -37,6 +37,9 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public string ResultFontStretch { get; set; }
         public bool UseGlyphIcons { get; set; } = true;
 
+        public bool UseAnimation { get; set; } = true;
+        public bool UseSound { get; set; } = false;
+
 
         /// <summary>
         /// when false Alphabet static service will always return empty results
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 1cb203515..9721ad869 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -80,6 +80,10 @@
     <system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
+    <system:String x:Key="SoundEffect">Sound Effect</system:String>
+    <system:String x:Key="SoundEffectTip">Play a small sound when window open.</system:String>
+    <system:String x:Key="Animation">Animation</system:String>
+    <system:String x:Key="AnimationTip">Use Animation in UI.</system:String>
 
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">Hotkey</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index db38f0fad..2d8e2f822 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -238,44 +238,47 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
-            if (_animating)
-                return;
+            if (_settings.UseAnimation)
+            { 
+                if (_animating)
+                    return;
                 
-            _animating = true;
-            UpdatePosition();
-            Storyboard sb = new Storyboard();
-            var da = new DoubleAnimation
-            {
-                From = 0,
-                To = 1,
-                Duration = TimeSpan.FromSeconds(0.2),
-                FillBehavior = FillBehavior.Stop
-            };
+                _animating = true;
+                UpdatePosition();
+                Storyboard sb = new Storyboard();
+                var da = new DoubleAnimation
+                {
+                    From = 0,
+                    To = 1,
+                    Duration = TimeSpan.FromSeconds(0.2),
+                    FillBehavior = FillBehavior.Stop
+                };
 
-            var da2 = new DoubleAnimation
-            {
-                From = Top + 8,
-                To = Top,
-                Duration = TimeSpan.FromSeconds(0.2),
-                FillBehavior = FillBehavior.Stop
-            };
+                var da2 = new DoubleAnimation
+                {
+                    From = Top + 8,
+                    To = Top,
+                    Duration = TimeSpan.FromSeconds(0.2),
+                    FillBehavior = FillBehavior.Stop
+                };
 
-            var da3 = new DoubleAnimation
-            {
-                From = Left,
-                To = Left,
-                Duration = TimeSpan.FromSeconds(0.1),
-                FillBehavior = FillBehavior.Stop
-            };
-            Storyboard.SetTarget(da, this);
-            Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
-            Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
-            Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
-            sb.Children.Add(da);
-            sb.Children.Add(da2);
-            sb.Children.Add(da3);
-            sb.Completed += (_, _) => _animating = false;
-            sb.Begin(FlowMainWindow);
+                var da3 = new DoubleAnimation
+                {
+                    From = Left,
+                    To = Left,
+                    Duration = TimeSpan.FromSeconds(0.1),
+                    FillBehavior = FillBehavior.Stop
+                };
+                Storyboard.SetTarget(da, this);
+                Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
+                Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
+                Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
+                sb.Children.Add(da);
+                sb.Children.Add(da2);
+                sb.Children.Add(da3);
+                sb.Completed += (_, _) => _animating = false;
+                sb.Begin(FlowMainWindow);
+            }
         }
 
 
diff --git a/Flow.Launcher/Resources/open.wav b/Flow.Launcher/Resources/open.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c3e0619975cac92469bbfa0b64c66f046c2ad767
GIT binary patch
literal 4784
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
A^#A|>

literal 0
HcmV?d00001

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e69b26f63..e49465176 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1388,11 +1388,15 @@
                                 TextAlignment="left" />
                         </Border>
 
-                        <StackPanel Grid.Row="1" Margin="0" Background="{Binding PreviewBackground}">
-                            <StackPanel Margin="0,30,0,0"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Orientation="Horizontal">
+                        <StackPanel
+                            Grid.Row="1"
+                            Margin="0"
+                            Background="{Binding PreviewBackground}">
+                            <StackPanel
+                                Margin="0,30,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal">
                                 <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}">
                                     <Border Style="{DynamicResource WindowRadius}">
                                         <Border.Clip>
@@ -1470,26 +1474,29 @@
                                         <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
                                     </StackPanel>
                                     <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                        <TextBlock Width="100"
-                                                   Margin="0,0,8,2"
-                                                   VerticalAlignment="Center"
-                                                   Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
-                                                   TextAlignment="Right" />
-                                        <Slider Name="WindowWidthValue"
-                                                Width="300"
-                                                Margin="0,0,18,0"
-                                                IsMoveToPointEnabled="True"
-                                                IsSnapToTickEnabled="True"
-                                                Maximum="900"
-                                                Minimum="400"
-                                                TickFrequency="10"
-                                                Value="{Binding WindowWidthSize, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Width="100"
+                                            Margin="0,0,8,2"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
+                                            TextAlignment="Right" />
+                                        <Slider
+                                            Name="WindowWidthValue"
+                                            Width="300"
+                                            Margin="0,0,18,0"
+                                            IsMoveToPointEnabled="True"
+                                            IsSnapToTickEnabled="True"
+                                            Maximum="900"
+                                            Minimum="400"
+                                            TickFrequency="10"
+                                            Value="{Binding WindowWidthSize, Mode=TwoWay}" />
                                     </StackPanel>
-                                    <TextBlock Grid.Column="0"
-                                               Margin="24,0,16,0"
-                                               VerticalAlignment="Center"
-                                               FontFamily="/Resources/#Segoe Fluent Icons"
-                                               FontSize="20">
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        Margin="24,0,16,0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                        FontSize="20">
                                         &#xe740;
                                     </TextBlock>
                                 </ItemsControl>
@@ -1749,6 +1756,70 @@
                             </Border>
 
                             <StackPanel>
+
+                                <Border
+                                    Margin="0,30,0,0"
+                                    Padding="0"
+                                    CornerRadius="5"
+                                    Style="{DynamicResource SettingGroupBox}">
+                                    <StackPanel Orientation="Vertical">
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
+                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
+                                                </StackPanel>
+                                                <ui:ToggleSwitch
+                                                    Grid.Row="0"
+                                                    Grid.Column="2"
+                                                    Width="100"
+                                                    Margin="0,0,2,0"
+                                                    IsOn="{Binding UseAnimation, Mode=TwoWay}" />
+                                                <TextBlock
+                                                    Grid.Column="0"
+                                                    Margin="24,0,16,0"
+                                                    VerticalAlignment="Center"
+                                                    FontFamily="/Resources/#Segoe Fluent Icons"
+                                                    FontSize="20">
+                                                    &#xedb5;
+                                                </TextBlock>
+                                            </ItemsControl>
+                                        </Border>
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
+                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
+                                                </StackPanel>
+                                                <ui:ToggleSwitch
+                                                    Grid.Row="0"
+                                                    Grid.Column="2"
+                                                    Width="100"
+                                                    Margin="0,0,2,0"
+                                                    IsOn="{Binding UseSound, Mode=TwoWay}" />
+                                                <TextBlock
+                                                    Grid.Column="0"
+                                                    Margin="24,0,16,0"
+                                                    VerticalAlignment="Center"
+                                                    FontFamily="/Resources/#Segoe Fluent Icons"
+                                                    FontSize="20">
+                                                    &#xe994;
+                                                </TextBlock>
+                                            </ItemsControl>
+                                        </Border>
+                                    </StackPanel>
+                                </Border>
+
                                 <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 4509d1fce..6e1befeaf 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using System.Windows;
+using System.Windows.Media;
 using System.Windows.Input;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
@@ -712,6 +713,12 @@ namespace Flow.Launcher.ViewModel
         {
             if (WinToggleStatus != true)
             {
+                if (_settings.UseSound)
+                {
+                    MediaPlayer media = new MediaPlayer();
+                    media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+                    media.Play();
+                }
                 MainWindowVisibility = Visibility.Visible;
                 WinToggleStatus = true;
                 ((MainWindow)Application.Current.MainWindow).WindowAnimator();
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 4947ca380..773c4733c 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -328,6 +328,18 @@ namespace Flow.Launcher.ViewModel
             set => Settings.UseGlyphIcons = value;
         }
 
+        public bool UseAnimation
+        {
+            get => Settings.UseAnimation;
+            set => Settings.UseAnimation = value;
+        }
+
+        public bool UseSound
+        {
+            get => Settings.UseSound;
+            set => Settings.UseSound = value;
+        }
+
         public Brush PreviewBackground
         {
             get

From 15266f25853409609ea237d2af3f5ec4131d68bd Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 09:13:56 +0900
Subject: [PATCH 012/107] - Add time for hide when open setting (using context
 menu) - Adjust String

---
 Flow.Launcher/Languages/en.xaml  | 51 +++++++++++++++++---------------
 Flow.Launcher/MainWindow.xaml.cs | 10 ++++---
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9721ad869..416773c54 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <!--MainWindow-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
     <system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
@@ -15,7 +16,7 @@
     <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
 
-    <!--Setting General-->
+    <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
@@ -44,7 +45,7 @@
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
-    <!--Setting Plugin-->
+    <!--  Setting Plugin  -->
     <system:String x:Key="plugin">Plugins</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
@@ -62,12 +63,12 @@
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 
 
-    <!--Setting Plugin Store-->
+    <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>
     <system:String x:Key="refresh">Refresh</system:String>
     <system:String x:Key="install">Install</system:String>
 
-    <!--Setting Theme-->
+    <!--  Setting Theme  -->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
     <system:String x:Key="howToCreateTheme">How to create a theme</system:String>
@@ -81,11 +82,11 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="SoundEffect">Sound Effect</system:String>
-    <system:String x:Key="SoundEffectTip">Play a small sound when window open.</system:String>
+    <system:String x:Key="SoundEffectTip">Play a small sound when window open</system:String>
     <system:String x:Key="Animation">Animation</system:String>
-    <system:String x:Key="AnimationTip">Use Animation in UI.</system:String>
+    <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
 
-    <!--Setting Hotkey-->
+    <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
@@ -106,7 +107,7 @@
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 
-    <!--Setting Proxy-->
+    <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
     <system:String x:Key="enableProxy">Enable HTTP Proxy</system:String>
     <system:String x:Key="server">HTTP Server</system:String>
@@ -122,7 +123,7 @@
     <system:String x:Key="proxyIsCorrect">Proxy configured correctly</system:String>
     <system:String x:Key="proxyConnectFailed">Proxy connection failed</system:String>
 
-    <!--Setting About-->
+    <!--  Setting About  -->
     <system:String x:Key="about">About</system:String>
     <system:String x:Key="website">Website</system:String>
     <system:String x:Key="version">Version</system:String>
@@ -131,18 +132,18 @@
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
-        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
+        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
     <system:String x:Key="documentation">Usage Tips:</system:String>
 
-    <!--Priority Setting Dialog-->
+    <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
 
-    <!--Action Keyword Setting Dialog-->
+    <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
     <system:String x:Key="newActionKeywords">New Action Keyword</system:String>
     <system:String x:Key="cancel">Cancel</system:String>
@@ -152,9 +153,9 @@
     <system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
     <system:String x:Key="success">Success</system:String>
     <system:String x:Key="completedSuccessfully">Completed successfully</system:String>
-    <system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. </system:String>
+    <system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords.</system:String>
 
-    <!--Custom Query Hotkey Dialog-->
+    <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
     <system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
     <system:String x:Key="preview">Preview</system:String>
@@ -162,10 +163,10 @@
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
     <system:String x:Key="update">Update</system:String>
 
-    <!--Hotkey Control-->
+    <!--  Hotkey Control  -->
     <system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
 
-    <!--Crash Reporter-->
+    <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Time</system:String>
     <system:String x:Key="reportWindow_reproduce">Please tell us how application crashed so we can fix it</system:String>
@@ -181,16 +182,18 @@
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
 
-    <!--General Notice-->
+    <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
 
-    <!--update-->
+    <!--  update  -->
     <system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
     <system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
     <system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
     <system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
-    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher was not able to move your user profile data to the new update version.
-        Please manually move your profile data folder from {0} to {1}</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
+        Flow Launcher was not able to move your user profile data to the new update version.
+        Please manually move your profile data folder from {0} to {1}
+    </system:String>
     <system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
     <system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 2d8e2f822..bae41788c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -250,7 +250,7 @@ namespace Flow.Launcher
                 {
                     From = 0,
                     To = 1,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
 
@@ -258,7 +258,7 @@ namespace Flow.Launcher
                 {
                     From = Top + 8,
                     To = Top,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
 
@@ -266,7 +266,7 @@ namespace Flow.Launcher
                 {
                     From = Left,
                     To = Left,
-                    Duration = TimeSpan.FromSeconds(0.1),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
                 Storyboard.SetTarget(da, this);
@@ -314,8 +314,10 @@ namespace Flow.Launcher
             e.Handled = true;
         }
 
-        private void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
+        private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
+            _viewModel.Hide();
+            await Task.Delay(100);
             App.API.OpenSettingDialog();
         }
 

From 42f1b574276be0304769e1c3882386743196e085 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 11:30:25 +0900
Subject: [PATCH 013/107] - Change Setting Window Size to responsive

---
 Flow.Launcher/SettingWindow.xaml    |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e49465176..550b3e85d 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -14,7 +14,7 @@
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Title="{DynamicResource flowlauncher_settings}"
     Width="1000"
-    Height="700"
+    Height="650"
     MinWidth="900"
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 203248ad6..0aa647146 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -15,6 +15,7 @@ using Flow.Launcher.ViewModel;
 using Flow.Launcher.Helper;
 using System.Windows.Controls;
 using Flow.Launcher.Core.ExternalPlugins;
+using Screen = System.Windows.Forms.Screen;
 
 namespace Flow.Launcher
 {
@@ -44,6 +45,15 @@ namespace Flow.Launcher
             HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
             HwndTarget hwndTarget = hwndSource.CompositionTarget;
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
+
+            var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
+            var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y);
+            var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Height);
+            var workingHeight = dip2.Y * 0.8;
+            var top = (dip2.Y / 2) - (workingHeight / 2);
+            this.Height = workingHeight;
+            this.Top = top;
+
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)

From 838d6c5571b2263543ad6d721264859aa9d6c681 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 11:32:39 +0900
Subject: [PATCH 014/107] Remove Left Positioning Code in animation

---
 Flow.Launcher/MainWindow.xaml.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index bae41788c..07a18bc80 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -261,21 +261,11 @@ namespace Flow.Launcher
                     Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
-
-                var da3 = new DoubleAnimation
-                {
-                    From = Left,
-                    To = Left,
-                    Duration = TimeSpan.FromSeconds(0.18),
-                    FillBehavior = FillBehavior.Stop
-                };
                 Storyboard.SetTarget(da, this);
                 Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
                 Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
-                Storyboard.SetTargetProperty(da3, new PropertyPath(Window.LeftProperty));
                 sb.Children.Add(da);
                 sb.Children.Add(da2);
-                sb.Children.Add(da3);
                 sb.Completed += (_, _) => _animating = false;
                 sb.Begin(FlowMainWindow);
             }

From b17f12b99ae072c9e5a887674305b93f651ab4cb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 11:43:03 +0900
Subject: [PATCH 015/107] change wav file to resource

---
 Flow.Launcher/Flow.Launcher.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index fd2f5f1d9..86156c59a 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -77,6 +77,7 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Remove="Resources\open.wav" />
     <Content Include="Resources\Segoe Fluent Icons.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -104,6 +105,10 @@
     <ProjectReference Include="..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="Resources\open.wav" />
+  </ItemGroup>
+
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
   </Target>

From 37858a4b4ed0456e8338d5f61c21613d5fa2dd4f Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 13:35:53 +0900
Subject: [PATCH 016/107] Change Sound FIle

---
 Flow.Launcher/Resources/open.wav | Bin 4784 -> 80116 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Flow.Launcher/Resources/open.wav b/Flow.Launcher/Resources/open.wav
index c3e0619975cac92469bbfa0b64c66f046c2ad767..4f13724f7093ad2d66c595cf8a672b6dabf008ba 100644
GIT binary patch
literal 80116
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

literal 4784
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
A^#A|>


From 5a430bfc48e71bdb69ada6f453e2041e9251e5fa Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 13:39:45 +0900
Subject: [PATCH 017/107] Change Wav to output

---
 Flow.Launcher/Flow.Launcher.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 86156c59a..b05a5fddb 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -106,7 +106,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Resources\open.wav" />
+    <Resource Include="Resources\open.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

From abe4eec65de070253193301f7ce206b36b73c7e2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 15:09:09 +0900
Subject: [PATCH 018/107] fix Wav output setting

---
 Flow.Launcher/Flow.Launcher.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index b05a5fddb..1f24b325f 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -106,9 +106,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Resources\open.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
+    <Content Include="Resources\open.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

From f8cfa7c45a5bf12f8d87893999a90c26341f9238 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 15:22:44 +0900
Subject: [PATCH 019/107] Remove Resize Settting window code (It made weired
 blink when open setting window)

---
 Flow.Launcher/SettingWindow.xaml.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 0f55eec96..054274eb6 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -46,14 +46,6 @@ namespace Flow.Launcher
             HwndTarget hwndTarget = hwndSource.CompositionTarget;
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
 
-            var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
-            var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y);
-            var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Height);
-            var workingHeight = dip2.Y * 0.8;
-            var top = (dip2.Y / 2) - (workingHeight / 2);
-            this.Height = workingHeight;
-            this.Top = top;
-
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)

From a2600af2eb4d5af78106dd60b88c5af1d755724b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 17:45:56 +0900
Subject: [PATCH 020/107] - Add Show() function and seperate toggleflow() -
 Change ShowMainWindow to using Show() (for Fix plugin install button)

---
 Flow.Launcher/PublicAPIInstance.cs       |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs      |  1 -
 Flow.Launcher/ViewModel/MainViewModel.cs | 25 ++++++++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index e90a53fc3..a5c9f3afe 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -70,7 +70,7 @@ namespace Flow.Launcher
 
         public void RestarApp() => RestartApp();
 
-        public void ShowMainWindow() => _mainVM.MainWindowVisibility = Visibility.Visible;
+        public void ShowMainWindow() => _mainVM.Show();
 
         public void CheckForNewUpdate() => _settingsVM.UpdateApp();
 
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 054274eb6..88d4f2895 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -15,7 +15,6 @@ using Flow.Launcher.ViewModel;
 using Flow.Launcher.Helper;
 using System.Windows.Controls;
 using Flow.Launcher.Core.ExternalPlugins;
-using Screen = System.Windows.Forms.Screen;
 
 namespace Flow.Launcher
 {
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 6e1befeaf..9870053c2 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -713,16 +713,7 @@ namespace Flow.Launcher.ViewModel
         {
             if (WinToggleStatus != true)
             {
-                if (_settings.UseSound)
-                {
-                    MediaPlayer media = new MediaPlayer();
-                    media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
-                    media.Play();
-                }
-                MainWindowVisibility = Visibility.Visible;
-                WinToggleStatus = true;
-                ((MainWindow)Application.Current.MainWindow).WindowAnimator();
-                MainWindowOpacity = 1;
+                Show();
             }
             else
             {
@@ -730,6 +721,20 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public void Show()
+        {
+            if (_settings.UseSound)
+            {
+                MediaPlayer media = new MediaPlayer();
+                media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+                media.Play();
+            }
+            MainWindowVisibility = Visibility.Visible;
+            WinToggleStatus = true;
+            ((MainWindow)Application.Current.MainWindow).WindowAnimator();
+            MainWindowOpacity = 1;
+        }
+
         public async void Hide()
         {
             MainWindowOpacity = 0;

From add99c4d6d29e0adc6bfa21d56eae48f9d9545c9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 18:13:03 +0900
Subject: [PATCH 021/107] - Change MainwindowVisibility to using show() -
 HotkeyMapper, CustomQueryHotkeySetting.

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml   | 137 +++++++++++++-----
 .../CustomQueryHotkeySetting.xaml.cs          |   1 +
 Flow.Launcher/Helper/HotKeyMapper.cs          |   2 +-
 3 files changed, 105 insertions(+), 35 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 23bd89906..e9d486fe1 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -1,57 +1,126 @@
-<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        Icon="Images\app.png"
-        ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        MouseDown="window_MouseDown"
-        Title="{DynamicResource customeQueryHotkeyTitle}" Height="345" Width="500" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.CustomQueryHotkeySetting"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+    Title="{DynamicResource customeQueryHotkeyTitle}"
+    Width="500"
+    Height="345"
+    Background="#F3F3F3"
+    BorderBrush="#cecece"
+    Icon="Images\app.png"
+    MouseDown="window_MouseDown"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen">
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="Close"/>
+        <KeyBinding Key="Escape" Command="Close" />
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="Close" Executed="cmdEsc_OnPress"/>
+        <CommandBinding Command="Close" Executed="cmdEsc_OnPress" />
     </Window.CommandBindings>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+        <Border
+            Padding="26,26,26,0"
+            Background="#ffffff"
+            BorderBrush="#e5e5e5"
+            BorderThickness="0,0,0,1">
             <Grid>
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource customeQueryHotkeyTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource customeQueryHotkeyTitle}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                        <TextBlock 
-                           Text="{DynamicResource customeQueryHotkeyTips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                        <TextBlock
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource customeQueryHotkeyTips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 20 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Width="60"/>
-                        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" HorizontalAlignment="Left" HorizontalContentAlignment="Left" Width="200"/>
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
+                    <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="60"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource hotkey}" />
+                        <flowlauncher:HotkeyControl
+                            x:Name="ctlHotkey"
+                            Grid.Column="1"
+                            Width="200"
+                            Height="32"
+                            Margin="10,0,10,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource actionKeyword}" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 0 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Width="60"
-                   HorizontalAlignment="Left" Text="{DynamicResource customQuery}" />
-                        <TextBox x:Name="tbAction" Margin="10" Width="250" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
-                    Content="{DynamicResource preview}" />
+                    <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="60"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource customQuery}" />
+                        <TextBox
+                            x:Name="tbAction"
+                            Width="250"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center" />
+                        <Button
+                            x:Name="btnTestActionKeyword"
+                            Height="30"
+                            Padding="10,5,10,5"
+                            Click="BtnTestActionKeyword_OnClick"
+                            Content="{DynamicResource preview}" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
         </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="32"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnAdd" Margin="5 0 10 0" Width="100" Height="32" Click="btnAdd_OnClick">
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Height="32"
+                Margin="10,0,5,0"
+                Click="BtnCancel_OnClick"
+                Content="{DynamicResource cancel}" />
+            <Button
+                x:Name="btnAdd"
+                Width="100"
+                Height="32"
+                Margin="5,0,10,0"
+                Click="btnAdd_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index 0109474e1..e1f69d117 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -92,6 +92,7 @@ namespace Flow.Launcher
         {
             App.API.ChangeQuery(tbAction.Text);
             Application.Current.MainWindow.Visibility = Visibility.Visible;
+            Application.Current.MainWindow.Opacity = 1;
             Application.Current.MainWindow.Focus();
 
         }
diff --git a/Flow.Launcher/Helper/HotKeyMapper.cs b/Flow.Launcher/Helper/HotKeyMapper.cs
index fe25ecf18..70d71bb32 100644
--- a/Flow.Launcher/Helper/HotKeyMapper.cs
+++ b/Flow.Launcher/Helper/HotKeyMapper.cs
@@ -78,7 +78,7 @@ namespace Flow.Launcher.Helper
                 if (mainViewModel.ShouldIgnoreHotkeys())
                     return;
 
-                mainViewModel.MainWindowVisibility = Visibility.Visible;
+                mainViewModel.Show();
                 mainViewModel.ChangeQueryText(hotkey.ActionKeyword, true);
             });
         }

From 979a7b8b7b825aa968ffd0e23d0647636fa82b39 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 15 Nov 2021 05:08:01 +0900
Subject: [PATCH 022/107] Change Titlebar to Custom TitleBar (SettingWindow)

---
 .../Resources/CustomControlTemplate.xaml      |   83 +
 Flow.Launcher/SettingWindow.xaml              | 3627 +++++++++--------
 Flow.Launcher/SettingWindow.xaml.cs           |  142 +
 3 files changed, 2084 insertions(+), 1768 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 877a97645..bcb20579f 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -4,6 +4,89 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
+
+    <!--  Title Bar  -->
+
+    <Style x:Key="WindowMainPanelStyle" TargetType="{x:Type Border}">
+        <Setter Property="BorderBrush" Value="{DynamicResource WindowBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=WindowState}" Value="Maximized">
+                <Setter Property="BorderThickness" Value="1" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="TitleBarButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource WindowTextBrush}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
+                        x:Name="border"
+                        Background="#f3f3f3"
+                        BorderThickness="0"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter
+                            x:Name="contentPresenter"
+                            Margin="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Focusable="False"
+                            RecognizesAccessKey="True" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="border" Property="Background" Value="#C6C6C6" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter TargetName="border" Property="Background" Value="#B0B0B0" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleBarCloseButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
+                        x:Name="border"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter
+                            x:Name="contentPresenter"
+                            Margin="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Focusable="False"
+                            RecognizesAccessKey="True" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="border" Property="Background" Value="#E10000" />
+                            <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource PressedWindowCloseButtonBackgroundBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--  Repeat Button  -->
     <Style x:Key="DefaultRepeatButtonStyle" TargetType="RepeatButton">
         <Setter Property="OverridesDefaultStyle" Value="True" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 2b5fd2397..bfbcf675a 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -23,8 +23,12 @@
     Loaded="OnLoaded"
     MouseDown="window_MouseDown"
     ResizeMode="CanResizeWithGrip"
+    StateChanged="Window_StateChanged"
     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>
@@ -386,1261 +390,307 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
     </Window.Resources>
+    <Border Style="{StaticResource WindowMainPanelStyle}">
+        <Grid Background="#f3f3f3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="32" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Image
+                Grid.Column="0"
+                Width="16"
+                Height="16"
+                Margin="10,4,4,4"
+                RenderOptions.BitmapScalingMode="HighQuality"
+                Source="/Images/app.png" />
+            <TextBlock
+                Grid.Column="1"
+                Margin="4,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="14"
+                Text="{DynamicResource flowlauncher_settings}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
+                                <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
 
+            <Button
+                Grid.Column="2"
+                Click="OnMinimizeButtonClick"
+                RenderOptions.EdgeMode="Aliased"
+                Style="{StaticResource TitleBarButtonStyle}">
+                <Path
+                    Width="46"
+                    Height="32"
+                    Data="M 18,15 H 28"
+                    Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                    StrokeThickness="1" />
+            </Button>
+            <Button
+                Name="maximizeButton"
+                Grid.Column="3"
+                Click="OnMaximizeRestoreButtonClick"
+                Style="{StaticResource TitleBarButtonStyle}">
+                <Path
+                    Width="46"
+                    Height="32"
+                    Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z"
+                    Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                    StrokeThickness="1" />
+            </Button>
+            <Button
+                Name="restoreButton"
+                Grid.Column="3"
+                Click="OnMaximizeRestoreButtonClick"
+                Style="{StaticResource TitleBarButtonStyle}">
+                <Path
+                    Width="46"
+                    Height="32"
+                    Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5"
+                    Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                    StrokeThickness="1" />
+            </Button>
+            <Button
+                Grid.Column="4"
+                Click="OnCloseButtonClick"
+                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" />
+            </Button>
 
-    <TabControl
-        Height="auto"
-        Background="#f3f3f3"
-        SelectedIndex="1"
-        TabStripPlacement="Left">
-        <TabItem Style="{DynamicResource logo}">
-            <TabItem.Header>
-                <Grid Margin="0,18,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="50" />
-                        <RowDefinition Height="27" />
-                        <RowDefinition Height="25" />
-                    </Grid.RowDefinitions>
-                    <Image
-                        Grid.Row="0"
-                        Width="50"
-                        Height="50"
-                        Source="images/app.png" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,12,0,0"
-                        Text="Flow Launcher"
-                        TextAlignment="center" />
-                    <TextBlock
-                        Grid.Row="2"
-                        Margin="0,5,0,0"
-                        FontSize="12"
-                        Text="{Binding Version}"
-                        TextAlignment="center" />
-                </Grid>
-            </TabItem.Header>
-        </TabItem>
-        <TabItem>
-            <!--  LEFT TAB WIDTH  -->
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xe713;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource general}" />
-                </Grid>
-            </TabItem.Header>
-
-            <ScrollViewer
-                Margin="0,0,0,0"
+            <TabControl
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="5"
+                Height="auto"
                 Background="#f3f3f3"
-                ScrollViewer.CanContentScroll="False">
-                <StackPanel Margin="5,18,25,30" Orientation="Vertical">
-                    <TextBlock
-                        Grid.Row="2"
-                        Margin="0,5,0,5"
-                        FontSize="30"
-                        Text="{DynamicResource general}"
-                        TextAlignment="left" />
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
-                            </StackPanel>
-                            <CheckBox
-                                Checked="OnAutoStartupChecked"
-                                IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
-                                Style="{DynamicResource SideControlCheckBox}"
-                                Unchecked="OnAutoStartupUncheck" />
+                SelectedIndex="1"
+                TabStripPlacement="Left">
+                <TabItem Style="{DynamicResource logo}">
+                    <TabItem.Header>
+                        <Grid Margin="0,18,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="50" />
+                                <RowDefinition Height="27" />
+                                <RowDefinition Height="25" />
+                            </Grid.RowDefinitions>
+                            <Image
+                                Grid.Row="0"
+                                Width="50"
+                                Height="50"
+                                Source="images/app.png" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="0,12,0,0"
+                                Text="Flow Launcher"
+                                TextAlignment="center" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Margin="0,5,0,0"
+                                FontSize="12"
+                                Text="{Binding Version}"
+                                TextAlignment="center" />
+                        </Grid>
+                    </TabItem.Header>
+                </TabItem>
+                <TabItem>
+                    <!--  LEFT TAB WIDTH  -->
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
                             <TextBlock
                                 Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
+                                Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
                                 FontSize="20">
-                                &#xe8fc;
+                                &#xe713;
                             </TextBlock>
-                        </ItemsControl>
-                    </Border>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource general}" />
+                        </Grid>
+                    </TabItem.Header>
 
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" />
-                            </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xed1a;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideFlowLauncherWhenLoseFocus}" />
-                            </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}" Style="{DynamicResource SideControlCheckBox}" />
-                        </ItemsControl>
-                    </Border>
-
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideNotifyIcon}" />
-                            </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideNotifyIcon}" Style="{DynamicResource SideControlCheckBox}" />
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource rememberLastLocation}" />
-                            </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.RememberLastLaunchLocation}" Style="{DynamicResource SideControlCheckBox}" />
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreen}" />
-                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" />
-                            </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xe7fc;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ShouldUsePinyin}" />
-                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ShouldUsePinyinToolTip}" />
-                            </StackPanel>
-                            <CheckBox
-                                IsChecked="{Binding Settings.ShouldUsePinyin}"
-                                Style="{DynamicResource SideControlCheckBox}"
-                                ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xe98a;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoUpdates}" />
-                            </StackPanel>
-                            <ui:ToggleSwitch
-                                Grid.Column="2"
-                                Width="100"
-                                FocusVisualMargin="5"
-                                IsOn="{Binding AutoUpdates}"
-                                Style="{DynamicResource SideToggleSwitch}" />
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xecc5;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource portableMode}" />
-                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource portableModeToolTIp}" />
-                            </StackPanel>
-                            <ui:ToggleSwitch
-                                Grid.Column="2"
-                                Width="100"
-                                FocusVisualMargin="5"
-                                IsOn="{Binding PortableMode}"
-                                Style="{DynamicResource SideToggleSwitch}" />
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xe88e;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border
-                        Margin="0,30,0,0"
-                        Padding="0"
-                        CornerRadius="5"
-                        Style="{DynamicResource SettingGroupBox}">
-                        <StackPanel Orientation="Vertical">
-                            <Border
-                                Margin="0"
-                                BorderThickness="0"
-                                Style="{DynamicResource SettingGroupBox}">
-                                <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource querySearchPrecision}" />
-                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource querySearchPrecisionToolTip}" />
-                                    </StackPanel>
-                                    <ComboBox
-                                        Grid.Column="2"
-                                        MaxWidth="200"
-                                        Margin="10,0,18,0"
-                                        ItemsSource="{Binding QuerySearchPrecisionStrings}"
-                                        SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
-                                </ItemsControl>
-                            </Border>
-                            <Separator
-                                Width="Auto"
-                                BorderBrush="#e5e5e5"
-                                BorderThickness="1" />
-                            <Border
-                                Margin="0"
-                                BorderThickness="0"
-                                Style="{DynamicResource SettingGroupBox}">
-                                <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource lastQueryMode}" />
-                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource lastQueryModeToolTip}" />
-                                    </StackPanel>
-                                    <ComboBox
-                                        Grid.Column="2"
-                                        MaxWidth="200"
-                                        Margin="10,0,18,0"
-                                        DisplayMemberPath="Display"
-                                        ItemsSource="{Binding LastQueryModes}"
-                                        SelectedValue="{Binding Settings.LastQueryMode}"
-                                        SelectedValuePath="Value" />
-                                </ItemsControl>
-                            </Border>
-                            <Separator
-                                Width="Auto"
-                                BorderBrush="#e5e5e5"
-                                BorderThickness="1" />
-                            <Border
-                                Margin="0"
-                                BorderThickness="0"
-                                Style="{DynamicResource SettingGroupBox}">
-                                <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource maxShowResults}" />
-                                    <ComboBox
-                                        Grid.Column="2"
-                                        Width="100"
-                                        Margin="10,0,18,0"
-                                        HorizontalContentAlignment="Center"
-                                        ItemsSource="{Binding MaxResultsRange}"
-                                        SelectedItem="{Binding Settings.MaxResultsToShow}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
-                                        &#xe8fd;
-                                    </TextBlock>
-                                </ItemsControl>
-                            </Border>
-                        </StackPanel>
-                    </Border>
-
-                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource defaultFileManager}" />
-                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
-                            </StackPanel>
-                            <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                <Button
-                                    Width="160"
-                                    MaxWidth="250"
-                                    Margin="10,0,18,0"
-                                    Click="OnSelectFileManagerClick"
-                                    Content="{Binding Settings.CustomExplorer.Name}" />
-                            </StackPanel>
-
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,0,16,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
-                                &#xe838;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource pythonDirectory}" />
-                            </StackPanel>
-                            <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                <TextBox
-                                    Width="300"
-                                    Height="34"
-                                    Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" />
-                                <Button
-                                    Height="34"
-                                    Margin="10,10,18,10"
-                                    Click="OnSelectPythonDirectoryClick"
-                                    Content="{DynamicResource selectPythonDirectory}" />
-                            </StackPanel>
-                        </ItemsControl>
-                    </Border>
-
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource language}" />
-                            </StackPanel>
-                            <ComboBox
-                                Grid.Column="2"
-                                MaxWidth="200"
-                                Margin="10,0,16,0"
-                                DisplayMemberPath="Display"
-                                ItemsSource="{Binding Languages}"
-                                SelectedValue="{Binding Language}"
-                                SelectedValuePath="LanguageCode" />
-                        </ItemsControl>
-                    </Border>
-                </StackPanel>
-            </ScrollViewer>
-        </TabItem>
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xea86;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource plugin}" />
-                </Grid>
-            </TabItem.Header>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="73" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Border
-                    Grid.Row="0"
-                    Padding="5,18,0,0"
-                    Background="#f3f3f3">
-                    <TextBlock
-                        Margin="0,5,0,0"
-                        FontSize="30"
-                        Text="{DynamicResource plugin}"
-                        TextAlignment="left" />
-                </Border>
-                <Border
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Padding="0,0,0,0"
-                    Background="#f3f3f3">
-                    <ListBox
-                        Width="Auto"
-                        Margin="5,0,0,0"
-                        Padding="0,0,7,0"
-                        HorizontalAlignment="Stretch"
-                        ItemContainerStyle="{StaticResource PluginList}"
-                        ItemsSource="{Binding PluginViewModels}"
-                        ScrollViewer.CanContentScroll="False"
-                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                        SelectedItem="{Binding SelectedPlugin}"
-                        SnapsToDevicePixels="True">
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Margin="0,0,0,18" />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <Expander
-                                    x:Name="expanderHeader"
-                                    Grid.Column="4"
-                                    Padding="0"
-                                    Background="Transparent"
-                                    FlowDirection="RightToLeft"
-                                    IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
-                                    Style="{StaticResource ExpanderStyle1}">
-                                    <Expander.Header>
-                                        <Grid
-                                            Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}, Path=ActualWidth}"
-                                            HorizontalAlignment="Left"
-                                            FlowDirection="LeftToRight">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="100" MinWidth="100" />
-                                                <ColumnDefinition
-                                                    Width="*"
-                                                    MinWidth="350"
-                                                    MaxWidth="700" />
-                                                <ColumnDefinition MaxWidth="1400" />
-                                                <ColumnDefinition Width="100" />
-                                                <ColumnDefinition Width="90" />
-                                            </Grid.ColumnDefinitions>
-                                            <StackPanel
-                                                Grid.Column="0"
-                                                Margin="24,0,0,0"
-                                                VerticalAlignment="Center"
-                                                FlowDirection="LeftToRight">
-                                                <Image
-                                                    Width="32"
-                                                    Height="32"
-                                                    Margin="32,0,0,0"
-                                                    FlowDirection="LeftToRight"
-                                                    Source="{Binding Image, IsAsync=True}" />
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="1" Margin="12,0,14,0">
-                                                <TextBlock
-                                                    Text="{Binding PluginPair.Metadata.Name}"
-                                                    TextWrapping="Wrap"
-                                                    ToolTip="{Binding PluginPair.Metadata.Version}" />
-                                                <TextBlock
-                                                    Margin="0,2,0,0"
-                                                    Foreground="#5f5f5f"
-                                                    TextWrapping="WrapWithOverflow">
-                                                    <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
-                                                </TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="3" Orientation="Horizontal">
-                                                <TextBlock
-                                                    MaxWidth="100"
-                                                    Margin="0,0,8,0"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="12"
-                                                    Text="{DynamicResource priority}" />
-                                                <Border>
-                                                    <Button
-                                                        x:Name="PriorityButton"
-                                                        Margin="0,0,0,0"
-                                                        VerticalAlignment="Center"
-                                                        Click="OnPluginPriorityClick"
-                                                        Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
-                                                        Cursor="Hand"
-                                                        ToolTip="Change Plugin Results Priority">
-                                                        <!--#region Priority Button Style-->
-                                                        <Button.Resources>
-                                                            <Style TargetType="Border">
-                                                                <Setter Property="CornerRadius" Value="2" />
-                                                            </Style>
-                                                        </Button.Resources>
-                                                        <Button.Style>
-                                                            <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
-                                                                <Setter Property="Padding" Value="12,8,12,8" />
-                                                                <Setter Property="BorderThickness" Value="0" />
-                                                                <Setter Property="FontWeight" Value="DemiBold" />
-                                                                <Setter Property="Foreground" Value="Black" />
-                                                                <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
-                                                                        <Setter Property="Foreground" Value="#878787" />
-                                                                        <Setter Property="FontWeight" Value="Normal" />
-                                                                    </DataTrigger>
-                                                                </Style.Triggers>
-                                                            </Style>
-                                                        </Button.Style>
-                                                        <!--#endregion-->
-                                                    </Button>
-                                                </Border>
-                                            </StackPanel>
-                                            <ui:ToggleSwitch
-                                                Grid.Column="4"
-                                                MaxWidth="110"
-                                                HorizontalAlignment="Right"
-                                                IsOn="{Binding PluginState}"
-                                                OffContent="{DynamicResource disable}"
-                                                OnContent="{DynamicResource enable}" />
-                                        </Grid>
-
-                                    </Expander.Header>
-
-                                    <Grid FlowDirection="LeftToRight">
-                                        <StackPanel Margin="0,12,0,0" Orientation="Vertical">
-                                            <StackPanel>
-                                                <Border
-                                                    Width="auto"
-                                                    Height="52"
-                                                    Padding="0"
-                                                    BorderThickness="0,1,0,0"
-                                                    CornerRadius="0"
-                                                    Style="{DynamicResource SettingGroupBox}"
-                                                    Visibility="{Binding ActionKeywordsVisibility}">
-                                                    <ItemsControl Padding="22,0,18,0" VerticalAlignment="Center">
-                                                        <DockPanel>
-                                                            <TextBlock
-                                                                Margin="48,0,10,0"
-                                                                VerticalAlignment="Center"
-                                                                DockPanel.Dock="Left"
-                                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                                FontSize="20">
-                                                                &#xe819;
-                                                            </TextBlock>
-                                                            <TextBlock
-                                                                Grid.Column="0"
-                                                                Margin="0,0,0,0"
-                                                                HorizontalAlignment="Left"
-                                                                VerticalAlignment="Center"
-                                                                DockPanel.Dock="Left"
-                                                                Style="{DynamicResource SettingTitleLabel}"
-                                                                Text="{DynamicResource actionKeywords}" />
-
-
-                                                            <Button
-                                                                Grid.Column="2"
-                                                                Width="100"
-                                                                Height="34"
-                                                                Margin="5,0,0,0"
-                                                                HorizontalAlignment="Right"
-                                                                Click="OnPluginActionKeywordsClick"
-                                                                Content="{Binding ActionKeywordsText}"
-                                                                Cursor="Hand"
-                                                                DockPanel.Dock="Right"
-                                                                FontWeight="Bold"
-                                                                ToolTip="Change Action Keywords"
-                                                                Visibility="{Binding ActionKeywordsVisibility}" />
-                                                        </DockPanel>
-
-                                                    </ItemsControl>
-                                                </Border>
-                                            </StackPanel>
-
-                                            <StackPanel>
-
-
-                                                <Border
-                                                    Padding="0"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Center"
-                                                    Background="White"
-                                                    BorderBrush="#e6e6e6"
-                                                    BorderThickness="0,1,0,0">
-                                                    <!--#region SubInfo Styling-->
-                                                    <Border.Style>
-                                                        <Style TargetType="{x:Type Border}">
-                                                            <Setter Property="Visibility" Value="Visible" />
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding ElementName=PluginSettingControl, Path=ActualHeight}" Value="0">
-                                                                    <Setter Property="Visibility" Value="Collapsed" />
-                                                                    <Setter Property="BorderThickness" Value="0" />
-                                                                    <Setter Property="Padding" Value="0" />
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Border.Style>
-                                                </Border>
-                                                <!--#endregion-->
-                                                <ContentControl
-                                                    x:Name="PluginSettingControl"
-                                                    MaxWidth="750"
-                                                    MaxHeight="550"
-                                                    Margin="0"
-                                                    Padding="1"
-                                                    VerticalAlignment="Stretch"
-                                                    Content="{Binding SettingControl}" />
-
-                                            </StackPanel>
-
-                                            <StackPanel>
-                                                <Border
-                                                    Margin="0"
-                                                    Padding="0,12,0,0"
-                                                    VerticalAlignment="Center"
-                                                    BorderThickness="0,1,0,0"
-                                                    CornerRadius="0"
-                                                    Style="{DynamicResource SettingGroupBox}"
-                                                    Visibility="{Binding ActionKeywordsVisibility}">
-                                                    <ItemsControl Style="{DynamicResource SettingGrid}">
-                                                        <StackPanel
-                                                            Margin="0,0,-14,0"
-                                                            HorizontalAlignment="Right"
-                                                            VerticalAlignment="Center"
-                                                            Orientation="Horizontal"
-                                                            Style="{StaticResource TextPanel}">
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="10,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{DynamicResource author}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{Binding PluginPair.Metadata.Author}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="|" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{DynamicResource plugin_init_time}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{Binding InitilizaTime}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="|" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{DynamicResource plugin_query_time}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{Binding QueryTime}" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="| version" />
-                                                            <TextBlock
-                                                                MaxWidth="100"
-                                                                Margin="5,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                FontSize="11"
-                                                                Foreground="#8F8F8F"
-                                                                Text="{Binding PluginPair.Metadata.Version}" />
-
-                                                            <TextBlock
-                                                                MaxWidth="120"
-                                                                Margin="10,0,0,0"
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Center"
-                                                                Cursor="Hand"
-                                                                FontSize="12">
-                                                                <Hyperlink
-                                                                    Foreground="#8F8F8F"
-                                                                    NavigateUri="{Binding PluginPair.Metadata.Website}"
-                                                                    RequestNavigate="OnRequestNavigate">
-                                                                    <Run Text="Website" />
-                                                                </Hyperlink>
-                                                            </TextBlock>
-
-                                                            <TextBlock
-                                                                MaxWidth="120"
-                                                                Margin="10,0,0,0"
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Center"
-                                                                Cursor="Hand"
-                                                                FontSize="12"
-                                                                Foreground="#8f8f8f"
-                                                                MouseUp="OnPluginDirecotyClick"
-                                                                Text="{DynamicResource pluginDirectory}"
-                                                                TextDecorations="Underline" />
-                                                        </StackPanel>
-
-                                                    </ItemsControl>
-                                                </Border>
-
-                                            </StackPanel>
-                                        </StackPanel>
-                                    </Grid>
-                                </Expander>
-
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </Border>
-
-            </Grid>
-        </TabItem>
-
-        <!--#region Plugin Store-->
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xe719;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
-                </Grid>
-            </TabItem.Header>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="72" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Border
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Padding="5,18,0,0"
-                    Background="#f3f3f3">
-                    <TextBlock
-                        Margin="0,5,0,5"
-                        FontSize="30"
-                        Text="{DynamicResource pluginStore}"
-                        TextAlignment="left" />
-                </Border>
-                <Border
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Padding="5,18,32,0"
-                    Background="#f3f3f3">
-                    <Button
-                        Height="34"
-                        Margin="0,5,0,5"
-                        Padding="12,4,12,4"
-                        HorizontalAlignment="Right"
-                        Background="#ffffff"
-                        BorderBrush="#cecece"
-                        BorderThickness="1,1,1,2"
-                        Click="OnPluginStoreRefreshClick"
-                        Content="{DynamicResource refresh}"
-                        FontSize="13" />
-                </Border>
-                <Border
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    Padding="0,0,0,0"
-                    Background="#f3f3f3">
-                    <ListBox
-                        x:Name="StoreListBox"
-                        Width="Auto"
-                        Margin="6,0,0,0"
-                        Padding="0,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Center"
-                        ItemContainerStyle="{StaticResource StoreList}"
-                        ItemsSource="{Binding ExternalPlugins}"
-                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                        SelectionMode="Single">
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <UniformGrid
-                                    Margin="0,0,6,18"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Columns="2"
-                                    IsItemsHost="True"
-                                    SnapsToDevicePixels="True" />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <!--  Hover Layout Style  -->
-
-                                <ToggleButton
-                                    Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
-                                    HorizontalAlignment="Left"
-                                    HorizontalContentAlignment="left"
-                                    Background="Transparent"
-                                    IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                                    Style="{StaticResource StoreItem}">
-                                    <ToggleButton.Template>
-                                        <ControlTemplate TargetType="{x:Type ButtonBase}">
-                                            <ContentPresenter
-                                                x:Name="contentPresenter"
-                                                Margin="{TemplateBinding Padding}"
-                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                Content="{TemplateBinding Content}"
-                                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                Focusable="False"
-                                                RecognizesAccessKey="True"
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                            <ControlTemplate.Triggers />
-                                        </ControlTemplate>
-                                    </ToggleButton.Template>
-
-                                    <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="72" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <StackPanel
-                                            Grid.Column="0"
-                                            Margin="0,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <StackPanel.Style>
-                                                <Style>
-                                                    <Setter Property="StackPanel.Visibility" Value="Visible" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
-                                                            <Setter Property="StackPanel.Opacity" Value="1" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </StackPanel.Style>
-                                            <Image
-                                                Width="32"
-                                                Height="32"
-                                                Margin="8,0,6,0"
-                                                VerticalAlignment="Center"
-                                                Source="{Binding IcoPath, IsAsync=True}" />
-                                        </StackPanel>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="0,0,8,0"
-                                            VerticalAlignment="Center"
-                                            Panel.ZIndex="0">
-                                            <StackPanel.Style>
-                                                <Style>
-                                                    <Setter Property="StackPanel.Visibility" Value="Visible" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
-                                                            <Setter Property="StackPanel.Opacity" Value="1" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </StackPanel.Style>
-                                            <TextBlock
-                                                Padding="0,0,20,0"
-                                                Text="{Binding Name}"
-                                                TextWrapping="WrapWithOverflow"
-                                                ToolTip="{Binding Version}" />
-                                            <TextBlock
-                                                Margin="0,2,0,0"
-                                                Padding="0,0,20,0"
-                                                Foreground="#5f5f5f"
-                                                TextWrapping="WrapWithOverflow">
-                                                <Run
-                                                    FontSize="12"
-                                                    Foreground="#5f5f5f"
-                                                    Text="{Binding Description}" />
-                                            </TextBlock>
-
-                                        </StackPanel>
-                                        <StackPanel
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch">
-                                            <StackPanel.Style>
-                                                <Style>
-                                                    <Setter Property="StackPanel.Visibility" Value="Collapsed" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
-                                                            <Setter Property="StackPanel.Visibility" Value="Visible" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </StackPanel.Style>
-
-
-                                            <Grid
-                                                Height="94"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Panel.ZIndex="1">
-                                                <Grid.Background>
-                                                    <SolidColorBrush Opacity=".95" Color="#f6f6f6" />
-                                                </Grid.Background>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
-                                                </Grid.ColumnDefinitions>
-
-                                                <StackPanel
-                                                    Grid.Column="0"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Center">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <TextBlock
-                                                            Margin="20,0,0,0"
-                                                            Padding="0,0,0,0"
-                                                            FontWeight="Bold"
-                                                            Text="{Binding Name}"
-                                                            TextWrapping="WrapWithOverflow"
-                                                            ToolTip="{Binding Name}" />
-                                                        <TextBlock
-                                                            Margin="10,0,0,0"
-                                                            Padding="0,0,20,0"
-                                                            Text="{Binding Version}"
-                                                            TextWrapping="WrapWithOverflow"
-                                                            ToolTip="{Binding Version}" />
-                                                    </StackPanel>
-                                                    <StackPanel Margin="20,2,120,0" Orientation="Vertical">
-                                                        <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
-                                                            <Hyperlink
-                                                                Foreground="#5F5F5F"
-                                                                NavigateUri="{Binding Website}"
-                                                                RequestNavigate="OnRequestNavigate">
-                                                                <Run FontSize="12" Text="{Binding Author}" />
-                                                            </Hyperlink>
-                                                        </TextBlock>
-                                                    </StackPanel>
-                                                </StackPanel>
-                                                <Border Padding="0,0,20,0">
-                                                    <Button
-                                                        Name="ShortCutButtonPrev"
-                                                        Grid.Column="1"
-                                                        Width="90"
-                                                        MinHeight="40"
-                                                        Margin="0,0,0,0"
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Center"
-                                                        Click="OnExternalPluginInstallClick"
-                                                        Content="{DynamicResource install}"
-                                                        Foreground="Black" />
-                                                </Border>
-                                            </Grid>
-                                        </StackPanel>
-                                    </Grid>
-
-                                </ToggleButton>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </Border>
-
-            </Grid>
-        </TabItem>
-        <!--#endregion-->
-
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xe790;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource theme}" />
-                </Grid>
-            </TabItem.Header>
-            <Border Padding="0,0,0,0">
-                <ScrollViewer
-                    Margin="0,0,0,0"
-                    Padding="6,0,24,0"
-                    Background="#f3f3f3"
-                    ScrollViewer.CanContentScroll="False">
-                    <Grid Margin="0,0,0,0" Background="#f3f3f3">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="0" />
-                            <RowDefinition Height="350" />
-                            <RowDefinition />
-                            <RowDefinition />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Border Grid.Row="0" Padding="5,18,0,0">
+                    <ScrollViewer
+                        Margin="0,0,0,0"
+                        Background="#f3f3f3"
+                        ScrollViewer.CanContentScroll="False">
+                        <StackPanel Margin="5,18,25,30" Orientation="Vertical">
                             <TextBlock
+                                Grid.Row="2"
                                 Margin="0,5,0,5"
                                 FontSize="30"
-                                Text="{DynamicResource theme}"
+                                Text="{DynamicResource general}"
                                 TextAlignment="left" />
-                        </Border>
 
-                        <StackPanel
-                            Grid.Row="1"
-                            Margin="0"
-                            Background="{Binding PreviewBackground}">
-                            <StackPanel
-                                Margin="0,30,0,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Orientation="Horizontal">
-                                <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}">
-                                    <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.RowDefinitions>
-                                                <RowDefinition Height="54" />
-                                                <RowDefinition />
-                                                <RowDefinition />
-                                            </Grid.RowDefinitions>
-                                            <Border Grid.Row="0">
-                                                <TextBox
-                                                    IsReadOnly="True"
-                                                    Style="{DynamicResource QueryBoxStyle}"
-                                                    Text="{DynamicResource hiThere}" />
-
-                                            </Border>
-                                            <Canvas Style="{DynamicResource SearchIconPosition}">
-                                                <Path
-                                                    Margin="0"
-                                                    Data="{DynamicResource SearchIconImg}"
-                                                    Stretch="Fill"
-                                                    Style="{DynamicResource SearchIconStyle}" />
-                                            </Canvas>
-
-                                            <Border Grid.Row="1" Margin="0,0,0,0">
-                                                <Rectangle
-                                                    Width="Auto"
-                                                    HorizontalAlignment="Stretch"
-                                                    Style="{DynamicResource SeparatorStyle}"
-                                                    Visibility="Visible" />
-                                            </Border>
-
-                                            <ContentControl Grid.Row="2">
-                                                <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
-                                            </ContentControl>
-
-                                        </Grid>
-                                    </Border>
-                                </Border>
-                            </StackPanel>
-                        </StackPanel>
-
-                        <StackPanel Grid.Row="2" VerticalAlignment="Top">
-                            <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                            <Border Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource queryWindowShadowEffect}" />
-                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource shadowEffectCPUUsage}" />
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
+                                    </StackPanel>
+                                    <CheckBox
+                                        Checked="OnAutoStartupChecked"
+                                        IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
+                                        Style="{DynamicResource SideControlCheckBox}"
+                                        Unchecked="OnAutoStartupUncheck" />
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        Margin="24,0,16,0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                        FontSize="20">
+                                        &#xe8fc;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" />
+                                    </StackPanel>
+                                    <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" />
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        Margin="24,0,16,0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                        FontSize="20">
+                                        &#xed1a;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideFlowLauncherWhenLoseFocus}" />
+                                    </StackPanel>
+                                    <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}" Style="{DynamicResource SideControlCheckBox}" />
+                                </ItemsControl>
+                            </Border>
+
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideNotifyIcon}" />
+                                    </StackPanel>
+                                    <CheckBox IsChecked="{Binding Settings.HideNotifyIcon}" Style="{DynamicResource SideControlCheckBox}" />
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource rememberLastLocation}" />
+                                    </StackPanel>
+                                    <CheckBox IsChecked="{Binding Settings.RememberLastLaunchLocation}" Style="{DynamicResource SideControlCheckBox}" />
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreen}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" />
+                                    </StackPanel>
+                                    <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" />
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        Margin="24,0,16,0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                        FontSize="20">
+                                        &#xe7fc;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ShouldUsePinyin}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ShouldUsePinyinToolTip}" />
+                                    </StackPanel>
+                                    <CheckBox
+                                        IsChecked="{Binding Settings.ShouldUsePinyin}"
+                                        Style="{DynamicResource SideControlCheckBox}"
+                                        ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        Margin="24,0,16,0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                        FontSize="20">
+                                        &#xe98a;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoUpdates}" />
                                     </StackPanel>
                                     <ui:ToggleSwitch
-                                        Grid.Row="0"
                                         Grid.Column="2"
                                         Width="100"
-                                        Margin="0,0,2,0"
-                                        IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
+                                        FocusVisualMargin="5"
+                                        IsOn="{Binding AutoUpdates}"
+                                        Style="{DynamicResource SideToggleSwitch}" />
                                     <TextBlock
                                         Grid.Column="0"
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
                                         FontSize="20">
-                                        &#xeb91;
+                                        &#xecc5;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
-                            <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                        <TextBlock
-                                            Width="100"
-                                            Margin="0,0,8,2"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
-                                            TextAlignment="Right" />
-                                        <Slider
-                                            Name="WindowWidthValue"
-                                            Width="300"
-                                            Margin="0,0,18,0"
-                                            IsMoveToPointEnabled="True"
-                                            IsSnapToTickEnabled="True"
-                                            Maximum="900"
-                                            Minimum="400"
-                                            TickFrequency="10"
-                                            Value="{Binding WindowWidthSize, Mode=TwoWay}" />
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource portableMode}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource portableModeToolTIp}" />
                                     </StackPanel>
+                                    <ui:ToggleSwitch
+                                        Grid.Column="2"
+                                        Width="100"
+                                        FocusVisualMargin="5"
+                                        IsOn="{Binding PortableMode}"
+                                        Style="{DynamicResource SideToggleSwitch}" />
                                     <TextBlock
                                         Grid.Column="0"
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
                                         FontSize="20">
-                                        &#xe740;
+                                        &#xe88e;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
-                        </StackPanel>
-
-                        <StackPanel Grid.Row="3">
-                            <Border
-                                Margin="0,8,0,0"
-                                Padding="0"
-                                HorizontalAlignment="Stretch"
-                                Style="{DynamicResource SettingGroupBox}">
-                                <ListBox
-                                    Margin="12,12,12,12"
-                                    HorizontalAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    ui:ScrollViewerHelper.AutoHideScrollBars="True"
-                                    Background="#ffffff"
-                                    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,0,0,0" />
-                                            <Setter Property="Margin" Value="4" />
-                                            <Setter Property="Template">
-                                                <Setter.Value>
-                                                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                                                        <Border
-                                                            x:Name="Bd"
-                                                            Padding="{TemplateBinding Padding}"
-                                                            Background="#fefefe"
-                                                            BorderBrush="#e5e5e5"
-                                                            BorderThickness="1,1,1,0"
-                                                            CornerRadius="4"
-                                                            SnapsToDevicePixels="true">
-                                                            <Border
-                                                                x:Name="Bd2"
-                                                                BorderBrush="#d3d3d3"
-                                                                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="#f6f6f6" />
-                                                            </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="#ffffff" />
-                                                            </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,0,0,0">
-                                                <TextBlock
-                                                    Margin="0"
-                                                    Padding="14,12,14,12"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    Focusable="True"
-                                                    FontSize="12"
-                                                    Text="{Binding}"
-                                                    TextWrapping="Wrap" />
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                    <ListBox.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <WrapPanel />
-                                        </ItemsPanelTemplate>
-                                    </ListBox.ItemsPanel>
-                                </ListBox>
-
-                            </Border>
-                            <Border>
-                                <TextBlock
-                                    Margin="10"
-                                    HorizontalAlignment="Right"
-                                    DockPanel.Dock="Top">
-                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                        <Run Text="{DynamicResource howToCreateTheme}" />
-                                    </Hyperlink>
-                                </TextBlock>
-                            </Border>
-                        </StackPanel>
-
-
-                        <StackPanel
-                            Grid.Row="4"
-                            Margin="0,0,0,10"
-                            Orientation="Vertical">
 
                             <Border
                                 Margin="0,30,0,0"
@@ -1654,123 +704,66 @@
                                         Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource useGlyphUI}" />
-                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource useGlyphUIEffect}" />
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource querySearchPrecision}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource querySearchPrecisionToolTip}" />
                                             </StackPanel>
-                                            <ui:ToggleSwitch
-                                                Grid.Row="0"
+                                            <ComboBox
+                                                Grid.Column="2"
+                                                MaxWidth="200"
+                                                Margin="10,0,18,0"
+                                                ItemsSource="{Binding QuerySearchPrecisionStrings}"
+                                                SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
+                                        </ItemsControl>
+                                    </Border>
+                                    <Separator
+                                        Width="Auto"
+                                        BorderBrush="#e5e5e5"
+                                        BorderThickness="1" />
+                                    <Border
+                                        Margin="0"
+                                        BorderThickness="0"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <ItemsControl Style="{StaticResource SettingGrid}">
+                                            <StackPanel Style="{StaticResource TextPanel}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource lastQueryMode}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource lastQueryModeToolTip}" />
+                                            </StackPanel>
+                                            <ComboBox
+                                                Grid.Column="2"
+                                                MaxWidth="200"
+                                                Margin="10,0,18,0"
+                                                DisplayMemberPath="Display"
+                                                ItemsSource="{Binding LastQueryModes}"
+                                                SelectedValue="{Binding Settings.LastQueryMode}"
+                                                SelectedValuePath="Value" />
+                                        </ItemsControl>
+                                    </Border>
+                                    <Separator
+                                        Width="Auto"
+                                        BorderBrush="#e5e5e5"
+                                        BorderThickness="1" />
+                                    <Border
+                                        Margin="0"
+                                        BorderThickness="0"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <ItemsControl Style="{StaticResource SettingGrid}">
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Text="{DynamicResource maxShowResults}" />
+                                            <ComboBox
                                                 Grid.Column="2"
                                                 Width="100"
-                                                Margin="0,0,2,0"
-                                                IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
-                                                &#xf6b8;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
-                                    <Separator
-                                        Width="Auto"
-                                        BorderBrush="#e5e5e5"
-                                        BorderThickness="1" />
-                                    <Border
-                                        Margin="0"
-                                        BorderThickness="0"
-                                        Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Text="{DynamicResource queryBoxFont}" />
-                                            <StackPanel
-                                                Grid.Column="2"
-                                                Margin="0,0,20,0"
-                                                Orientation="Horizontal">
-                                                <ComboBox
-                                                    Width="180"
-                                                    Margin="20,0,0,0"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    ItemsSource="{Binding Source={StaticResource SortedFonts}}"
-                                                    SelectedItem="{Binding SelectedQueryBoxFont}" />
-                                                <ComboBox
-                                                    Width="130"
-                                                    Margin="10,0,0,0"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
-                                                    SelectedItem="{Binding SelectedQueryBoxFontFaces}">
-                                                    <ComboBox.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <TextBlock Text="{Binding Value}" />
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </DataTemplate>
-                                                    </ComboBox.ItemTemplate>
-                                                </ComboBox>
-                                            </StackPanel>
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
-                                                &#xe990;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
-                                    <Separator
-                                        Width="Auto"
-                                        BorderBrush="#e5e5e5"
-                                        BorderThickness="1" />
-                                    <Border
-                                        Margin="0"
-                                        BorderThickness="0"
-                                        Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Text="{DynamicResource resultItemFont}" />
-                                            <StackPanel
-                                                Grid.Column="2"
-                                                Margin="0,0,20,0"
-                                                Orientation="Horizontal">
-                                                <ComboBox
-                                                    Width="180"
-                                                    Margin="20,-2,0,0"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    ItemsSource="{Binding Source={StaticResource SortedFonts}}"
-                                                    SelectedItem="{Binding SelectedResultFont}" />
-                                                <ComboBox
-                                                    Width="130"
-                                                    Margin="10,-2,0,0"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
-                                                    SelectedItem="{Binding SelectedResultFontFaces}">
-                                                    <ComboBox.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <TextBlock Text="{Binding Value}" />
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </DataTemplate>
-                                                    </ComboBox.ItemTemplate>
-                                                </ComboBox>
-                                            </StackPanel>
+                                                Margin="10,0,18,0"
+                                                HorizontalContentAlignment="Center"
+                                                ItemsSource="{Binding MaxResultsRange}"
+                                                SelectedItem="{Binding Settings.MaxResultsToShow}" />
                                             <TextBlock
                                                 Grid.Column="0"
                                                 Margin="24,0,16,0"
@@ -1784,95 +777,23 @@
                                 </StackPanel>
                             </Border>
 
-                            <StackPanel>
-                                <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
-                                        </StackPanel>
-                                        <Button
-                                            Grid.Column="2"
-                                            Width="180"
-                                            Margin="0,0,18,0"
-                                            HorizontalAlignment="Center"
-                                            Click="OpenPluginFolder"
-                                            Content="{DynamicResource OpenThemeFolder}"
-                                            DockPanel.Dock="Top" />
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20">
-                                            &#xe838;
-                                        </TextBlock>
-                                    </ItemsControl>
-                                </Border>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </Border>
-        </TabItem>
-
-
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xe92e;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}" />
-                </Grid>
-            </TabItem.Header>
-            <ScrollViewer
-                Margin="0,0,0,0"
-                Padding="0,0,6,0"
-                Background="#f3f3f3"
-                ScrollViewer.CanContentScroll="False">
-                <Border Background="#f3f3f3">
-                    <Grid Margin="5,18,18,10">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="43" />
-                            <RowDefinition Height="80" />
-                            <RowDefinition Height="146" />
-                            <RowDefinition Height="50" />
-                            <RowDefinition Height="250" />
-                            <RowDefinition Height="70" />
-                        </Grid.RowDefinitions>
-                        <TextBlock
-                            Grid.Row="0"
-                            Margin="0,5,0,2"
-                            FontSize="30"
-                            Text="{DynamicResource hotkey}"
-                            TextAlignment="left" />
-
-                        <StackPanel Grid.Row="1">
-                            <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                            <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
-                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
+                                        <TextBlock
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Text="{DynamicResource defaultFileManager}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <Button
+                                            Width="160"
+                                            MaxWidth="250"
+                                            Margin="10,0,18,0"
+                                            Click="OnSelectFileManagerClick"
+                                            Content="{Binding Settings.CustomExplorer.Name}" />
                                     </StackPanel>
-                                    <flowlauncher:HotkeyControl
-                                        x:Name="HotkeyControl"
-                                        Grid.Row="0"
-                                        Grid.Column="2"
-                                        Width="300"
-                                        Height="35"
-                                        Margin="0,0,0,0"
-                                        HorizontalAlignment="Right"
-                                        HorizontalContentAlignment="Right"
-                                        HotkeyChanged="OnHotkeyChanged"
-                                        Loaded="OnHotkeyControlLoaded" />
 
                                     <TextBlock
                                         Grid.Column="0"
@@ -1880,388 +801,1558 @@
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
                                         FontSize="20">
-                                        &#xeda7;
+                                        &#xe838;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
+
+                            <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource pythonDirectory}" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <TextBox
+                                            Width="300"
+                                            Height="34"
+                                            Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" />
+                                        <Button
+                                            Height="34"
+                                            Margin="10,10,18,10"
+                                            Click="OnSelectPythonDirectoryClick"
+                                            Content="{DynamicResource selectPythonDirectory}" />
+                                    </StackPanel>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource language}" />
+                                    </StackPanel>
+                                    <ComboBox
+                                        Grid.Column="2"
+                                        MaxWidth="200"
+                                        Margin="10,0,16,0"
+                                        DisplayMemberPath="Display"
+                                        ItemsSource="{Binding Languages}"
+                                        SelectedValue="{Binding Language}"
+                                        SelectedValuePath="LanguageCode" />
+                                </ItemsControl>
+                            </Border>
                         </StackPanel>
-
-                        <Border
-                            Grid.Row="2"
-                            Margin="0,12,0,0"
-                            Padding="0"
-                            CornerRadius="5"
-                            Style="{DynamicResource SettingGroupBox}">
-                            <StackPanel Orientation="Vertical">
-                                <Border
-                                    Margin="0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Text="{DynamicResource openResultModifiers}" />
-                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
-                                        </StackPanel>
-                                        <ComboBox
-                                            Grid.Column="2"
-                                            Width="120"
-                                            Margin="0,0,18,0"
-                                            FontSize="14"
-                                            ItemsSource="{Binding OpenResultModifiersList}"
-                                            SelectedItem="{Binding Settings.OpenResultModifiers}" />
-                                    </ItemsControl>
-                                </Border>
-
-                                <Separator
-                                    Width="Auto"
-                                    BorderBrush="#e5e5e5"
-                                    BorderThickness="1" />
-                                <Border
-                                    Margin="0"
-                                    Padding="0,10,0,0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Text="{DynamicResource showOpenResultHotkey}" />
-                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
-                                        </StackPanel>
-                                        <CheckBox
-                                            Grid.Column="2"
-                                            FontSize="14"
-                                            IsChecked="{Binding Settings.ShowOpenResultHotkey}"
-                                            Style="{DynamicResource SideControlCheckBox}" />
-                                    </ItemsControl>
-                                </Border>
-                            </StackPanel>
-                        </Border>
-
-                        <TextBlock
-                            Grid.Row="3"
-                            Margin="0,0,12,2"
-                            Padding="0,12,0,0"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource customQueryHotkey}" />
-                        <ListView
-                            Grid.Row="4"
-                            Margin="0,0,0,0"
-                            Background="#ffffff"
-                            BorderBrush="DarkGray"
-                            BorderThickness="1"
-                            ItemsSource="{Binding Settings.CustomPluginHotkeys}"
-                            SelectedItem="{Binding SelectedCustomPluginHotkey}"
-                            Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
-                            <ListView.View>
-                                <GridView>
-                                    <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
-                                        <GridViewColumn.CellTemplate>
-                                            <DataTemplate DataType="userSettings:CustomPluginHotkey">
-                                                <TextBlock Text="{Binding Hotkey}" />
-                                            </DataTemplate>
-                                        </GridViewColumn.CellTemplate>
-                                    </GridViewColumn>
-                                    <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
-                                        <GridViewColumn.CellTemplate>
-                                            <DataTemplate DataType="userSettings:CustomPluginHotkey">
-                                                <TextBlock Text="{Binding ActionKeyword}" />
-                                            </DataTemplate>
-                                        </GridViewColumn.CellTemplate>
-                                    </GridViewColumn>
-                                </GridView>
-                            </ListView.View>
-                        </ListView>
-                        <StackPanel
-                            Grid.Row="5"
-                            Width="350"
-                            Margin="0"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Top"
-                            Orientation="Horizontal">
-                            <Button
-                                Width="100"
-                                Margin="10"
-                                Click="OnDeleteCustomHotkeyClick"
-                                Content="{DynamicResource delete}" />
-                            <Button
-                                Width="100"
-                                Margin="10"
-                                Click="OnnEditCustomHotkeyClick"
-                                Content="{DynamicResource edit}" />
-                            <Button
-                                Width="100"
-                                Margin="10,10,0,10"
-                                Click="OnAddCustomeHotkeyClick"
-                                Content="{DynamicResource add}" />
-                        </StackPanel>
-                    </Grid>
-                </Border>
-            </ScrollViewer>
-        </TabItem>
-
-
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xec27;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource proxy}" />
-                </Grid>
-            </TabItem.Header>
-            <ScrollViewer
-                Margin="0,0,0,0"
-                Padding="5,0,24,0"
-                Background="#f3f3f3"
-                ScrollViewer.CanContentScroll="False">
-                <Border Background="#f3f3f3">
-
-                    <StackPanel>
-                        <Border Margin="0,18,0,0">
+                    </ScrollViewer>
+                </TabItem>
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xea86;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource plugin}" />
+                        </Grid>
+                    </TabItem.Header>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="73" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Border
+                            Grid.Row="0"
+                            Padding="5,18,0,0"
+                            Background="#f3f3f3">
                             <TextBlock
-                                Grid.Row="0"
                                 Margin="0,5,0,0"
                                 FontSize="30"
-                                Text="{DynamicResource proxy}"
+                                Text="{DynamicResource plugin}"
                                 TextAlignment="left" />
                         </Border>
-
-
                         <Border
-                            Margin="0,10,0,0"
-                            Padding="0"
-                            CornerRadius="5"
-                            Style="{DynamicResource SettingGroupBox}">
-                            <StackPanel Orientation="Vertical">
-                                <Border
-                                    Margin="0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource enableProxy}" />
-                                        <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}" Style="{DynamicResource SideControlCheckBox}" />
-                                    </ItemsControl>
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Padding="0,0,0,0"
+                            Background="#f3f3f3">
+                            <ListBox
+                                Width="Auto"
+                                Margin="5,0,0,0"
+                                Padding="0,0,7,0"
+                                HorizontalAlignment="Stretch"
+                                ItemContainerStyle="{StaticResource PluginList}"
+                                ItemsSource="{Binding PluginViewModels}"
+                                ScrollViewer.CanContentScroll="False"
+                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                SelectedItem="{Binding SelectedPlugin}"
+                                SnapsToDevicePixels="True">
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Margin="0,0,0,18" />
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Expander
+                                            x:Name="expanderHeader"
+                                            Grid.Column="4"
+                                            Padding="0"
+                                            Background="Transparent"
+                                            FlowDirection="RightToLeft"
+                                            IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
+                                            Style="{StaticResource ExpanderStyle1}">
+                                            <Expander.Header>
+                                                <Grid
+                                                    Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}, Path=ActualWidth}"
+                                                    HorizontalAlignment="Left"
+                                                    FlowDirection="LeftToRight">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="100" MinWidth="100" />
+                                                        <ColumnDefinition
+                                                            Width="*"
+                                                            MinWidth="350"
+                                                            MaxWidth="700" />
+                                                        <ColumnDefinition MaxWidth="1400" />
+                                                        <ColumnDefinition Width="100" />
+                                                        <ColumnDefinition Width="90" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <StackPanel
+                                                        Grid.Column="0"
+                                                        Margin="24,0,0,0"
+                                                        VerticalAlignment="Center"
+                                                        FlowDirection="LeftToRight">
+                                                        <Image
+                                                            Width="32"
+                                                            Height="32"
+                                                            Margin="32,0,0,0"
+                                                            FlowDirection="LeftToRight"
+                                                            Source="{Binding Image, IsAsync=True}" />
+                                                    </StackPanel>
+                                                    <StackPanel Grid.Column="1" Margin="12,0,14,0">
+                                                        <TextBlock
+                                                            Text="{Binding PluginPair.Metadata.Name}"
+                                                            TextWrapping="Wrap"
+                                                            ToolTip="{Binding PluginPair.Metadata.Version}" />
+                                                        <TextBlock
+                                                            Margin="0,2,0,0"
+                                                            Foreground="#5f5f5f"
+                                                            TextWrapping="WrapWithOverflow">
+                                                            <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
+                                                        </TextBlock>
+                                                    </StackPanel>
+                                                    <StackPanel Grid.Column="3" Orientation="Horizontal">
+                                                        <TextBlock
+                                                            MaxWidth="100"
+                                                            Margin="0,0,8,0"
+                                                            VerticalAlignment="Center"
+                                                            FontSize="12"
+                                                            Text="{DynamicResource priority}" />
+                                                        <Border>
+                                                            <Button
+                                                                x:Name="PriorityButton"
+                                                                Margin="0,0,0,0"
+                                                                VerticalAlignment="Center"
+                                                                Click="OnPluginPriorityClick"
+                                                                Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
+                                                                Cursor="Hand"
+                                                                ToolTip="Change Plugin Results Priority">
+                                                                <!--#region Priority Button Style-->
+                                                                <Button.Resources>
+                                                                    <Style TargetType="Border">
+                                                                        <Setter Property="CornerRadius" Value="2" />
+                                                                    </Style>
+                                                                </Button.Resources>
+                                                                <Button.Style>
+                                                                    <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
+                                                                        <Setter Property="Padding" Value="12,8,12,8" />
+                                                                        <Setter Property="BorderThickness" Value="0" />
+                                                                        <Setter Property="FontWeight" Value="DemiBold" />
+                                                                        <Setter Property="Foreground" Value="Black" />
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
+                                                                                <Setter Property="Foreground" Value="#878787" />
+                                                                                <Setter Property="FontWeight" Value="Normal" />
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </Button.Style>
+                                                                <!--#endregion-->
+                                                            </Button>
+                                                        </Border>
+                                                    </StackPanel>
+                                                    <ui:ToggleSwitch
+                                                        Grid.Column="4"
+                                                        MaxWidth="110"
+                                                        HorizontalAlignment="Right"
+                                                        IsOn="{Binding PluginState}"
+                                                        OffContent="{DynamicResource disable}"
+                                                        OnContent="{DynamicResource enable}" />
+                                                </Grid>
+
+                                            </Expander.Header>
+
+                                            <Grid FlowDirection="LeftToRight">
+                                                <StackPanel Margin="0,12,0,0" Orientation="Vertical">
+                                                    <StackPanel>
+                                                        <Border
+                                                            Width="auto"
+                                                            Height="52"
+                                                            Padding="0"
+                                                            BorderThickness="0,1,0,0"
+                                                            CornerRadius="0"
+                                                            Style="{DynamicResource SettingGroupBox}"
+                                                            Visibility="{Binding ActionKeywordsVisibility}">
+                                                            <ItemsControl Padding="22,0,18,0" VerticalAlignment="Center">
+                                                                <DockPanel>
+                                                                    <TextBlock
+                                                                        Margin="48,0,10,0"
+                                                                        VerticalAlignment="Center"
+                                                                        DockPanel.Dock="Left"
+                                                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                                                        FontSize="20">
+                                                                        &#xe819;
+                                                                    </TextBlock>
+                                                                    <TextBlock
+                                                                        Grid.Column="0"
+                                                                        Margin="0,0,0,0"
+                                                                        HorizontalAlignment="Left"
+                                                                        VerticalAlignment="Center"
+                                                                        DockPanel.Dock="Left"
+                                                                        Style="{DynamicResource SettingTitleLabel}"
+                                                                        Text="{DynamicResource actionKeywords}" />
+
+
+                                                                    <Button
+                                                                        Grid.Column="2"
+                                                                        Width="100"
+                                                                        Height="34"
+                                                                        Margin="5,0,0,0"
+                                                                        HorizontalAlignment="Right"
+                                                                        Click="OnPluginActionKeywordsClick"
+                                                                        Content="{Binding ActionKeywordsText}"
+                                                                        Cursor="Hand"
+                                                                        DockPanel.Dock="Right"
+                                                                        FontWeight="Bold"
+                                                                        ToolTip="Change Action Keywords"
+                                                                        Visibility="{Binding ActionKeywordsVisibility}" />
+                                                                </DockPanel>
+
+                                                            </ItemsControl>
+                                                        </Border>
+                                                    </StackPanel>
+
+                                                    <StackPanel>
+
+
+                                                        <Border
+                                                            Padding="0"
+                                                            HorizontalAlignment="Stretch"
+                                                            VerticalAlignment="Center"
+                                                            Background="White"
+                                                            BorderBrush="#e6e6e6"
+                                                            BorderThickness="0,1,0,0">
+                                                            <!--#region SubInfo Styling-->
+                                                            <Border.Style>
+                                                                <Style TargetType="{x:Type Border}">
+                                                                    <Setter Property="Visibility" Value="Visible" />
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding ElementName=PluginSettingControl, Path=ActualHeight}" Value="0">
+                                                                            <Setter Property="Visibility" Value="Collapsed" />
+                                                                            <Setter Property="BorderThickness" Value="0" />
+                                                                            <Setter Property="Padding" Value="0" />
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Border.Style>
+                                                        </Border>
+                                                        <!--#endregion-->
+                                                        <ContentControl
+                                                            x:Name="PluginSettingControl"
+                                                            MaxWidth="750"
+                                                            MaxHeight="550"
+                                                            Margin="0"
+                                                            Padding="1"
+                                                            VerticalAlignment="Stretch"
+                                                            Content="{Binding SettingControl}" />
+
+                                                    </StackPanel>
+
+                                                    <StackPanel>
+                                                        <Border
+                                                            Margin="0"
+                                                            Padding="0,12,0,0"
+                                                            VerticalAlignment="Center"
+                                                            BorderThickness="0,1,0,0"
+                                                            CornerRadius="0"
+                                                            Style="{DynamicResource SettingGroupBox}"
+                                                            Visibility="{Binding ActionKeywordsVisibility}">
+                                                            <ItemsControl Style="{DynamicResource SettingGrid}">
+                                                                <StackPanel
+                                                                    Margin="0,0,-14,0"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Center"
+                                                                    Orientation="Horizontal"
+                                                                    Style="{StaticResource TextPanel}">
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="10,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{DynamicResource author}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{Binding PluginPair.Metadata.Author}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        VerticalAlignment="Center"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="|" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{DynamicResource plugin_init_time}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{Binding InitilizaTime}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        VerticalAlignment="Center"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="|" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{DynamicResource plugin_query_time}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{Binding QueryTime}" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        VerticalAlignment="Center"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="| version" />
+                                                                    <TextBlock
+                                                                        MaxWidth="100"
+                                                                        Margin="5,0,0,0"
+                                                                        VerticalAlignment="Center"
+                                                                        FontSize="11"
+                                                                        Foreground="#8F8F8F"
+                                                                        Text="{Binding PluginPair.Metadata.Version}" />
+
+                                                                    <TextBlock
+                                                                        MaxWidth="120"
+                                                                        Margin="10,0,0,0"
+                                                                        HorizontalAlignment="Right"
+                                                                        VerticalAlignment="Center"
+                                                                        Cursor="Hand"
+                                                                        FontSize="12">
+                                                                        <Hyperlink
+                                                                            Foreground="#8F8F8F"
+                                                                            NavigateUri="{Binding PluginPair.Metadata.Website}"
+                                                                            RequestNavigate="OnRequestNavigate">
+                                                                            <Run Text="Website" />
+                                                                        </Hyperlink>
+                                                                    </TextBlock>
+
+                                                                    <TextBlock
+                                                                        MaxWidth="120"
+                                                                        Margin="10,0,0,0"
+                                                                        HorizontalAlignment="Right"
+                                                                        VerticalAlignment="Center"
+                                                                        Cursor="Hand"
+                                                                        FontSize="12"
+                                                                        Foreground="#8f8f8f"
+                                                                        MouseUp="OnPluginDirecotyClick"
+                                                                        Text="{DynamicResource pluginDirectory}"
+                                                                        TextDecorations="Underline" />
+                                                                </StackPanel>
+
+                                                            </ItemsControl>
+                                                        </Border>
+
+                                                    </StackPanel>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Expander>
+
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                        </Border>
+
+                    </Grid>
+                </TabItem>
+
+                <!--#region Plugin Store-->
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe719;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
+                        </Grid>
+                    </TabItem.Header>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="72" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Padding="5,18,0,0"
+                            Background="#f3f3f3">
+                            <TextBlock
+                                Margin="0,5,0,5"
+                                FontSize="30"
+                                Text="{DynamicResource pluginStore}"
+                                TextAlignment="left" />
+                        </Border>
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Padding="5,18,32,0"
+                            Background="#f3f3f3">
+                            <Button
+                                Height="34"
+                                Margin="0,5,0,5"
+                                Padding="12,4,12,4"
+                                HorizontalAlignment="Right"
+                                Background="#ffffff"
+                                BorderBrush="#cecece"
+                                BorderThickness="1,1,1,2"
+                                Click="OnPluginStoreRefreshClick"
+                                Content="{DynamicResource refresh}"
+                                FontSize="13" />
+                        </Border>
+                        <Border
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Padding="0,0,0,0"
+                            Background="#f3f3f3">
+                            <ListBox
+                                x:Name="StoreListBox"
+                                Width="Auto"
+                                Margin="6,0,0,0"
+                                Padding="0,0,0,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                ItemContainerStyle="{StaticResource StoreList}"
+                                ItemsSource="{Binding ExternalPlugins}"
+                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                SelectionMode="Single">
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <UniformGrid
+                                            Margin="0,0,6,18"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Top"
+                                            Columns="2"
+                                            IsItemsHost="True"
+                                            SnapsToDevicePixels="True" />
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <!--  Hover Layout Style  -->
+
+                                        <ToggleButton
+                                            Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
+                                            HorizontalAlignment="Left"
+                                            HorizontalContentAlignment="left"
+                                            Background="Transparent"
+                                            IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
+                                            Style="{StaticResource StoreItem}">
+                                            <ToggleButton.Template>
+                                                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                                                    <ContentPresenter
+                                                        x:Name="contentPresenter"
+                                                        Margin="{TemplateBinding Padding}"
+                                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                        Content="{TemplateBinding Content}"
+                                                        ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                        Focusable="False"
+                                                        RecognizesAccessKey="True"
+                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                                    <ControlTemplate.Triggers />
+                                                </ControlTemplate>
+                                            </ToggleButton.Template>
+
+                                            <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="72" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <StackPanel
+                                                    Grid.Column="0"
+                                                    Margin="0,0,0,0"
+                                                    VerticalAlignment="Center">
+                                                    <StackPanel.Style>
+                                                        <Style>
+                                                            <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                                    <Setter Property="StackPanel.Opacity" Value="1" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </StackPanel.Style>
+                                                    <Image
+                                                        Width="32"
+                                                        Height="32"
+                                                        Margin="8,0,6,0"
+                                                        VerticalAlignment="Center"
+                                                        Source="{Binding IcoPath, IsAsync=True}" />
+                                                </StackPanel>
+                                                <StackPanel
+                                                    Grid.Column="1"
+                                                    Margin="0,0,8,0"
+                                                    VerticalAlignment="Center"
+                                                    Panel.ZIndex="0">
+                                                    <StackPanel.Style>
+                                                        <Style>
+                                                            <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                                    <Setter Property="StackPanel.Opacity" Value="1" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </StackPanel.Style>
+                                                    <TextBlock
+                                                        Padding="0,0,20,0"
+                                                        Text="{Binding Name}"
+                                                        TextWrapping="WrapWithOverflow"
+                                                        ToolTip="{Binding Version}" />
+                                                    <TextBlock
+                                                        Margin="0,2,0,0"
+                                                        Padding="0,0,20,0"
+                                                        Foreground="#5f5f5f"
+                                                        TextWrapping="WrapWithOverflow">
+                                                        <Run
+                                                            FontSize="12"
+                                                            Foreground="#5f5f5f"
+                                                            Text="{Binding Description}" />
+                                                    </TextBlock>
+
+                                                </StackPanel>
+                                                <StackPanel
+                                                    Grid.Column="0"
+                                                    Grid.ColumnSpan="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch">
+                                                    <StackPanel.Style>
+                                                        <Style>
+                                                            <Setter Property="StackPanel.Visibility" Value="Collapsed" />
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                                    <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </StackPanel.Style>
+
+
+                                                    <Grid
+                                                        Height="94"
+                                                        HorizontalAlignment="Stretch"
+                                                        VerticalAlignment="Stretch"
+                                                        Panel.ZIndex="1">
+                                                        <Grid.Background>
+                                                            <SolidColorBrush Opacity=".95" Color="#f6f6f6" />
+                                                        </Grid.Background>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
+                                                        </Grid.ColumnDefinitions>
+
+                                                        <StackPanel
+                                                            Grid.Column="0"
+                                                            HorizontalAlignment="Stretch"
+                                                            VerticalAlignment="Center">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock
+                                                                    Margin="20,0,0,0"
+                                                                    Padding="0,0,0,0"
+                                                                    FontWeight="Bold"
+                                                                    Text="{Binding Name}"
+                                                                    TextWrapping="WrapWithOverflow"
+                                                                    ToolTip="{Binding Name}" />
+                                                                <TextBlock
+                                                                    Margin="10,0,0,0"
+                                                                    Padding="0,0,20,0"
+                                                                    Text="{Binding Version}"
+                                                                    TextWrapping="WrapWithOverflow"
+                                                                    ToolTip="{Binding Version}" />
+                                                            </StackPanel>
+                                                            <StackPanel Margin="20,2,120,0" Orientation="Vertical">
+                                                                <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
+                                                                    <Hyperlink
+                                                                        Foreground="#5F5F5F"
+                                                                        NavigateUri="{Binding Website}"
+                                                                        RequestNavigate="OnRequestNavigate">
+                                                                        <Run FontSize="12" Text="{Binding Author}" />
+                                                                    </Hyperlink>
+                                                                </TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+                                                        <Border Padding="0,0,20,0">
+                                                            <Button
+                                                                Name="ShortCutButtonPrev"
+                                                                Grid.Column="1"
+                                                                Width="90"
+                                                                MinHeight="40"
+                                                                Margin="0,0,0,0"
+                                                                HorizontalAlignment="Right"
+                                                                VerticalAlignment="Center"
+                                                                Click="OnExternalPluginInstallClick"
+                                                                Content="{DynamicResource install}"
+                                                                Foreground="Black" />
+                                                        </Border>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </Grid>
+
+                                        </ToggleButton>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                        </Border>
+
+                    </Grid>
+                </TabItem>
+                <!--#endregion-->
+
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe790;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource theme}" />
+                        </Grid>
+                    </TabItem.Header>
+                    <Border Padding="0,0,0,0">
+                        <ScrollViewer
+                            Margin="0,0,0,0"
+                            Padding="6,0,24,0"
+                            Background="#f3f3f3"
+                            ScrollViewer.CanContentScroll="False">
+                            <Grid Margin="0,0,0,0" Background="#f3f3f3">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0" />
+                                    <RowDefinition Height="350" />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" Padding="5,18,0,0">
+                                    <TextBlock
+                                        Margin="0,5,0,5"
+                                        FontSize="30"
+                                        Text="{DynamicResource theme}"
+                                        TextAlignment="left" />
                                 </Border>
-                                <Separator
-                                    Width="Auto"
-                                    BorderBrush="#e5e5e5"
-                                    BorderThickness="1" />
-                                <Border
+
+                                <StackPanel
+                                    Grid.Row="1"
                                     Margin="0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                    Background="{Binding PreviewBackground}">
+                                    <StackPanel
+                                        Margin="0,30,0,0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Orientation="Horizontal">
+                                        <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}">
+                                            <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.RowDefinitions>
+                                                        <RowDefinition Height="54" />
+                                                        <RowDefinition />
+                                                        <RowDefinition />
+                                                    </Grid.RowDefinitions>
+                                                    <Border Grid.Row="0">
+                                                        <TextBox
+                                                            IsReadOnly="True"
+                                                            Style="{DynamicResource QueryBoxStyle}"
+                                                            Text="{DynamicResource hiThere}" />
+
+                                                    </Border>
+                                                    <Canvas Style="{DynamicResource SearchIconPosition}">
+                                                        <Path
+                                                            Margin="0"
+                                                            Data="{DynamicResource SearchIconImg}"
+                                                            Stretch="Fill"
+                                                            Style="{DynamicResource SearchIconStyle}" />
+                                                    </Canvas>
+
+                                                    <Border Grid.Row="1" Margin="0,0,0,0">
+                                                        <Rectangle
+                                                            Width="Auto"
+                                                            HorizontalAlignment="Stretch"
+                                                            Style="{DynamicResource SeparatorStyle}"
+                                                            Visibility="Visible" />
+                                                    </Border>
+
+                                                    <ContentControl Grid.Row="2">
+                                                        <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
+                                                    </ContentControl>
+
+                                                </Grid>
+                                            </Border>
+                                        </Border>
+                                    </StackPanel>
+                                </StackPanel>
+
+                                <StackPanel Grid.Row="2" VerticalAlignment="Top">
+                                    <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                                        <ItemsControl Style="{StaticResource SettingGrid}">
+                                            <StackPanel Style="{StaticResource TextPanel}">
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource queryWindowShadowEffect}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource shadowEffectCPUUsage}" />
+                                            </StackPanel>
+                                            <ui:ToggleSwitch
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Width="100"
+                                                Margin="0,0,2,0"
+                                                IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                Margin="24,0,16,0"
+                                                VerticalAlignment="Center"
+                                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                                FontSize="20">
+                                                &#xeb91;
+                                            </TextBlock>
+                                        </ItemsControl>
+                                    </Border>
+                                    <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
+                                        <ItemsControl Style="{StaticResource SettingGrid}">
+                                            <StackPanel Style="{StaticResource TextPanel}">
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                                <TextBlock
+                                                    Width="100"
+                                                    Margin="0,0,8,2"
+                                                    VerticalAlignment="Center"
+                                                    Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
+                                                    TextAlignment="Right" />
+                                                <Slider
+                                                    Name="WindowWidthValue"
+                                                    Width="300"
+                                                    Margin="0,0,18,0"
+                                                    IsMoveToPointEnabled="True"
+                                                    IsSnapToTickEnabled="True"
+                                                    Maximum="900"
+                                                    Minimum="400"
+                                                    TickFrequency="10"
+                                                    Value="{Binding WindowWidthSize, Mode=TwoWay}" />
+                                            </StackPanel>
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                Margin="24,0,16,0"
+                                                VerticalAlignment="Center"
+                                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                                FontSize="20">
+                                                &#xe740;
+                                            </TextBlock>
+                                        </ItemsControl>
+                                    </Border>
+                                </StackPanel>
+
+                                <StackPanel Grid.Row="3">
+                                    <Border
+                                        Margin="0,8,0,0"
+                                        Padding="0"
+                                        HorizontalAlignment="Stretch"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <ListBox
+                                            Margin="12,12,12,12"
+                                            HorizontalAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            ui:ScrollViewerHelper.AutoHideScrollBars="True"
+                                            Background="#ffffff"
+                                            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,0,0,0" />
+                                                    <Setter Property="Margin" Value="4" />
+                                                    <Setter Property="Template">
+                                                        <Setter.Value>
+                                                            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                                                <Border
+                                                                    x:Name="Bd"
+                                                                    Padding="{TemplateBinding Padding}"
+                                                                    Background="#fefefe"
+                                                                    BorderBrush="#e5e5e5"
+                                                                    BorderThickness="1,1,1,0"
+                                                                    CornerRadius="4"
+                                                                    SnapsToDevicePixels="true">
+                                                                    <Border
+                                                                        x:Name="Bd2"
+                                                                        BorderBrush="#d3d3d3"
+                                                                        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="#f6f6f6" />
+                                                                    </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="#ffffff" />
+                                                                    </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,0,0,0">
+                                                        <TextBlock
+                                                            Margin="0"
+                                                            Padding="14,12,14,12"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            Focusable="True"
+                                                            FontSize="12"
+                                                            Text="{Binding}"
+                                                            TextWrapping="Wrap" />
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                            <ListBox.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <WrapPanel />
+                                                </ItemsPanelTemplate>
+                                            </ListBox.ItemsPanel>
+                                        </ListBox>
+
+                                    </Border>
+                                    <Border>
                                         <TextBlock
-                                            Grid.Column="1"
-                                            Margin="22,0,0,0"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource server}" />
-                                        <TextBox
-                                            Grid.Column="2"
-                                            Width="300"
-                                            Margin="0,0,16,0"
-                                            Padding="5"
-                                            IsEnabled="{Binding Settings.Proxy.Enabled}"
-                                            Text="{Binding Settings.Proxy.Server}" />
-                                    </ItemsControl>
+                                            Margin="10"
+                                            HorizontalAlignment="Right"
+                                            DockPanel.Dock="Top">
+                                            <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{DynamicResource howToCreateTheme}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                    </Border>
+                                </StackPanel>
+
+
+                                <StackPanel
+                                    Grid.Row="4"
+                                    Margin="0,0,0,10"
+                                    Orientation="Vertical">
+
+                                    <Border
+                                        Margin="0,30,0,0"
+                                        Padding="0"
+                                        CornerRadius="5"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border
+                                                Margin="0"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <StackPanel Style="{StaticResource TextPanel}">
+                                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource useGlyphUI}" />
+                                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource useGlyphUIEffect}" />
+                                                    </StackPanel>
+                                                    <ui:ToggleSwitch
+                                                        Grid.Row="0"
+                                                        Grid.Column="2"
+                                                        Width="100"
+                                                        Margin="0,0,2,0"
+                                                        IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
+                                                    <TextBlock
+                                                        Grid.Column="0"
+                                                        Margin="24,0,16,0"
+                                                        VerticalAlignment="Center"
+                                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                                        FontSize="20">
+                                                        &#xf6b8;
+                                                    </TextBlock>
+                                                </ItemsControl>
+                                            </Border>
+                                            <Separator
+                                                Width="Auto"
+                                                BorderBrush="#e5e5e5"
+                                                BorderThickness="1" />
+                                            <Border
+                                                Margin="0"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Text="{DynamicResource queryBoxFont}" />
+                                                    <StackPanel
+                                                        Grid.Column="2"
+                                                        Margin="0,0,20,0"
+                                                        Orientation="Horizontal">
+                                                        <ComboBox
+                                                            Width="180"
+                                                            Margin="20,0,0,0"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Top"
+                                                            ItemsSource="{Binding Source={StaticResource SortedFonts}}"
+                                                            SelectedItem="{Binding SelectedQueryBoxFont}" />
+                                                        <ComboBox
+                                                            Width="130"
+                                                            Margin="10,0,0,0"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Top"
+                                                            ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
+                                                            SelectedItem="{Binding SelectedQueryBoxFontFaces}">
+                                                            <ComboBox.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate>
+                                                                                <TextBlock Text="{Binding Value}" />
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ItemsControl>
+                                                                </DataTemplate>
+                                                            </ComboBox.ItemTemplate>
+                                                        </ComboBox>
+                                                    </StackPanel>
+                                                    <TextBlock
+                                                        Grid.Column="0"
+                                                        Margin="24,0,16,0"
+                                                        VerticalAlignment="Center"
+                                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                                        FontSize="20">
+                                                        &#xe990;
+                                                    </TextBlock>
+                                                </ItemsControl>
+                                            </Border>
+                                            <Separator
+                                                Width="Auto"
+                                                BorderBrush="#e5e5e5"
+                                                BorderThickness="1" />
+                                            <Border
+                                                Margin="0"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Text="{DynamicResource resultItemFont}" />
+                                                    <StackPanel
+                                                        Grid.Column="2"
+                                                        Margin="0,0,20,0"
+                                                        Orientation="Horizontal">
+                                                        <ComboBox
+                                                            Width="180"
+                                                            Margin="20,-2,0,0"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Top"
+                                                            ItemsSource="{Binding Source={StaticResource SortedFonts}}"
+                                                            SelectedItem="{Binding SelectedResultFont}" />
+                                                        <ComboBox
+                                                            Width="130"
+                                                            Margin="10,-2,0,0"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Top"
+                                                            ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
+                                                            SelectedItem="{Binding SelectedResultFontFaces}">
+                                                            <ComboBox.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate>
+                                                                                <TextBlock Text="{Binding Value}" />
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ItemsControl>
+                                                                </DataTemplate>
+                                                            </ComboBox.ItemTemplate>
+                                                        </ComboBox>
+                                                    </StackPanel>
+                                                    <TextBlock
+                                                        Grid.Column="0"
+                                                        Margin="24,0,16,0"
+                                                        VerticalAlignment="Center"
+                                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                                        FontSize="20">
+                                                        &#xe8fd;
+                                                    </TextBlock>
+                                                </ItemsControl>
+                                            </Border>
+                                        </StackPanel>
+                                    </Border>
+
+                                    <StackPanel>
+                                        <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
+                                                </StackPanel>
+                                                <Button
+                                                    Grid.Column="2"
+                                                    Width="180"
+                                                    Margin="0,0,18,0"
+                                                    HorizontalAlignment="Center"
+                                                    Click="OpenPluginFolder"
+                                                    Content="{DynamicResource OpenThemeFolder}"
+                                                    DockPanel.Dock="Top" />
+                                                <TextBlock
+                                                    Grid.Column="0"
+                                                    Margin="24,0,16,0"
+                                                    VerticalAlignment="Center"
+                                                    FontFamily="/Resources/#Segoe Fluent Icons"
+                                                    FontSize="20">
+                                                    &#xe838;
+                                                </TextBlock>
+                                            </ItemsControl>
+                                        </Border>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </TabItem>
+
+
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe92e;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}" />
+                        </Grid>
+                    </TabItem.Header>
+                    <ScrollViewer
+                        Margin="0,0,0,0"
+                        Padding="0,0,6,0"
+                        Background="#f3f3f3"
+                        ScrollViewer.CanContentScroll="False">
+                        <Border Background="#f3f3f3">
+                            <Grid Margin="5,18,18,10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="43" />
+                                    <RowDefinition Height="80" />
+                                    <RowDefinition Height="146" />
+                                    <RowDefinition Height="50" />
+                                    <RowDefinition Height="250" />
+                                    <RowDefinition Height="70" />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Margin="0,5,0,2"
+                                    FontSize="30"
+                                    Text="{DynamicResource hotkey}"
+                                    TextAlignment="left" />
+
+                                <StackPanel Grid.Row="1">
+                                    <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                                        <ItemsControl Style="{StaticResource SettingGrid}">
+                                            <StackPanel Style="{StaticResource TextPanel}">
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
+                                            </StackPanel>
+                                            <flowlauncher:HotkeyControl
+                                                x:Name="HotkeyControl"
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Width="300"
+                                                Height="35"
+                                                Margin="0,0,0,0"
+                                                HorizontalAlignment="Right"
+                                                HorizontalContentAlignment="Right"
+                                                HotkeyChanged="OnHotkeyChanged"
+                                                Loaded="OnHotkeyControlLoaded" />
+
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                Margin="24,0,16,0"
+                                                VerticalAlignment="Center"
+                                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                                FontSize="20">
+                                                &#xeda7;
+                                            </TextBlock>
+                                        </ItemsControl>
+                                    </Border>
+                                </StackPanel>
+
+                                <Border
+                                    Grid.Row="2"
+                                    Margin="0,12,0,0"
+                                    Padding="0"
+                                    CornerRadius="5"
+                                    Style="{DynamicResource SettingGroupBox}">
+                                    <StackPanel Orientation="Vertical">
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Text="{DynamicResource openResultModifiers}" />
+                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
+                                                </StackPanel>
+                                                <ComboBox
+                                                    Grid.Column="2"
+                                                    Width="120"
+                                                    Margin="0,0,18,0"
+                                                    FontSize="14"
+                                                    ItemsSource="{Binding OpenResultModifiersList}"
+                                                    SelectedItem="{Binding Settings.OpenResultModifiers}" />
+                                            </ItemsControl>
+                                        </Border>
+
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            Padding="0,10,0,0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Text="{DynamicResource showOpenResultHotkey}" />
+                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
+                                                </StackPanel>
+                                                <CheckBox
+                                                    Grid.Column="2"
+                                                    FontSize="14"
+                                                    IsChecked="{Binding Settings.ShowOpenResultHotkey}"
+                                                    Style="{DynamicResource SideControlCheckBox}" />
+                                            </ItemsControl>
+                                        </Border>
+                                    </StackPanel>
                                 </Border>
-                                <Separator
-                                    Width="Auto"
-                                    BorderBrush="#e5e5e5"
-                                    BorderThickness="1" />
-                                <Border
+
+                                <TextBlock
+                                    Grid.Row="3"
+                                    Margin="0,0,12,2"
+                                    Padding="0,12,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource customQueryHotkey}" />
+                                <ListView
+                                    Grid.Row="4"
+                                    Margin="0,0,0,0"
+                                    Background="#ffffff"
+                                    BorderBrush="DarkGray"
+                                    BorderThickness="1"
+                                    ItemsSource="{Binding Settings.CustomPluginHotkeys}"
+                                    SelectedItem="{Binding SelectedCustomPluginHotkey}"
+                                    Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
+                                    <ListView.View>
+                                        <GridView>
+                                            <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
+                                                <GridViewColumn.CellTemplate>
+                                                    <DataTemplate DataType="userSettings:CustomPluginHotkey">
+                                                        <TextBlock Text="{Binding Hotkey}" />
+                                                    </DataTemplate>
+                                                </GridViewColumn.CellTemplate>
+                                            </GridViewColumn>
+                                            <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
+                                                <GridViewColumn.CellTemplate>
+                                                    <DataTemplate DataType="userSettings:CustomPluginHotkey">
+                                                        <TextBlock Text="{Binding ActionKeyword}" />
+                                                    </DataTemplate>
+                                                </GridViewColumn.CellTemplate>
+                                            </GridViewColumn>
+                                        </GridView>
+                                    </ListView.View>
+                                </ListView>
+                                <StackPanel
+                                    Grid.Row="5"
+                                    Width="350"
                                     Margin="0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            Margin="22,0,0,0"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource port}" />
-                                        <TextBox
-                                            Grid.Column="2"
-                                            Width="100"
-                                            Margin="0,0,16,0"
-                                            IsEnabled="{Binding Settings.Proxy.Enabled}"
-                                            Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
-                                    </ItemsControl>
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Orientation="Horizontal">
+                                    <Button
+                                        Width="100"
+                                        Margin="10"
+                                        Click="OnDeleteCustomHotkeyClick"
+                                        Content="{DynamicResource delete}" />
+                                    <Button
+                                        Width="100"
+                                        Margin="10"
+                                        Click="OnnEditCustomHotkeyClick"
+                                        Content="{DynamicResource edit}" />
+                                    <Button
+                                        Width="100"
+                                        Margin="10,10,0,10"
+                                        Click="OnAddCustomeHotkeyClick"
+                                        Content="{DynamicResource add}" />
+                                </StackPanel>
+                            </Grid>
+                        </Border>
+                    </ScrollViewer>
+                </TabItem>
+
+
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xec27;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource proxy}" />
+                        </Grid>
+                    </TabItem.Header>
+                    <ScrollViewer
+                        Margin="0,0,0,0"
+                        Padding="5,0,24,0"
+                        Background="#f3f3f3"
+                        ScrollViewer.CanContentScroll="False">
+                        <Border Background="#f3f3f3">
+
+                            <StackPanel>
+                                <Border Margin="0,18,0,0">
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Margin="0,5,0,0"
+                                        FontSize="30"
+                                        Text="{DynamicResource proxy}"
+                                        TextAlignment="left" />
                                 </Border>
-                                <Separator
-                                    Width="Auto"
-                                    BorderBrush="#e5e5e5"
-                                    BorderThickness="1" />
+
+
                                 <Border
-                                    Margin="0"
-                                    BorderThickness="0"
+                                    Margin="0,10,0,0"
+                                    Padding="0"
+                                    CornerRadius="5"
                                     Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            Margin="22,0,0,0"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource userName}" />
-                                        <TextBox
-                                            Grid.Column="2"
-                                            Width="200"
-                                            Margin="0,0,16,0"
-                                            Padding="5"
-                                            IsEnabled="{Binding Settings.Proxy.Enabled}"
-                                            Text="{Binding Settings.Proxy.UserName}" />
-                                    </ItemsControl>
+                                    <StackPanel Orientation="Vertical">
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource enableProxy}" />
+                                                <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}" Style="{DynamicResource SideControlCheckBox}" />
+                                            </ItemsControl>
+                                        </Border>
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Margin="22,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource server}" />
+                                                <TextBox
+                                                    Grid.Column="2"
+                                                    Width="300"
+                                                    Margin="0,0,16,0"
+                                                    Padding="5"
+                                                    IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                    Text="{Binding Settings.Proxy.Server}" />
+                                            </ItemsControl>
+                                        </Border>
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Margin="22,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource port}" />
+                                                <TextBox
+                                                    Grid.Column="2"
+                                                    Width="100"
+                                                    Margin="0,0,16,0"
+                                                    IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                    Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
+                                            </ItemsControl>
+                                        </Border>
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Margin="22,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource userName}" />
+                                                <TextBox
+                                                    Grid.Column="2"
+                                                    Width="200"
+                                                    Margin="0,0,16,0"
+                                                    Padding="5"
+                                                    IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                    Text="{Binding Settings.Proxy.UserName}" />
+                                            </ItemsControl>
+                                        </Border>
+                                        <Separator
+                                            Width="Auto"
+                                            BorderBrush="#e5e5e5"
+                                            BorderThickness="1" />
+                                        <Border
+                                            Margin="0"
+                                            BorderThickness="0"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Margin="22,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{DynamicResource password}" />
+                                                <TextBox
+                                                    Grid.Column="2"
+                                                    Width="200"
+                                                    Margin="0,0,16,0"
+                                                    Padding="5"
+                                                    IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                    Text="{Binding Settings.Proxy.Password}" />
+                                            </ItemsControl>
+                                        </Border>
+                                    </StackPanel>
                                 </Border>
-                                <Separator
-                                    Width="Auto"
-                                    BorderBrush="#e5e5e5"
-                                    BorderThickness="1" />
-                                <Border
-                                    Margin="0"
-                                    BorderThickness="0"
-                                    Style="{DynamicResource SettingGroupBox}">
+                                <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <TextBlock
                                             Grid.Column="1"
-                                            Margin="22,0,0,0"
                                             VerticalAlignment="Center"
-                                            Text="{DynamicResource password}" />
-                                        <TextBox
+                                            Text="{DynamicResource testProxy}" />
+                                        <Button
                                             Grid.Column="2"
-                                            Width="200"
+                                            Width="150"
                                             Margin="0,0,16,0"
-                                            Padding="5"
-                                            IsEnabled="{Binding Settings.Proxy.Enabled}"
-                                            Text="{Binding Settings.Proxy.Password}" />
+                                            HorizontalAlignment="Right"
+                                            Click="OnTestProxyClick"
+                                            Content="{DynamicResource testProxy}"
+                                            IsEnabled="{Binding Settings.Proxy.Enabled}" />
                                     </ItemsControl>
                                 </Border>
                             </StackPanel>
                         </Border>
-                        <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
-                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                <TextBlock
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource testProxy}" />
-                                <Button
-                                    Grid.Column="2"
-                                    Width="150"
-                                    Margin="0,0,16,0"
-                                    HorizontalAlignment="Right"
-                                    Click="OnTestProxyClick"
-                                    Content="{DynamicResource testProxy}"
-                                    IsEnabled="{Binding Settings.Proxy.Enabled}" />
-                            </ItemsControl>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ScrollViewer>
-        </TabItem>
-        <TabItem>
-            <TabItem.Header>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,12,0"
-                        FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="20">
-                        &#xe946;
-                    </TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource about}" />
-                </Grid>
-            </TabItem.Header>
-            <Border Background="#f3f3f3">
-                <Grid Height="400" Margin="65,0">
-                    <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
-                    <Grid.Resources>
-                        <Style TargetType="{x:Type TextBlock}">
-                            <Setter Property="Margin" Value="10,25,0,0" />
-                            <Setter Property="FontSize" Value="14" />
-                        </Style>
-                    </Grid.Resources>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.ColumnSpan="2"
-                        FontSize="12"
-                        Text="{Binding ActivatedTimes, Mode=OneWay}" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Text="{DynamicResource website}" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left">
-                        <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                            <Run Text="{Binding Website, Mode=OneWay}" />
-                        </Hyperlink>
-                    </TextBlock>
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Text="Version" />
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Text="{Binding Version}" />
-                    <TextBlock
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Text="{DynamicResource releaseNotes}" />
-                    <TextBlock Grid.Row="3" Grid.Column="1">
-                        <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                            <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
-                        </Hyperlink>
-                    </TextBlock>
-                    <TextBlock
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Text="{DynamicResource documentation}" />
-                    <TextBlock Grid.Row="4" Grid.Column="1">
-                        <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                            <Run Text="{Binding Documentation, Mode=OneWay}" />
-                        </Hyperlink>
-                    </TextBlock>
-                    <Button
-                        Grid.Row="5"
-                        Grid.Column="0"
-                        Margin="10,30,10,10"
-                        HorizontalAlignment="Left"
-                        Click="OnCheckUpdates"
-                        Content="{DynamicResource checkUpdates}" />
-                </Grid>
-            </Border>
-        </TabItem>
-    </TabControl>
+                    </ScrollViewer>
+                </TabItem>
+                <TabItem>
+                    <TabItem.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,12,0"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe946;
+                            </TextBlock>
+                            <TextBlock Grid.Column="1" Text="{DynamicResource about}" />
+                        </Grid>
+                    </TabItem.Header>
+                    <Border Background="#f3f3f3">
+                        <Grid Height="400" Margin="65,0">
+                            <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
+                            <Grid.Resources>
+                                <Style TargetType="{x:Type TextBlock}">
+                                    <Setter Property="Margin" Value="10,25,0,0" />
+                                    <Setter Property="FontSize" Value="14" />
+                                </Style>
+                            </Grid.Resources>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.ColumnSpan="2"
+                                FontSize="12"
+                                Text="{Binding ActivatedTimes, Mode=OneWay}" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Text="{DynamicResource website}" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                HorizontalAlignment="Left">
+                                <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                    <Run Text="{Binding Website, Mode=OneWay}" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Text="Version" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Text="{Binding Version}" />
+                            <TextBlock
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Text="{DynamicResource releaseNotes}" />
+                            <TextBlock Grid.Row="3" Grid.Column="1">
+                                <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                    <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <TextBlock
+                                Grid.Row="4"
+                                Grid.Column="0"
+                                Text="{DynamicResource documentation}" />
+                            <TextBlock Grid.Row="4" Grid.Column="1">
+                                <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                    <Run Text="{Binding Documentation, Mode=OneWay}" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <Button
+                                Grid.Row="5"
+                                Grid.Column="0"
+                                Margin="10,30,10,10"
+                                HorizontalAlignment="Left"
+                                Click="OnCheckUpdates"
+                                Content="{DynamicResource checkUpdates}" />
+                        </Grid>
+                    </Border>
+                </TabItem>
+            </TabControl>
+        </Grid>
+    </Border>
 </Window>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 6d280ea3e..9330e4921 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -15,6 +15,7 @@ using Flow.Launcher.ViewModel;
 using Flow.Launcher.Helper;
 using System.Windows.Controls;
 using Flow.Launcher.Core.ExternalPlugins;
+using System.Runtime.InteropServices;
 
 namespace Flow.Launcher
 {
@@ -297,5 +298,146 @@ namespace Flow.Launcher
                 textBox.MoveFocus(tRequest);
             }
         }
+
+        /* Custom TitleBar */
+
+        private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)
+        {
+            this.WindowState = WindowState.Minimized;
+        }
+
+        private void OnMaximizeRestoreButtonClick(object sender, RoutedEventArgs e)
+        {
+            if (this.WindowState == WindowState.Maximized)
+            {
+                this.WindowState = WindowState.Normal;
+            }
+            else
+            {
+                this.WindowState = WindowState.Maximized;
+            }
+        }
+
+        private void OnCloseButtonClick(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void RefreshMaximizeRestoreButton()
+        {
+            if (this.WindowState == WindowState.Maximized)
+            {
+                this.maximizeButton.Visibility = Visibility.Collapsed;
+                this.restoreButton.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                this.maximizeButton.Visibility = Visibility.Visible;
+                this.restoreButton.Visibility = Visibility.Collapsed;
+            }
+        }
+        
+
+        private void Window_StateChanged(object sender, EventArgs e)
+        {
+            this.RefreshMaximizeRestoreButton();
+        }
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);
+            ((HwndSource)PresentationSource.FromVisual(this)).AddHook(HookProc);
+        }
+
+        public static IntPtr HookProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == WM_GETMINMAXINFO)
+            {
+                // We need to tell the system what our size should be when maximized. Otherwise it will cover the whole screen,
+                // including the task bar.
+                MINMAXINFO mmi = (MINMAXINFO)Marshal.PtrToStructure(lParam, typeof(MINMAXINFO));
+
+                // Adjust the maximized size and position to fit the work area of the correct monitor
+                IntPtr monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+
+                if (monitor != IntPtr.Zero)
+                {
+                    MONITORINFO monitorInfo = new MONITORINFO();
+                    monitorInfo.cbSize = Marshal.SizeOf(typeof(MONITORINFO));
+                    GetMonitorInfo(monitor, ref monitorInfo);
+                    RECT rcWorkArea = monitorInfo.rcWork;
+                    RECT rcMonitorArea = monitorInfo.rcMonitor;
+                    mmi.ptMaxPosition.X = Math.Abs(rcWorkArea.Left - rcMonitorArea.Left);
+                    mmi.ptMaxPosition.Y = Math.Abs(rcWorkArea.Top - rcMonitorArea.Top);
+                    mmi.ptMaxSize.X = Math.Abs(rcWorkArea.Right - rcWorkArea.Left);
+                    mmi.ptMaxSize.Y = Math.Abs(rcWorkArea.Bottom - rcWorkArea.Top);
+                }
+
+                Marshal.StructureToPtr(mmi, lParam, true);
+            }
+
+            return IntPtr.Zero;
+        }
+
+        private const int WM_GETMINMAXINFO = 0x0024;
+
+        private const uint MONITOR_DEFAULTTONEAREST = 0x00000002;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromWindow(IntPtr handle, uint flags);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
+
+        [Serializable]
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public RECT(int left, int top, int right, int bottom)
+            {
+                this.Left = left;
+                this.Top = top;
+                this.Right = right;
+                this.Bottom = bottom;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MONITORINFO
+        {
+            public int cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public uint dwFlags;
+        }
+
+        [Serializable]
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int X;
+            public int Y;
+
+            public POINT(int x, int y)
+            {
+                this.X = x;
+                this.Y = y;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MINMAXINFO
+        {
+            public POINT ptReserved;
+            public POINT ptMaxSize;
+            public POINT ptMaxPosition;
+            public POINT ptMinTrackSize;
+            public POINT ptMaxTrackSize;
+        }
     }
 }
\ No newline at end of file

From 6d4946d6d891814dd0a5b469a81c25160f581ea9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 15 Nov 2021 15:43:28 +0900
Subject: [PATCH 023/107] - Add Dark Theme - Change Hardcoded Color to style

---
 Flow.Launcher/App.xaml                        |   29 +-
 .../Resources/CustomControlTemplate.xaml      |   14 +
 Flow.Launcher/Resources/Dark.xaml             | 1494 ++++++++++++++++
 Flow.Launcher/Resources/Light.xaml            | 1495 +++++++++++++++++
 Flow.Launcher/SettingWindow.xaml              |  248 +--
 Flow.Launcher/SettingWindow.xaml.cs           |    2 -
 6 files changed, 3175 insertions(+), 107 deletions(-)
 create mode 100644 Flow.Launcher/Resources/Dark.xaml
 create mode 100644 Flow.Launcher/Resources/Light.xaml

diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 68ba806d2..9049f8e7e 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -1,13 +1,28 @@
-<Application x:Class="Flow.Launcher.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ui="http://schemas.modernwpf.com/2019"
-             ShutdownMode="OnMainWindowClose"
-             Startup="OnStartupAsync">
+<Application
+    x:Class="Flow.Launcher.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    ShutdownMode="OnMainWindowClose"
+    Startup="OnStartupAsync">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Light" />
+                <ui:ThemeResources RequestedTheme="Light">
+                    <ui:ThemeResources.ThemeDictionaries>
+                        <ResourceDictionary x:Key="Light">
+                            <ResourceDictionary.MergedDictionaries>
+                                <ResourceDictionary Source="pack://application:,,,/Resources/Light.xaml" />
+                            </ResourceDictionary.MergedDictionaries>
+                        </ResourceDictionary>
+                        <ResourceDictionary x:Key="Dark">
+                            <ResourceDictionary.MergedDictionaries>
+                                <ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
+                            </ResourceDictionary.MergedDictionaries>
+                            <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="{StaticResource SystemBaseHighColor}" />
+                        </ResourceDictionary>
+                    </ui:ThemeResources.ThemeDictionaries>
+                </ui:ThemeResources>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Themes/Darker.xaml" />
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index bcb20579f..113b726a7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5,6 +5,20 @@
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
 
+    <!--  Setting Window  -->
+    <Style x:Key="PageTitle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+    </Style>
+    <Style x:Key="Glyph" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+    </Style>
+    <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+    </Style>
+    <Style x:Key="SettingSeparatorStyle" TargetType="{x:Type Separator}">
+        <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
+    </Style>
+
     <!--  Title Bar  -->
 
     <Style x:Key="WindowMainPanelStyle" TargetType="{x:Type Border}">
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
new file mode 100644
index 000000000..9e67f16a9
--- /dev/null
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -0,0 +1,1494 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="http://schemas.modernwpf.com/2019"
+    xmlns:m="http://schemas.modernwpf.com/2019"
+    xmlns:primitives="http://schemas.modernwpf.com/2019"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <SolidColorBrush x:Key="Color01B" Color="#202020" />
+    <SolidColorBrush x:Key="Color02B" Color="#2b2b2b" />
+    <SolidColorBrush x:Key="Color03B" Color="#1d1d1d" />
+    <SolidColorBrush x:Key="Color04B" Color="#cfcfcf" />
+    <SolidColorBrush x:Key="Color05B" Color="#ffffff" />
+    <SolidColorBrush x:Key="Color06B" Color="#2d2d2d" />
+    <SolidColorBrush x:Key="Color07B" Color="#363636" />
+    <Color x:Key="Color01">#202020</Color>
+    <Color x:Key="Color02">#2b2b2b</Color>
+    <Color x:Key="Color03">#1d1d1d</Color>
+    <Color x:Key="Color04">#cfcfcf</Color>
+    <Color x:Key="Color05">#ffffff</Color>
+    <Color x:Key="Color06">#2d2d2d</Color>
+    <Color x:Key="Color07">#363636</Color>
+
+
+    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+
+    <SolidColorBrush x:Key="SystemAccentColorDark1Brush" Color="{m:DynamicColor SystemAccentColorDark1}" />
+    <SolidColorBrush x:Key="SystemAccentColorDark2Brush" Color="{m:DynamicColor SystemAccentColorDark2}" />
+    <SolidColorBrush x:Key="SystemAccentColorDark3Brush" Color="{m:DynamicColor SystemAccentColorDark3}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight1Brush" Color="{m:DynamicColor SystemAccentColorLight1}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight2Brush" Color="{m:DynamicColor SystemAccentColorLight2}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight3Brush" Color="{m:DynamicColor SystemAccentColorLight3}" />
+
+    <Color x:Key="SystemAltHighColor">#FF000000</Color>
+    <Color x:Key="SystemAltLowColor">#33000000</Color>
+    <Color x:Key="SystemAltMediumColor">#99000000</Color>
+    <Color x:Key="SystemAltMediumHighColor">#CC000000</Color>
+    <Color x:Key="SystemAltMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemBaseHighColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemBaseLowColor">#33FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color>
+    <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
+    <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
+    <Color x:Key="SystemChromeBlackMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeBlackMediumColor">#CC000000</Color>
+    <Color x:Key="SystemChromeDisabledHighColor">#FF333333</Color>
+    <Color x:Key="SystemChromeDisabledLowColor">#FF858585</Color>
+    <Color x:Key="SystemChromeHighColor">#FF767676</Color>
+    <Color x:Key="SystemChromeLowColor">#FF171717</Color>
+    <Color x:Key="SystemChromeMediumColor">#FF1F1F1F</Color>
+    <Color x:Key="SystemChromeMediumHighColor">#FF323232</Color>
+    <Color x:Key="SystemChromeMediumLowColor">#FF2B2B2B</Color>
+    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemChromeGrayColor">#FF767676</Color>
+    <Color x:Key="SystemListLowColor">#19FFFFFF</Color>
+    <Color x:Key="SystemListMediumColor">#33FFFFFF</Color>
+    <Color x:Key="SystemErrorTextColor">#FFF000</Color>
+
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumLowBrush" Color="{m:StaticColor SystemAltMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackLowBrush" Color="{m:StaticColor SystemChromeBlackLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackHighBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeGrayBrush" Color="{m:StaticColor SystemChromeGrayColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentHighBrush"
+        Opacity="0.9"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentLowBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentMediumBrush"
+        Opacity="0.8"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeAltLowBrush" Color="{m:StaticColor SystemChromeAltLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentHighBrush"
+        Opacity="0.9"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentLowBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentMediumBrush"
+        Opacity="0.8"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentVeryHighBrush"
+        Opacity="0.9"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentMediumLowBrush"
+        Opacity="0.75"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeLowBrush" Color="{m:StaticColor SystemChromeLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{m:StaticColor SystemErrorTextColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlTransientBorderBrush"
+        Opacity="0.36"
+        Color="#000000" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorDefaultBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="AcrylicInAppFillColorDefaultBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorDefaultInverseBrush" Color="#F2F2F2" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorBaseBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlDefaultBrighteningBrush"
+        Opacity="0.0419"
+        Color="#FFFFFF" />
+    <m:StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+
+    <!--  Acrylic Brushes  -->
+    <SolidColorBrush x:Key="SystemControlAcrylicElementBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlChromeMediumLowAcrylicElementMediumBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+
+    <!--  Background Brushes  -->
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent3RevealBackgroundBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent2RevealBackgroundBrush"
+        Opacity="0.8"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowRevealBaseLowBackgroundBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowRevealAccentBackgroundBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealListLowBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent3RevealAccent2BackgroundBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+
+    <!--  Border Brushes  -->
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentRevealBorderBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighRevealBorderBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBorderBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighRevealBorderBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumRevealChromeBorderBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumRevealBorderBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowRevealBorderBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteRevealBorderBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealListLowBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowRevealBorderBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumRevealBorderBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlForegroundRevealTransparentBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBorderBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighRevealBorderBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowRevealBorderBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrushPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="GridViewItemRevealBorderBrush" Color="Transparent" />
+
+    <!--  Legacy brushes  -->
+    <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#FF000000" />
+
+    <!--  Resources for AppBarButton  -->
+    <sys:Double x:Key="AppBarExpandButtonThemeHeight">24</sys:Double>
+    <sys:Double x:Key="AppBarExpandButtonThemeWidth">48</sys:Double>
+    <sys:Double x:Key="AppBarExpandButtonCircleDiameter">3</sys:Double>
+
+    <m:StaticResource x:Key="AppBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushSubMenuOpened" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for AppBarToggleButton  -->
+    <m:StaticResource x:Key="AppBarToggleButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlDisabledAccentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlay" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayCheckedPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayCheckedPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundChecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <m:StaticResource x:Key="AppBarSeparatorForeground" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!--  Resources for AutoSuggestBox  -->
+    <sys:Double x:Key="AutoSuggestListMaxHeight">374</sys:Double>
+    <sys:Double x:Key="AutoSuggestListBorderOpacity">0</sys:Double>
+    <Thickness x:Key="AutoSuggestListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoSuggestListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoSuggestListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoSuggestListViewItemMargin">12,11,0,13</Thickness>
+    <m:StaticResource x:Key="AutoSuggestBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="AutoSuggestBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <m:StaticResource x:Key="AutoSuggestBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <sys:Double x:Key="AutoSuggestBoxIconFontSize">12</sys:Double>
+
+    <!--  Resources for Button  -->
+    <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="ButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for CalendarDatePicker  -->
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for CalendarView  -->
+    <m:StaticResource x:Key="CalendarViewFocusBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedPressedBorderBrush" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedBorderBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CalendarViewHoverBorderBrush" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewPressedBorderBrush" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewTodayForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CalendarViewBlackoutForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewPressedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewOutOfScopeForeground" ResourceKey="SystemControlHyperlinkBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewOutOfScopeBackground" ResourceKey="SystemControlDisabledChromeMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="CalendarViewForeground" ResourceKey="SystemControlHyperlinkBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarViewBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="CalendarViewBorderBrush" ResourceKey="SystemControlForegroundChromeMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewWeekDayForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for CheckBox  -->
+    <sys:Double x:Key="CheckBoxBorderThemeThickness">1</sys:Double>
+    <sys:Double x:Key="CheckBoxCheckedStrokeThickness">0</sys:Double>
+    <m:StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <!--  Resource for ComboBox  -->
+    <sys:Double x:Key="ComboBoxThemeMinWidth">64</sys:Double>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
+    <m:StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+
+    <!--  Resources for ComboBoxItem  -->
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <m:StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for CommandBar  -->
+    <sys:Double x:Key="CommandBarOverflowMinWidth">160</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowTouchMinWidth">240</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowMaxWidth">480</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowMaxHeight">198</sys:Double>
+    <m:StaticResource x:Key="CommandBarBackground" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <m:StaticResource x:Key="CommandBarForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CommandBarHighContrastBorder" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="CommandBarEllipsisIconForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CommandBarOverflowPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="CommandBarOverflowPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="CommandBarLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <Thickness x:Key="CommandBarOverflowPresenterBorderThickness">1</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderDownThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderUpThickness">0,1,0,0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderPadding">0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderDownPadding">0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderUpPadding">0</Thickness>
+
+    <!--  Resources for CommandBarFlyout  -->
+    <Thickness x:Key="CommandBarFlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="CommandBarFlyoutBorderUpThemeThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="CommandBarFlyoutBorderDownThemeThickness">1,0,1,1</Thickness>
+    <m:StaticResource x:Key="CommandBarFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for ContentDialog  -->
+    <sys:Double x:Key="ContentDialogMinWidth">320</sys:Double>
+    <sys:Double x:Key="ContentDialogMaxWidth">548</sys:Double>
+    <sys:Double x:Key="ContentDialogMinHeight">184</sys:Double>
+    <sys:Double x:Key="ContentDialogMaxHeight">756</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMinWidth">130</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMaxWidth">202</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMinHeight">32</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonHeight">32</sys:Double>
+    <sys:Double x:Key="ContentDialogTitleMaxHeight">56</sys:Double>
+    <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
+    <Thickness x:Key="ContentDialogButton1HostMargin">0,0,4,0</Thickness>
+    <Thickness x:Key="ContentDialogButton2HostMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentScrollViewerMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,0,0</Thickness>
+    <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
+    <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
+    <m:StaticResource x:Key="ContentDialogForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlPageBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ContentDialogLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for DataGrid  -->
+    <sys:Double x:Key="ListAccentLowOpacity">0.6</sys:Double>
+    <sys:Double x:Key="ListAccentMediumOpacity">0.8</sys:Double>
+    <SolidColorBrush x:Key="InvalidBrush" Color="#FFFF00" />
+    <SolidColorBrush x:Key="FillerGridLinesBrush" Color="Transparent" />
+    <m:StaticResource x:Key="ScrollBarsSeparatorBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
+    <m:StaticResource x:Key="DataGridColumnHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <m:StaticResource x:Key="DataGridColumnHeaderDraggedBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridColumnHeaderPointerOverBrush" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="DataGridColumnHeaderPressedBrush" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <SolidColorBrush x:Key="SystemControlGridLinesBaseMediumLowBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="SystemControlRowGroupHeaderBackgroundMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCurrencyVisualPrimaryBrush" Color="Transparent" />
+    <m:StaticResource x:Key="GridLinesBrush" ResourceKey="SystemControlGridLinesBaseMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridDetailsPresenterBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="FillerGridLinesBrush" />
+    <m:StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <m:StaticResource x:Key="DataGridRowHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowHeaderBackgroundBrush" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="DataGridRowInvalidBrush" ResourceKey="InvalidBrush" />
+    <m:StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="DataGridCellFocusVisualPrimaryBrush" ResourceKey="SystemControlFocusVisualPrimaryBrush" />
+    <m:StaticResource x:Key="DataGridCellFocusVisualSecondaryBrush" ResourceKey="SystemControlFocusVisualSecondaryBrush" />
+    <m:StaticResource x:Key="DataGridCellInvalidBrush" ResourceKey="InvalidBrush" />
+    <m:StaticResource x:Key="DataGridRowHoveredBackground" ResourceKey="SystemControlHighlightListLowBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <m:StaticResource x:Key="DataGridRowSelectedForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <Thickness x:Key="DatePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutButtonBorderThickness">0</Thickness>
+
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+
+    <!--  Resources for FlipView  -->
+    <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
+    <m:StaticResource x:Key="FlipViewBackground" ResourceKey="SystemControlPageBackgroundListLowBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for FlyoutPresenter  -->
+    <sys:Double x:Key="FlyoutThemeMaxHeight">758</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMaxWidth">456</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMinHeight">40</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMinWidth">96</sys:Double>
+    <sys:Double x:Key="FlyoutThemeTouchMinWidth">240</sys:Double>
+    <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
+    <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
+    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+
+    <!--  Resources for HyperlinkButton  -->
+    <Thickness x:Key="HyperlinkButtonBorderThemeThickness">0</Thickness>
+    <m:StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackground" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundDisabled" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for ListBox  -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+
+    <!--  Resources for ListViewHeaderItem  -->
+    <sys:Double x:Key="ListViewHeaderItemMinHeight">44</sys:Double>
+    <sys:Double x:Key="GridViewHeaderItemMinHeight">44</sys:Double>
+    <sys:Double x:Key="ListViewHeaderItemThemeFontSize">20</sys:Double>
+    <sys:Double x:Key="GridViewHeaderItemThemeFontSize">20</sys:Double>
+    <m:StaticResource x:Key="ListViewHeaderItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="GridViewHeaderItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewHeaderItemDividerStroke" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="GridViewHeaderItemDividerStroke" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <!--  Resources for ListViewItem  -->
+    <sys:Double x:Key="ListViewItemContentOffsetX">-40.5</sys:Double>
+    <sys:Double x:Key="ListViewItemDisabledThemeOpacity">0.55</sys:Double>
+    <sys:Double x:Key="ListViewItemDragThemeOpacity">0.80</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderThemeOpacity">0.80</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderTargetThemeOpacity">0.50</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderTargetThemeScale">0.95</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderHintThemeOffset">10.0</sys:Double>
+    <sys:Double x:Key="ListViewItemSelectedBorderThemeThickness">4</sys:Double>
+    <m:StaticResource x:Key="ListViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentMediumLowBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentVeryHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusVisualPrimaryBrush" ResourceKey="SystemControlFocusVisualPrimaryBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusVisualSecondaryBrush" ResourceKey="SystemControlFocusVisualSecondaryBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusBorderBrush" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusSecondaryBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemCheckBrush" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ListViewItemCheckBoxBrush" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ListViewItemDragBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewItemDragForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ListViewItemPlaceholderBackground" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <sys:Boolean x:Key="ListViewItemSelectionCheckMarkVisualEnabled">True</sys:Boolean>
+    <!--<ListViewItemPresenterCheckMode x:Key="ListViewItemCheckMode">Inline</ListViewItemPresenterCheckMode>-->
+
+    <!--  Resources for LoopingSelector  -->
+    <m:StaticResource x:Key="LoopingSelectorButtonBackground" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <!--  Resources for LoopingSelectorItem  -->
+    <m:StaticResource x:Key="LoopingSelectorItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+
+    <!--  Resources for MenuBar  -->
+    <m:StaticResource x:Key="MenuBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundSelected" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <Thickness x:Key="MenuBarItemBorderThickness">0</Thickness>
+    <m:StaticResource x:Key="MenuBarItemBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushSelected" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+
+    <!--  Resources for MenuFlyout  -->
+    <sys:Double x:Key="MenuFlyoutSeparatorThemeHeight">1</sys:Double>
+    <sys:Double x:Key="MenuFlyoutThemeMinHeight">32</sys:Double>
+    <Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="MenuFlyoutPresenterThemePadding">0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemChevronMargin">24,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePadding">11,9,11,10</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">11,4,11,7</Thickness>
+    <Thickness x:Key="MenuFlyoutItemPlaceholderThemeThickness">28,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemDoublePlaceholderThemeThickness">56,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutSeparatorThemePadding">12,4,12,4</Thickness>
+    <m:StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.MenuFlyoutItem  -->
+    <m:StaticResource x:Key="MenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.ToggleMenuFlyoutItem  -->
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.MenuFlyoutSubItem  -->
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevron" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightAccentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushSubMenuOpened" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for NavigationView  -->
+    <m:StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <m:StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundChecked" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundChecked" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushChecked" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelected" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemForeground" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemRevealBackgroundFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemRevealIconForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemRevealContentForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for NavigationBackButton  -->
+    <m:StaticResource x:Key="NavigationViewBackButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for NumberBox  -->
+    <m:StaticResource x:Key="NumberBoxPopupIndicatorForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+
+    <!--  The following NumberBoxPopup* theme resources resource must be defined at the app level in order to take effect.  -->
+    <m:StaticResource x:Key="NumberBoxPopupBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="NumberBoxPopupBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <Thickness x:Key="NumberBoxPopupBorderThickness">1</Thickness>
+
+    <m:StaticResource x:Key="NumberBoxPopupSpinButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <Thickness x:Key="NumberBoxPopupSpinButtonBorderThickness">0</Thickness>
+
+    <!--  Resources for PersonPicture  -->
+    <SolidColorBrush x:Key="PersonPictureForegroundThemeBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseFillThemeBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <sys:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">0.8</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1.0</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseStrokeThickness">0</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</sys:Double>
+
+    <!--  Resources for Pivot  -->
+    <sys:Double x:Key="PivotHeaderItemFontSize">24</sys:Double>
+    <sys:Double x:Key="PivotHeaderItemLockedTranslation">40</sys:Double>
+    <sys:Double x:Key="PivotTitleFontSize">14</sys:Double>
+    <sys:Int32 x:Key="PivotHeaderItemCharacterSpacing">-25</sys:Int32>
+    <Thickness x:Key="PivotHeaderItemMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="PivotItemMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="PivotNavButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="PivotNavButtonMargin">0,6,0,0</Thickness>
+    <Thickness x:Key="PivotPortraitThemePadding">12,14,0,13</Thickness>
+    <FontWeight x:Key="PivotHeaderItemThemeFontWeight">350</FontWeight>
+    <FontWeight x:Key="PivotTitleThemeFontWeight">Bold</FontWeight>
+    <m:StaticResource x:Key="PivotBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!--  Resources for ProgressBar  -->
+    <sys:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</sys:Double>
+    <sys:Double x:Key="ProgressBarThemeMinHeight">4</sys:Double>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <Color x:Key="SystemControlErrorBackgroundColor">#33FFFFFF</Color>
+
+    <!--  Resources for ProgressRing  -->
+    <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+    <!--  Resources for RadioButton  -->
+    <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>
+    <m:StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for RadioButtons  -->
+    <m:StaticResource x:Key="RadioButtonsHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonsHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for RatingControl  -->
+    <m:StaticResource x:Key="RatingControlUnselectedForeground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="RatingControlSelectedForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="RatingControlPlaceholderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverPlaceholderForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverUnselectedForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverSelectedForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="RatingControlDisabledSelectedForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <!--  If this Foreground property is removed/renamed, please update ThemeResourcesTests::VerifyOverrides:  -->
+    <m:StaticResource x:Key="RatingControlCaptionForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <local:RatingItemFontInfo x:Key="RatingControlDefaultFontInfo" Glyph="&#xE735;" />
+    <local:RatingItemPathInfo x:Key="RatingControlDefaultPathInfo" Data="M 13.828125 12.246094 L 16.25 20 L 10 15.195313 L 3.75 20 L 6.171875 12.246094 L 0 7.5 L 7.65625 7.5 L 10 0 L 12.34375 7.5 L 20 7.5 Z" />
+
+    <!--  Resources for RepeatButton  -->
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="RepeatButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for ResizeGrip  -->
+    <m:StaticResource x:Key="ResizeGripForeground" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!--  Resources for ScrollBar  -->
+    <sys:Double x:Key="ScrollBarTrackBorderThemeThickness">0</sys:Double>
+    <m:StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush
+        x:Key="ScrollBarTrackFill"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush
+        x:Key="ScrollBarTrackFillPointerOver"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+    <m:StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <m:StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{m:StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{m:StaticResource ScrollBarPanningThumbBackgroundColor}" />
+
+    <!--  Resource for ScrollViewer  -->
+    <SolidColorBrush
+        x:Key="ScrollViewerScrollBarSeparatorBackground"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+
+    <!--  Resources for Slider  -->
+    <sys:Double x:Key="SliderOutsideTickBarThemeHeight">4</sys:Double>
+    <sys:Double x:Key="SliderTrackThemeHeight">2</sys:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+
+    <!--  Resources for SplitButton  -->
+    <m:StaticResource x:Key="SplitButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="SplitButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedPressed" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
+
+    <!--  Resources for SplitView  -->
+    <sys:Double x:Key="SplitViewOpenPaneThemeLength">320</sys:Double>
+    <sys:Double x:Key="SplitViewCompactPaneThemeLength">48</sys:Double>
+    <Thickness x:Key="SplitViewLeftBorderThemeThickness">0,0,1,0</Thickness>
+    <Thickness x:Key="SplitViewRightBorderThemeThickness">1,0,0,0</Thickness>
+    <m:StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for TabView  -->
+    <m:StaticResource x:Key="TabViewBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundActiveTab" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundActiveTab" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewItemSeparator" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <!--  Resources for Thumb  -->
+    <m:StaticResource x:Key="ThumbBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ThumbBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrush" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+
+    <!--  Resources for TimePicker  -->
+    <sys:Double x:Key="TimePickerSelectorThemeMinWidth">80</sys:Double>
+    <sys:Double x:Key="TimePickerSpacerThemeWidth">1</sys:Double>
+    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TimePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="TimePickerFirstHostThemeMargin">0,0,20,0</Thickness>
+    <Thickness x:Key="TimePickerThirdHostThemeMargin">20,0,0,0</Thickness>
+    <FontWeight x:Key="TimePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="TimePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="TimePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for ToggleButton  -->
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="ToggleButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for ToggleSwitch  -->
+    <sys:Double x:Key="ToggleSwitchOnStrokeThickness">0</sys:Double>
+    <sys:Double x:Key="ToggleSwitchOuterBorderStrokeThickness">1</sys:Double>
+    <m:StaticResource x:Key="ToggleSwitchContentForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnDisabled" ResourceKey="SystemControlPageBackgroundBaseLowBrush" />
+
+    <!--  Resources for ToolTip  -->
+    <sys:Double x:Key="ToolTipContentThemeFontSize">12</sys:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ToolTipBorderThemePadding">8,5,8,7</Thickness>
+    <m:StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+
+    <!--  Resources for TreeView  -->
+    <m:StaticResource x:Key="TreeViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelected" ResourceKey="SystemControlHighlightAccent3RevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightAccent2RevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckBoxBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckBoxBorderSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckGlyphSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
+
+    <sys:Double x:Key="TextControlThemeMinWidth">64</sys:Double>
+    <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+    <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
+    <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
+    <m:StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <!--  Resources for Window  -->
+    <SolidColorBrush x:Key="WindowBorder" Color="#FF707070" />
+    <SolidColorBrush x:Key="WindowBorderInactive" Color="#FF555555" />
+    <SolidColorBrush x:Key="TitleBarButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TitleBarButtonBackgroundInactive" Color="Transparent" />
+
+    <!--  Resources for AccentButtonStyle  -->
+    <m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
+    <sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>
+
+    <Style x:Key="HighVisibilityFocusVisual">
+        <Setter Property="primitives:FocusVisualHelper.FocusVisualPrimaryBrush" Value="{StaticResource SystemControlFocusVisualPrimaryBrush}" />
+        <Setter Property="primitives:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{StaticResource SystemControlFocusVisualSecondaryBrush}" />
+        <Setter Property="primitives:FocusVisualHelper.IsSystemFocusVisual" Value="True" />
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border
+                        BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryBrush}"
+                        BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        SnapsToDevicePixels="True">
+                        <Border BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
new file mode 100644
index 000000000..5f45944d7
--- /dev/null
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -0,0 +1,1495 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="http://schemas.modernwpf.com/2019"
+    xmlns:m="http://schemas.modernwpf.com/2019"
+    xmlns:primitives="http://schemas.modernwpf.com/2019"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
+    <SolidColorBrush x:Key="Color02B" Color="#ffffff" />
+    <SolidColorBrush x:Key="Color03B" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="Color04B" Color="#5f5f5f" />
+    <SolidColorBrush x:Key="Color05B" Color="#000000" />
+    <SolidColorBrush x:Key="Color06B" Color="#eaeaea" />
+    <SolidColorBrush x:Key="Color07B" Color="#f6f6f6" />
+    <Color x:Key="Color01">#f3f3f3</Color>
+    <Color x:Key="Color02">#ffffff</Color>
+    <Color x:Key="Color03">#e5e5e5</Color>
+    <Color x:Key="Color04">#5f5f5f</Color>
+    <Color x:Key="Color05">#000000</Color>
+    <Color x:Key="Color06">#eaeaea</Color>
+    <Color x:Key="Color07">#f6f6f6</Color>
+
+    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+
+    <SolidColorBrush x:Key="SystemAccentColorDark1Brush" Color="{m:DynamicColor SystemAccentColorDark1}" />
+    <SolidColorBrush x:Key="SystemAccentColorDark2Brush" Color="{m:DynamicColor SystemAccentColorDark2}" />
+    <SolidColorBrush x:Key="SystemAccentColorDark3Brush" Color="{m:DynamicColor SystemAccentColorDark3}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight1Brush" Color="{m:DynamicColor SystemAccentColorLight1}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight2Brush" Color="{m:DynamicColor SystemAccentColorLight2}" />
+    <SolidColorBrush x:Key="SystemAccentColorLight3Brush" Color="{m:DynamicColor SystemAccentColorLight3}" />
+
+    <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemAltLowColor">#33FFFFFF</Color>
+    <Color x:Key="SystemAltMediumColor">#99FFFFFF</Color>
+    <Color x:Key="SystemAltMediumHighColor">#CCFFFFFF</Color>
+    <Color x:Key="SystemAltMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemBaseHighColor">#FF000000</Color>
+    <Color x:Key="SystemBaseLowColor">#33000000</Color>
+    <Color x:Key="SystemBaseMediumColor">#99000000</Color>
+    <Color x:Key="SystemBaseMediumHighColor">#CC000000</Color>
+    <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeAltLowColor">#FF171717</Color>
+    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
+    <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
+    <Color x:Key="SystemChromeBlackMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeBlackMediumColor">#CC000000</Color>
+    <Color x:Key="SystemChromeDisabledHighColor">#FFCCCCCC</Color>
+    <Color x:Key="SystemChromeDisabledLowColor">#FF7A7A7A</Color>
+    <Color x:Key="SystemChromeHighColor">#FFCCCCCC</Color>
+    <Color x:Key="SystemChromeLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeMediumColor">#FFE6E6E6</Color>
+    <Color x:Key="SystemChromeMediumHighColor">#FFE6E6E6</Color>
+    <Color x:Key="SystemChromeMediumLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemChromeGrayColor">#FF767676</Color>
+    <Color x:Key="SystemListLowColor">#19000000</Color>
+    <Color x:Key="SystemListMediumColor">#33000000</Color>
+    <Color x:Key="SystemErrorTextColor">#C50500</Color>
+
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumLowBrush" Color="{m:StaticColor SystemAltMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackLowBrush" Color="{m:StaticColor SystemChromeBlackLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackHighBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeGrayBrush" Color="{m:StaticColor SystemChromeGrayColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltMediumHighBrush" Color="{m:StaticColor SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentHighBrush"
+        Opacity="0.7"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentLowBrush"
+        Opacity="0.4"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAltListAccentMediumBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeAltLowBrush" Color="{m:StaticColor SystemChromeAltLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentHighBrush"
+        Opacity="0.7"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentLowBrush"
+        Opacity="0.4"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentMediumBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentVeryHighBrush"
+        Opacity="0.9"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightListAccentMediumLowBrush"
+        Opacity="0.75"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltHighBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="{m:StaticColor SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeLowBrush" Color="{m:StaticColor SystemChromeLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeMediumLowBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextChromeBlackMediumLowBrush" Color="{m:StaticColor SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{m:StaticColor SystemErrorTextColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlTransientBorderBrush"
+        Opacity="0.14"
+        Color="#000000" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorDefaultBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="AcrylicInAppFillColorDefaultBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorDefaultInverseBrush" Color="#2B2B2B" />
+    <SolidColorBrush x:Key="AcrylicBackgroundFillColorBaseBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlDefaultBrighteningBrush"
+        Opacity="0.5"
+        Color="#FFFFFF" />
+    <m:StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+
+    <!--  Acrylic Brushes  -->
+    <SolidColorBrush x:Key="SystemControlAcrylicElementBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlChromeMediumLowAcrylicElementMediumBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+
+    <!--  Background Brushes  -->
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent3RevealBackgroundBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent2RevealBackgroundBrush"
+        Opacity="0.8"
+        Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowRevealBaseLowBackgroundBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowRevealAccentBackgroundBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealListLowBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush
+        x:Key="SystemControlHighlightAccent3RevealAccent2BackgroundBrush"
+        Opacity="0.6"
+        Color="{m:DynamicColor SystemAccentColor}" />
+
+    <!--  Border Brushes  -->
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentRevealBorderBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighRevealBorderBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBorderBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighRevealBorderBrush" Color="{m:StaticColor SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumRevealChromeBorderBrush" Color="{m:StaticColor SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumRevealBorderBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowRevealBorderBrush" Color="{m:StaticColor SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteRevealBorderBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealListLowBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowRevealBorderBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumRevealBorderBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlForegroundRevealTransparentBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBorderBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighRevealBorderBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowRevealBorderBrush" Color="{m:StaticColor SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowRevealBorderBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ListViewItemRevealBorderBrushPressed" Color="Transparent" />
+    <SolidColorBrush x:Key="GridViewItemRevealBorderBrush" Color="Transparent" />
+
+    <!--  Legacy brushes  -->
+    <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!--  Resources for AppBarButton  -->
+    <sys:Double x:Key="AppBarExpandButtonThemeHeight">24</sys:Double>
+    <sys:Double x:Key="AppBarExpandButtonThemeWidth">48</sys:Double>
+    <sys:Double x:Key="AppBarExpandButtonCircleDiameter">3</sys:Double>
+
+    <m:StaticResource x:Key="AppBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="AppBarButtonForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonKeyboardAcceleratorTextForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarButtonBorderBrushSubMenuOpened" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarButtonSubItemChevronForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for AppBarToggleButton  -->
+    <m:StaticResource x:Key="AppBarToggleButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlDisabledAccentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlay" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayCheckedPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBackgroundHighLightOverlayCheckedPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonOverflowLabelForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundChecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="AppBarToggleButtonKeyboardAcceleratorTextForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="AppBarEllipsisButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <m:StaticResource x:Key="AppBarSeparatorForeground" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!--  Resources for AutoSuggestBox  -->
+    <sys:Double x:Key="AutoSuggestListMaxHeight">374</sys:Double>
+    <sys:Double x:Key="AutoSuggestListBorderOpacity">0</sys:Double>
+    <Thickness x:Key="AutoSuggestListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoSuggestListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoSuggestListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoSuggestListViewItemMargin">10,11,0,13</Thickness>
+    <m:StaticResource x:Key="AutoSuggestBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="AutoSuggestBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <m:StaticResource x:Key="AutoSuggestBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <sys:Double x:Key="AutoSuggestBoxIconFontSize">12</sys:Double>
+
+    <!--  Resources for Button  -->
+    <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="ButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for CalendarDatePicker  -->
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for CalendarView  -->
+    <m:StaticResource x:Key="CalendarViewFocusBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedPressedBorderBrush" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedBorderBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CalendarViewHoverBorderBrush" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewPressedBorderBrush" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewTodayForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CalendarViewBlackoutForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewSelectedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewPressedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewOutOfScopeForeground" ResourceKey="SystemControlHyperlinkBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewOutOfScopeBackground" ResourceKey="SystemControlDisabledChromeMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="CalendarViewForeground" ResourceKey="SystemControlHyperlinkBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CalendarViewBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="CalendarViewBorderBrush" ResourceKey="SystemControlForegroundChromeMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewWeekDayForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for CheckBox  -->
+    <sys:Double x:Key="CheckBoxBorderThemeThickness">1</sys:Double>
+    <sys:Double x:Key="CheckBoxCheckedStrokeThickness">0</sys:Double>
+    <m:StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+
+    <!--  Resource for ComboBox  -->
+    <sys:Double x:Key="ComboBoxThemeMinWidth">64</sys:Double>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
+    <m:StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+
+    <!--  Resources for ComboBoxItem  -->
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <m:StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for CommandBar  -->
+    <sys:Double x:Key="CommandBarOverflowMinWidth">160</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowTouchMinWidth">240</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowMaxWidth">480</sys:Double>
+    <sys:Double x:Key="CommandBarOverflowMaxHeight">198</sys:Double>
+    <m:StaticResource x:Key="CommandBarBackground" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <m:StaticResource x:Key="CommandBarForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="CommandBarHighContrastBorder" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="CommandBarEllipsisIconForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CommandBarOverflowPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="CommandBarOverflowPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="CommandBarLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <Thickness x:Key="CommandBarOverflowPresenterBorderThickness">1</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderDownThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderUpThickness">0,1,0,0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderPadding">0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderDownPadding">0</Thickness>
+    <Thickness x:Key="CommandBarOverflowPresenterBorderUpPadding">0</Thickness>
+
+    <!--  Resources for CommandBarFlyout  -->
+    <Thickness x:Key="CommandBarFlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="CommandBarFlyoutBorderUpThemeThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="CommandBarFlyoutBorderDownThemeThickness">1,0,1,1</Thickness>
+    <m:StaticResource x:Key="CommandBarFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for ContentDialog  -->
+    <sys:Double x:Key="ContentDialogMinWidth">320</sys:Double>
+    <sys:Double x:Key="ContentDialogMaxWidth">548</sys:Double>
+    <sys:Double x:Key="ContentDialogMinHeight">184</sys:Double>
+    <sys:Double x:Key="ContentDialogMaxHeight">756</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMinWidth">130</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMaxWidth">202</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonMinHeight">32</sys:Double>
+    <sys:Double x:Key="ContentDialogButtonHeight">32</sys:Double>
+    <sys:Double x:Key="ContentDialogTitleMaxHeight">56</sys:Double>
+    <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
+    <Thickness x:Key="ContentDialogButton1HostMargin">0,0,4,0</Thickness>
+    <Thickness x:Key="ContentDialogButton2HostMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentScrollViewerMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,0,0</Thickness>
+    <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
+    <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
+    <m:StaticResource x:Key="ContentDialogForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlPageBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ContentDialogLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for DataGrid  -->
+    <sys:Double x:Key="ListAccentLowOpacity">0.4</sys:Double>
+    <sys:Double x:Key="ListAccentMediumOpacity">0.6</sys:Double>
+    <SolidColorBrush x:Key="InvalidBrush" Color="#C50500" />
+    <SolidColorBrush x:Key="FillerGridLinesBrush" Color="Transparent" />
+    <SolidColorBrush
+        x:Key="ScrollBarsSeparatorBackground"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+    <m:StaticResource x:Key="DataGridColumnHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{m:StaticColor SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <m:StaticResource x:Key="DataGridColumnHeaderDraggedBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridColumnHeaderPointerOverBrush" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="DataGridColumnHeaderPressedBrush" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <SolidColorBrush x:Key="SystemControlGridLinesBaseMediumLowBrush" Color="#FF999999" />
+    <SolidColorBrush x:Key="SystemControlRowGroupHeaderBackgroundMediumBrush" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCurrencyVisualPrimaryBrush" Color="Transparent" />
+    <m:StaticResource x:Key="GridLinesBrush" ResourceKey="SystemControlGridLinesBaseMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridDetailsPresenterBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="FillerGridLinesBrush" />
+    <m:StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <m:StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <m:StaticResource x:Key="DataGridRowHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowHeaderBackgroundBrush" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderBackgroundBrush" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="DataGridRowGroupHeaderForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="DataGridRowInvalidBrush" ResourceKey="InvalidBrush" />
+    <m:StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="DataGridCellFocusVisualPrimaryBrush" ResourceKey="SystemControlFocusVisualPrimaryBrush" />
+    <m:StaticResource x:Key="DataGridCellFocusVisualSecondaryBrush" ResourceKey="SystemControlFocusVisualSecondaryBrush" />
+    <m:StaticResource x:Key="DataGridCellInvalidBrush" ResourceKey="InvalidBrush" />
+    <m:StaticResource x:Key="DataGridRowHoveredBackground" ResourceKey="SystemControlHighlightListLowBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackground" Color="{m:DynamicColor SystemAccentColor}" />
+    <m:StaticResource x:Key="DataGridRowSelectedForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <Thickness x:Key="DatePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutButtonBorderThickness">0</Thickness>
+
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+
+    <!--  Resources for FlipView  -->
+    <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
+    <m:StaticResource x:Key="FlipViewBackground" ResourceKey="SystemControlPageBackgroundListLowBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="FlipViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for FlyoutPresenter  -->
+    <sys:Double x:Key="FlyoutThemeMaxHeight">758</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMaxWidth">456</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMinHeight">40</sys:Double>
+    <sys:Double x:Key="FlyoutThemeMinWidth">96</sys:Double>
+    <sys:Double x:Key="FlyoutThemeTouchMinWidth">240</sys:Double>
+    <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
+    <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
+    <m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+
+    <!--  Resources for HyperlinkButton  -->
+    <Thickness x:Key="HyperlinkButtonBorderThemeThickness">0</Thickness>
+    <m:StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackground" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBackgroundDisabled" ResourceKey="SystemControlPageBackgroundTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="HyperlinkButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for ListBox  -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+
+    <!--  Resources for ListViewHeaderItem  -->
+    <sys:Double x:Key="ListViewHeaderItemMinHeight">44</sys:Double>
+    <sys:Double x:Key="GridViewHeaderItemMinHeight">44</sys:Double>
+    <sys:Double x:Key="ListViewHeaderItemThemeFontSize">20</sys:Double>
+    <sys:Double x:Key="GridViewHeaderItemThemeFontSize">20</sys:Double>
+    <m:StaticResource x:Key="ListViewHeaderItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="GridViewHeaderItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewHeaderItemDividerStroke" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="GridViewHeaderItemDividerStroke" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <!--  Resources for ListViewItem  -->
+    <sys:Double x:Key="ListViewItemContentOffsetX">-40.5</sys:Double>
+    <sys:Double x:Key="ListViewItemDisabledThemeOpacity">0.55</sys:Double>
+    <sys:Double x:Key="ListViewItemDragThemeOpacity">0.80</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderThemeOpacity">0.80</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderTargetThemeOpacity">0.50</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderTargetThemeScale">0.95</sys:Double>
+    <sys:Double x:Key="ListViewItemReorderHintThemeOffset">10.0</sys:Double>
+    <sys:Double x:Key="ListViewItemSelectedBorderThemeThickness">4</sys:Double>
+    <m:StaticResource x:Key="ListViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelected" ResourceKey="SystemControlHighlightListAccentMediumLowBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <m:StaticResource x:Key="ListViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentVeryHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusVisualPrimaryBrush" ResourceKey="SystemControlFocusVisualPrimaryBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusVisualSecondaryBrush" ResourceKey="SystemControlFocusVisualSecondaryBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusBorderBrush" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <m:StaticResource x:Key="ListViewItemFocusSecondaryBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ListViewItemCheckBrush" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ListViewItemCheckBoxBrush" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ListViewItemDragBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ListViewItemDragForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ListViewItemPlaceholderBackground" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <sys:Boolean x:Key="ListViewItemSelectionCheckMarkVisualEnabled">True</sys:Boolean>
+    <!--<ListViewItemPresenterCheckMode x:Key="ListViewItemCheckMode">Inline</ListViewItemPresenterCheckMode>-->
+
+    <!--  Resources for LoopingSelector  -->
+    <m:StaticResource x:Key="LoopingSelectorButtonBackground" ResourceKey="SystemControlBackgroundChromeMediumBrush" />
+    <!--  Resources for LoopingSelectorItem  -->
+    <m:StaticResource x:Key="LoopingSelectorItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="LoopingSelectorItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+
+    <!--  Resources for MenuBar  -->
+    <m:StaticResource x:Key="MenuBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="MenuBarItemBackgroundSelected" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <Thickness x:Key="MenuBarItemBorderThickness">0</Thickness>
+    <m:StaticResource x:Key="MenuBarItemBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuBarItemBorderBrushSelected" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+
+    <!--  Resources for MenuFlyout  -->
+    <sys:Double x:Key="MenuFlyoutSeparatorThemeHeight">1</sys:Double>
+    <sys:Double x:Key="MenuFlyoutThemeMinHeight">32</sys:Double>
+    <Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="MenuFlyoutPresenterThemePadding">0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemChevronMargin">24,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePadding">11,9,11,10</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">11,4,11,7</Thickness>
+    <Thickness x:Key="MenuFlyoutItemPlaceholderThemeThickness">28,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemDoublePlaceholderThemeThickness">56,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutSeparatorThemePadding">12,4,12,4</Thickness>
+    <m:StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.MenuFlyoutItem  -->
+    <m:StaticResource x:Key="MenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.ToggleMenuFlyoutItem  -->
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemCheckGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="ToggleMenuFlyoutItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!--  Resources for Windows.UI.Xaml.Controls.MenuFlyoutSubItem  -->
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevron" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemChevronDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundPressed" ResourceKey="SystemControlHighlightAccentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundSubMenuOpened" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushPressed" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushSubMenuOpened" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="MenuFlyoutSubItemRevealBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for NavigationView  -->
+    <m:StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{m:StaticColor SystemChromeMediumColor}" />
+    <m:StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundChecked" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundChecked" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushChecked" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelected" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <m:StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemForeground" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemRevealBackgroundFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemRevealIconForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="TopNavigationViewItemRevealContentForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <m:StaticResource x:Key="TopNavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for NavigationBackButton  -->
+    <m:StaticResource x:Key="NavigationViewBackButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for NumberBox  -->
+    <m:StaticResource x:Key="NumberBoxPopupIndicatorForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+
+    <!--  The following NumberBoxPopup* theme resources resource must be defined at the app level in order to take effect.  -->
+    <m:StaticResource x:Key="NumberBoxPopupBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="NumberBoxPopupBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <Thickness x:Key="NumberBoxPopupBorderThickness">1</Thickness>
+
+    <m:StaticResource x:Key="NumberBoxPopupSpinButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <Thickness x:Key="NumberBoxPopupSpinButtonBorderThickness">0</Thickness>
+
+    <!--  Resources for PersonPicture  -->
+    <SolidColorBrush x:Key="PersonPictureForegroundThemeBrush" Color="{m:StaticColor SystemAltHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{m:StaticColor SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{m:StaticColor SystemListMediumColor}" />
+    <SolidColorBrush x:Key="PersonPictureEllipseFillThemeBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
+    <sys:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">0.8</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1.0</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseStrokeThickness">0</sys:Double>
+    <sys:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</sys:Double>
+
+    <!--  Resources for Pivot  -->
+    <sys:Double x:Key="PivotHeaderItemFontSize">24</sys:Double>
+    <sys:Double x:Key="PivotHeaderItemLockedTranslation">40</sys:Double>
+    <sys:Double x:Key="PivotTitleFontSize">14</sys:Double>
+    <sys:Int32 x:Key="PivotHeaderItemCharacterSpacing">-25</sys:Int32>
+    <Thickness x:Key="PivotHeaderItemMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="PivotItemMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="PivotNavButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="PivotNavButtonMargin">0,6,0,0</Thickness>
+    <Thickness x:Key="PivotPortraitThemePadding">12,14,0,13</Thickness>
+    <FontWeight x:Key="PivotHeaderItemThemeFontWeight">350</FontWeight>
+    <FontWeight x:Key="PivotTitleThemeFontWeight">Bold</FontWeight>
+    <m:StaticResource x:Key="PivotBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotNextButtonForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonBorderBrushPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotPreviousButtonForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
+    <m:StaticResource x:Key="PivotItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <m:StaticResource x:Key="PivotHeaderItemSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!--  Resources for ProgressBar  -->
+    <sys:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</sys:Double>
+    <sys:Double x:Key="ProgressBarThemeMinHeight">4</sys:Double>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <Color x:Key="SystemControlErrorBackgroundColor">#29C50500</Color>
+
+    <!--  Resources for ProgressRing  -->
+    <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+    <!--  Resources for RadioButton  -->
+    <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>
+    <m:StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--  Resources for RadioButtons  -->
+    <m:StaticResource x:Key="RadioButtonsHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RadioButtonsHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!--  Resources for RatingControl  -->
+    <m:StaticResource x:Key="RatingControlUnselectedForeground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="RatingControlSelectedForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="RatingControlPlaceholderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverPlaceholderForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverUnselectedForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="RatingControlPointerOverSelectedForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="RatingControlDisabledSelectedForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RatingControlCaptionForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <local:RatingItemFontInfo x:Key="RatingControlDefaultFontInfo" Glyph="&#xE735;" />
+    <local:RatingItemPathInfo x:Key="RatingControlDefaultPathInfo" Data="M 13.828125 12.246094 L 16.25 20 L 10 15.195313 L 3.75 20 L 6.171875 12.246094 L 0 7.5 L 7.65625 7.5 L 10 0 L 12.34375 7.5 L 20 7.5 Z" />
+
+    <!--  Resources for RepeatButton  -->
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="RepeatButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for ResizeGrip  -->
+    <m:StaticResource x:Key="ResizeGripForeground" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!--  Resources for ScrollBar  -->
+    <sys:Double x:Key="ScrollBarTrackBorderThemeThickness">0</sys:Double>
+    <m:StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <m:StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush
+        x:Key="ScrollBarTrackFill"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+    <SolidColorBrush
+        x:Key="ScrollBarTrackFillPointerOver"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+    <m:StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <m:StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <m:StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{m:StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{m:StaticResource ScrollBarPanningThumbBackgroundColor}" />
+
+    <!--  Resource for ScrollViewer  -->
+    <SolidColorBrush
+        x:Key="ScrollViewerScrollBarSeparatorBackground"
+        Opacity="0.9"
+        Color="{m:StaticColor SystemChromeMediumColor}" />
+
+    <!--  Resources for Slider  -->
+    <sys:Double x:Key="SliderOutsideTickBarThemeHeight">4</sys:Double>
+    <sys:Double x:Key="SliderTrackThemeHeight">2</sys:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <m:StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+
+    <!--  Resources for SplitButton  -->
+    <m:StaticResource x:Key="SplitButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="SplitButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="SplitButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedPressed" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="SplitButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
+
+    <!--  Resources for SplitView  -->
+    <sys:Double x:Key="SplitViewOpenPaneThemeLength">320</sys:Double>
+    <sys:Double x:Key="SplitViewCompactPaneThemeLength">48</sys:Double>
+    <Thickness x:Key="SplitViewLeftBorderThemeThickness">0,0,1,0</Thickness>
+    <Thickness x:Key="SplitViewRightBorderThemeThickness">1,0,0,0</Thickness>
+    <m:StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for TabView  -->
+    <m:StaticResource x:Key="TabViewBackground" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonBackgroundActiveTab" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TabViewButtonForegroundActiveTab" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TabViewItemSeparator" ResourceKey="SystemControlForegroundBaseLowBrush" />
+
+    <!--  Resources for Thumb  -->
+    <m:StaticResource x:Key="ThumbBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ThumbBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrush" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ThumbBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+
+    <!--  Resources for TimePicker  -->
+    <sys:Double x:Key="TimePickerSelectorThemeMinWidth">80</sys:Double>
+    <sys:Double x:Key="TimePickerSpacerThemeWidth">1</sys:Double>
+    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TimePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="TimePickerFirstHostThemeMargin">0,0,20,0</Thickness>
+    <Thickness x:Key="TimePickerThirdHostThemeMargin">20,0,0,0</Thickness>
+    <FontWeight x:Key="TimePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <m:StaticResource x:Key="TimePickerSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerSpacerFillDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TimePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <m:StaticResource x:Key="TimePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <m:StaticResource x:Key="TimePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <!--  Resources for ToggleButton  -->
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
+    <m:StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush
+        x:Key="ToggleButtonBackgroundPointerOver"
+        Opacity="0.1"
+        Color="{m:StaticColor SystemBaseHighColor}" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!--  Resources for ToggleSwitch  -->
+    <sys:Double x:Key="ToggleSwitchOnStrokeThickness">0</sys:Double>
+    <sys:Double x:Key="ToggleSwitchOuterBorderStrokeThickness">1</sys:Double>
+    <m:StaticResource x:Key="ToggleSwitchContentForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnDisabled" ResourceKey="SystemControlPageBackgroundBaseLowBrush" />
+
+    <!--  Resources for ToolTip  -->
+    <sys:Double x:Key="ToolTipContentThemeFontSize">12</sys:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ToolTipBorderThemePadding">8,5,8,7</Thickness>
+    <m:StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+
+    <!--  Resources for TreeView  -->
+    <m:StaticResource x:Key="TreeViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelected" ResourceKey="SystemControlHighlightAccent3RevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightAccent2RevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <m:StaticResource x:Key="TreeViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <m:StaticResource x:Key="TreeViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckBoxBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckBoxBorderSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TreeViewItemCheckGlyphSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
+
+    <sys:Double x:Key="TextControlThemeMinWidth">64</sys:Double>
+    <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+    <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
+    <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
+    <m:StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <m:StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <m:StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+
+    <!--  Resources for Window  -->
+    <SolidColorBrush x:Key="WindowBorder" Color="#FF707070" />
+    <SolidColorBrush x:Key="WindowBorderInactive" Color="#FFAAAAAA" />
+    <SolidColorBrush x:Key="TitleBarButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TitleBarButtonBackgroundInactive" Color="Transparent" />
+
+    <!--  Resources for AccentButtonStyle  -->
+    <m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
+    <sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>
+
+    <Style x:Key="HighVisibilityFocusVisual">
+        <Setter Property="primitives:FocusVisualHelper.FocusVisualPrimaryBrush" Value="{StaticResource SystemControlFocusVisualPrimaryBrush}" />
+        <Setter Property="primitives:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{StaticResource SystemControlFocusVisualSecondaryBrush}" />
+        <Setter Property="primitives:FocusVisualHelper.IsSystemFocusVisual" Value="True" />
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border
+                        BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryBrush}"
+                        BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        SnapsToDevicePixels="True">
+                        <Border BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
+
+</ResourceDictionary>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index bfbcf675a..b632f011b 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -68,8 +68,8 @@
             </Setter>
         </Style>
         <Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
-            <Setter Property="Background" Value="#ffffff" />
-            <Setter Property="BorderBrush" Value="#e5e5e5" />
+            <Setter Property="Background" Value="{StaticResource Color02B}" />
+            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
             <Setter Property="Margin" Value="0,5,0,0" />
@@ -78,11 +78,12 @@
 
         </Style>
         <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
+            <Setter Property="Foreground" Value="{StaticResource Color05B}" />
             <Setter Property="Margin" Value="0,0,0,0" />
         </Style>
 
         <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
-            <Setter Property="Foreground" Value="#5F5F5F" />
+            <Setter Property="Foreground" Value="{StaticResource Color04B}" />
             <Setter Property="FontSize" Value="12" />
             <Setter Property="Margin" Value="0,0,0,0" />
             <Setter Property="Padding" Value="0,0,24,0" />
@@ -142,7 +143,7 @@
                                         BorderThickness="0">
                                         <Border
                                             x:Name="border"
-                                            Background="WhiteSmoke"
+                                            Background="Transparent"
                                             CornerRadius="5">
                                             <ContentPresenter
                                                 x:Name="ContentSite"
@@ -186,7 +187,7 @@
                                         BorderThickness="0">
                                         <Border
                                             x:Name="border"
-                                            Background="#f3f3f3"
+                                            Background="{StaticResource Color01B}"
                                             CornerRadius="5">
                                             <ContentPresenter
                                                 x:Name="ContentSite"
@@ -202,10 +203,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="border" Property="Background" Value="#eaeaea" />
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
                             </Trigger>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="border" Property="Background" Value="#eaeaea" />
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -221,11 +222,11 @@
         </Style>
 
         <Style x:Key="PluginList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="#ffffff" />
+            <Setter Property="Background" Value="{StaticResource Color02B}" />
             <Setter Property="Padding" Value="0,12,0,12" />
             <Setter Property="Margin" Value="0,0,18,5" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="BorderBrush" Value="#e5e5e5" />
+            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>
@@ -292,10 +293,10 @@
 
         <!--#region PluginStore Style-->
         <Style x:Key="StoreList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="#ffffff" />
+            <Setter Property="Background" Value="{StaticResource Color02B}" />
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="Margin" Value="0,0,8,5" />
-            <Setter Property="BorderBrush" Value="#e5e5e5" />
+            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
             <Setter Property="MinWidth" Value="330" />
             <Setter Property="Height" Value="98" />
             <!--#region Template for blue highlight win10-->
@@ -323,8 +324,8 @@
                                 <MultiTrigger.Conditions>
                                     <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color07B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
 
                             </MultiTrigger>
@@ -333,8 +334,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
@@ -344,8 +345,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
@@ -376,7 +377,7 @@
                                 Grid.Column="0"
                                 Margin="0,0,0,0"
                                 Panel.ZIndex="1"
-                                Background="#f3f3f3"
+                                Background="{StaticResource Color01B}"
                                 IsItemsHost="True" />
                             <Border
                                 Grid.Column="1"
@@ -392,7 +393,7 @@
         </Style>
     </Window.Resources>
     <Border Style="{StaticResource WindowMainPanelStyle}">
-        <Grid Background="#f3f3f3">
+        <Grid Background="{StaticResource Color01B}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -415,7 +416,7 @@
                 Grid.Column="1"
                 Margin="4,0,0,0"
                 VerticalAlignment="Center"
-                FontSize="14"
+                FontSize="12"
                 Text="{DynamicResource flowlauncher_settings}">
                 <TextBlock.Style>
                     <Style TargetType="TextBlock">
@@ -500,14 +501,9 @@
                             <TextBlock
                                 Grid.Row="1"
                                 Margin="0,12,0,0"
+                                Style="{StaticResource TabMenu}"
                                 Text="Flow Launcher"
                                 TextAlignment="center" />
-                            <TextBlock
-                                Grid.Row="2"
-                                Margin="0,5,0,0"
-                                FontSize="12"
-                                Text="{Binding Version}"
-                                TextAlignment="center" />
                         </Grid>
                     </TabItem.Header>
                 </TabItem>
@@ -523,22 +519,27 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xe713;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource general}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource general}" />
                         </Grid>
                     </TabItem.Header>
 
                     <ScrollViewer
                         Margin="0,0,0,0"
-                        Background="#f3f3f3"
+                        Background="{StaticResource Color01B}"
                         ScrollViewer.CanContentScroll="False">
                         <StackPanel Margin="5,18,25,30" Orientation="Vertical">
                             <TextBlock
                                 Grid.Row="2"
                                 Margin="0,5,0,5"
                                 FontSize="30"
+                                Style="{StaticResource PageTitle}"
                                 Text="{DynamicResource general}"
                                 TextAlignment="left" />
 
@@ -557,7 +558,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xe8fc;
                                     </TextBlock>
                                 </ItemsControl>
@@ -574,7 +576,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xed1a;
                                     </TextBlock>
                                 </ItemsControl>
@@ -620,7 +623,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xe7fc;
                                     </TextBlock>
                                 </ItemsControl>
@@ -641,7 +645,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xe98a;
                                     </TextBlock>
                                 </ItemsControl>
@@ -663,7 +668,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xecc5;
                                     </TextBlock>
                                 </ItemsControl>
@@ -686,7 +692,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xe88e;
                                     </TextBlock>
                                 </ItemsControl>
@@ -707,6 +714,7 @@
                                                 <TextBlock
                                                     Grid.Column="1"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource querySearchPrecision}" />
                                                 <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource querySearchPrecisionToolTip}" />
                                             </StackPanel>
@@ -720,8 +728,8 @@
                                     </Border>
                                     <Separator
                                         Width="Auto"
-                                        BorderBrush="#e5e5e5"
-                                        BorderThickness="1" />
+                                        BorderThickness="1"
+                                        Style="{StaticResource SettingSeparatorStyle}" />
                                     <Border
                                         Margin="0"
                                         BorderThickness="0"
@@ -731,6 +739,7 @@
                                                 <TextBlock
                                                     Grid.Column="1"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource lastQueryMode}" />
                                                 <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource lastQueryModeToolTip}" />
                                             </StackPanel>
@@ -746,8 +755,8 @@
                                     </Border>
                                     <Separator
                                         Width="Auto"
-                                        BorderBrush="#e5e5e5"
-                                        BorderThickness="1" />
+                                        BorderThickness="1"
+                                        Style="{StaticResource SettingSeparatorStyle}" />
                                     <Border
                                         Margin="0"
                                         BorderThickness="0"
@@ -756,6 +765,7 @@
                                             <TextBlock
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
+                                                Style="{DynamicResource SettingTitleLabel}"
                                                 Text="{DynamicResource maxShowResults}" />
                                             <ComboBox
                                                 Grid.Column="2"
@@ -769,7 +779,8 @@
                                                 Margin="24,0,16,0"
                                                 VerticalAlignment="Center"
                                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
+                                                FontSize="20"
+                                                Style="{StaticResource Glyph}">
                                                 &#xe8fd;
                                             </TextBlock>
                                         </ItemsControl>
@@ -783,6 +794,7 @@
                                         <TextBlock
                                             Grid.Column="1"
                                             VerticalAlignment="Center"
+                                            Style="{DynamicResource SettingTitleLabel}"
                                             Text="{DynamicResource defaultFileManager}" />
                                         <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
                                     </StackPanel>
@@ -800,7 +812,8 @@
                                         Margin="24,0,16,0"
                                         VerticalAlignment="Center"
                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
+                                        FontSize="20"
+                                        Style="{StaticResource Glyph}">
                                         &#xe838;
                                     </TextBlock>
                                 </ItemsControl>
@@ -854,10 +867,14 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xea86;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource plugin}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource plugin}" />
                         </Grid>
                     </TabItem.Header>
 
@@ -869,13 +886,11 @@
                             <RowDefinition Height="73" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Border
-                            Grid.Row="0"
-                            Padding="5,18,0,0"
-                            Background="#f3f3f3">
+                        <Border Grid.Row="0" Padding="5,18,0,0">
                             <TextBlock
                                 Margin="0,5,0,0"
                                 FontSize="30"
+                                Style="{StaticResource PageTitle}"
                                 Text="{DynamicResource plugin}"
                                 TextAlignment="left" />
                         </Border>
@@ -883,12 +898,13 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Padding="0,0,0,0"
-                            Background="#f3f3f3">
+                            Background="{StaticResource Color01B}">
                             <ListBox
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
                                 HorizontalAlignment="Stretch"
+                                Background="{StaticResource Color01B}"
                                 ItemContainerStyle="{StaticResource PluginList}"
                                 ItemsSource="{Binding PluginViewModels}"
                                 ScrollViewer.CanContentScroll="False"
@@ -1018,7 +1034,8 @@
                                                                         VerticalAlignment="Center"
                                                                         DockPanel.Dock="Left"
                                                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                                                        FontSize="20">
+                                                                        FontSize="20"
+                                                                        Style="{StaticResource Glyph}">
                                                                         &#xe819;
                                                                     </TextBlock>
                                                                     <TextBlock
@@ -1223,10 +1240,14 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xe719;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource pluginStore}" />
                         </Grid>
                     </TabItem.Header>
 
@@ -1242,27 +1263,23 @@
                         <Border
                             Grid.Row="0"
                             Grid.Column="0"
-                            Padding="5,18,0,0"
-                            Background="#f3f3f3">
+                            Padding="5,18,0,0">
                             <TextBlock
                                 Margin="0,5,0,5"
                                 FontSize="30"
+                                Style="{StaticResource PageTitle}"
                                 Text="{DynamicResource pluginStore}"
                                 TextAlignment="left" />
                         </Border>
                         <Border
                             Grid.Row="0"
                             Grid.Column="1"
-                            Padding="5,18,32,0"
-                            Background="#f3f3f3">
+                            Padding="5,18,32,0">
                             <Button
                                 Height="34"
                                 Margin="0,5,0,5"
                                 Padding="12,4,12,4"
                                 HorizontalAlignment="Right"
-                                Background="#ffffff"
-                                BorderBrush="#cecece"
-                                BorderThickness="1,1,1,2"
                                 Click="OnPluginStoreRefreshClick"
                                 Content="{DynamicResource refresh}"
                                 FontSize="13" />
@@ -1271,8 +1288,7 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Padding="0,0,0,0"
-                            Background="#f3f3f3">
+                            Padding="0,0,0,0">
                             <ListBox
                                 x:Name="StoreListBox"
                                 Width="Auto"
@@ -1280,6 +1296,7 @@
                                 Padding="0,0,0,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
+                                Background="{StaticResource Color01B}"
                                 ItemContainerStyle="{StaticResource StoreList}"
                                 ItemsSource="{Binding ExternalPlugins}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -1404,7 +1421,7 @@
                                                         VerticalAlignment="Stretch"
                                                         Panel.ZIndex="1">
                                                         <Grid.Background>
-                                                            <SolidColorBrush Opacity=".95" Color="#f6f6f6" />
+                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource Color07}" />
                                                         </Grid.Background>
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
@@ -1478,19 +1495,22 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xe790;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource theme}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource theme}" />
                         </Grid>
                     </TabItem.Header>
                     <Border Padding="0,0,0,0">
                         <ScrollViewer
                             Margin="0,0,0,0"
                             Padding="6,0,24,0"
-                            Background="#f3f3f3"
                             ScrollViewer.CanContentScroll="False">
-                            <Grid Margin="0,0,0,0" Background="#f3f3f3">
+                            <Grid Margin="0,0,0,0">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="0" />
                                     <RowDefinition Height="350" />
@@ -1502,6 +1522,7 @@
                                     <TextBlock
                                         Margin="0,5,0,5"
                                         FontSize="30"
+                                        Style="{StaticResource PageTitle}"
                                         Text="{DynamicResource theme}"
                                         TextAlignment="left" />
                                 </Border>
@@ -1581,7 +1602,8 @@
                                                 Margin="24,0,16,0"
                                                 VerticalAlignment="Center"
                                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
+                                                FontSize="20"
+                                                Style="{StaticResource Glyph}">
                                                 &#xeb91;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1596,6 +1618,7 @@
                                                     Width="100"
                                                     Margin="0,0,8,2"
                                                     VerticalAlignment="Center"
+                                                    Foreground="{StaticResource Color05B}"
                                                     Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
                                                     TextAlignment="Right" />
                                                 <Slider
@@ -1614,7 +1637,8 @@
                                                 Margin="24,0,16,0"
                                                 VerticalAlignment="Center"
                                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
+                                                FontSize="20"
+                                                Style="{StaticResource Glyph}">
                                                 &#xe740;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1757,15 +1781,16 @@
                                                         Margin="24,0,16,0"
                                                         VerticalAlignment="Center"
                                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20">
+                                                        FontSize="20"
+                                                        Style="{StaticResource Glyph}">
                                                         &#xf6b8;
                                                     </TextBlock>
                                                 </ItemsControl>
                                             </Border>
                                             <Separator
                                                 Width="Auto"
-                                                BorderBrush="#e5e5e5"
-                                                BorderThickness="1" />
+                                                BorderThickness="1"
+                                                Style="{StaticResource SettingSeparatorStyle}" />
                                             <Border
                                                 Margin="0"
                                                 BorderThickness="0"
@@ -1774,6 +1799,7 @@
                                                     <TextBlock
                                                         Grid.Column="1"
                                                         VerticalAlignment="Center"
+                                                        Style="{DynamicResource SettingTitleLabel}"
                                                         Text="{DynamicResource queryBoxFont}" />
                                                     <StackPanel
                                                         Grid.Column="2"
@@ -1811,15 +1837,16 @@
                                                         Margin="24,0,16,0"
                                                         VerticalAlignment="Center"
                                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20">
+                                                        FontSize="20"
+                                                        Style="{StaticResource Glyph}">
                                                         &#xe990;
                                                     </TextBlock>
                                                 </ItemsControl>
                                             </Border>
                                             <Separator
                                                 Width="Auto"
-                                                BorderBrush="#e5e5e5"
-                                                BorderThickness="1" />
+                                                BorderThickness="1"
+                                                Style="{StaticResource SettingSeparatorStyle}" />
                                             <Border
                                                 Margin="0"
                                                 BorderThickness="0"
@@ -1828,6 +1855,7 @@
                                                     <TextBlock
                                                         Grid.Column="1"
                                                         VerticalAlignment="Center"
+                                                        Style="{DynamicResource SettingTitleLabel}"
                                                         Text="{DynamicResource resultItemFont}" />
                                                     <StackPanel
                                                         Grid.Column="2"
@@ -1865,7 +1893,8 @@
                                                         Margin="24,0,16,0"
                                                         VerticalAlignment="Center"
                                                         FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20">
+                                                        FontSize="20"
+                                                        Style="{StaticResource Glyph}">
                                                         &#xe8fd;
                                                     </TextBlock>
                                                 </ItemsControl>
@@ -1892,7 +1921,8 @@
                                                     Margin="24,0,16,0"
                                                     VerticalAlignment="Center"
                                                     FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20">
+                                                    FontSize="20"
+                                                    Style="{StaticResource Glyph}">
                                                     &#xe838;
                                                 </TextBlock>
                                             </ItemsControl>
@@ -1916,18 +1946,21 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xe92e;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource hotkey}" />
                         </Grid>
                     </TabItem.Header>
                     <ScrollViewer
                         Margin="0,0,0,0"
                         Padding="0,0,6,0"
-                        Background="#f3f3f3"
                         ScrollViewer.CanContentScroll="False">
-                        <Border Background="#f3f3f3">
+                        <Border>
                             <Grid Margin="5,18,18,10">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="43" />
@@ -1941,6 +1974,7 @@
                                     Grid.Row="0"
                                     Margin="0,5,0,2"
                                     FontSize="30"
+                                    Style="{StaticResource PageTitle}"
                                     Text="{DynamicResource hotkey}"
                                     TextAlignment="left" />
 
@@ -1968,7 +2002,8 @@
                                                 Margin="24,0,16,0"
                                                 VerticalAlignment="Center"
                                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20">
+                                                FontSize="20"
+                                                Style="{StaticResource Glyph}">
                                                 &#xeda7;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1991,6 +2026,7 @@
                                                     <TextBlock
                                                         Grid.Column="1"
                                                         VerticalAlignment="Center"
+                                                        Style="{DynamicResource SettingTitleLabel}"
                                                         Text="{DynamicResource openResultModifiers}" />
                                                     <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
                                                 </StackPanel>
@@ -2006,8 +2042,8 @@
 
                                         <Separator
                                             Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
+                                            BorderThickness="1"
+                                            Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
                                             Padding="0,10,0,0"
@@ -2018,6 +2054,7 @@
                                                     <TextBlock
                                                         Grid.Column="1"
                                                         VerticalAlignment="Center"
+                                                        Style="{DynamicResource SettingTitleLabel}"
                                                         Text="{DynamicResource showOpenResultHotkey}" />
                                                     <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
                                                 </StackPanel>
@@ -2041,7 +2078,7 @@
                                 <ListView
                                     Grid.Row="4"
                                     Margin="0,0,0,0"
-                                    Background="#ffffff"
+                                    Background="{StaticResource Color02B}"
                                     BorderBrush="DarkGray"
                                     BorderThickness="1"
                                     ItemsSource="{Binding Settings.CustomPluginHotkeys}"
@@ -2106,18 +2143,21 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xec27;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource proxy}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource proxy}" />
                         </Grid>
                     </TabItem.Header>
                     <ScrollViewer
                         Margin="0,0,0,0"
                         Padding="5,0,24,0"
-                        Background="#f3f3f3"
                         ScrollViewer.CanContentScroll="False">
-                        <Border Background="#f3f3f3">
+                        <Border>
 
                             <StackPanel>
                                 <Border Margin="0,18,0,0">
@@ -2125,6 +2165,7 @@
                                         Grid.Row="0"
                                         Margin="0,5,0,0"
                                         FontSize="30"
+                                        Style="{StaticResource PageTitle}"
                                         Text="{DynamicResource proxy}"
                                         TextAlignment="left" />
                                 </Border>
@@ -2144,14 +2185,15 @@
                                                 <TextBlock
                                                     Grid.Column="1"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource enableProxy}" />
                                                 <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}" Style="{DynamicResource SideControlCheckBox}" />
                                             </ItemsControl>
                                         </Border>
                                         <Separator
                                             Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
+                                            BorderThickness="1"
+                                            Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
                                             BorderThickness="0"
@@ -2161,6 +2203,7 @@
                                                     Grid.Column="1"
                                                     Margin="22,0,0,0"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource server}" />
                                                 <TextBox
                                                     Grid.Column="2"
@@ -2173,8 +2216,8 @@
                                         </Border>
                                         <Separator
                                             Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
+                                            BorderThickness="1"
+                                            Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
                                             BorderThickness="0"
@@ -2184,6 +2227,7 @@
                                                     Grid.Column="1"
                                                     Margin="22,0,0,0"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource port}" />
                                                 <TextBox
                                                     Grid.Column="2"
@@ -2195,8 +2239,8 @@
                                         </Border>
                                         <Separator
                                             Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
+                                            BorderThickness="1"
+                                            Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
                                             BorderThickness="0"
@@ -2206,6 +2250,7 @@
                                                     Grid.Column="1"
                                                     Margin="22,0,0,0"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource userName}" />
                                                 <TextBox
                                                     Grid.Column="2"
@@ -2218,8 +2263,8 @@
                                         </Border>
                                         <Separator
                                             Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
+                                            BorderThickness="1"
+                                            Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
                                             BorderThickness="0"
@@ -2229,6 +2274,7 @@
                                                     Grid.Column="1"
                                                     Margin="22,0,0,0"
                                                     VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
                                                     Text="{DynamicResource password}" />
                                                 <TextBox
                                                     Grid.Column="2"
@@ -2246,6 +2292,7 @@
                                         <TextBlock
                                             Grid.Column="1"
                                             VerticalAlignment="Center"
+                                            Style="{DynamicResource SettingTitleLabel}"
                                             Text="{DynamicResource testProxy}" />
                                         <Button
                                             Grid.Column="2"
@@ -2272,19 +2319,24 @@
                                 Grid.Column="0"
                                 Margin="0,0,12,0"
                                 FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20">
+                                FontSize="20"
+                                Style="{StaticResource TabMenu}">
                                 &#xe946;
                             </TextBlock>
-                            <TextBlock Grid.Column="1" Text="{DynamicResource about}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Style="{StaticResource TabMenu}"
+                                Text="{DynamicResource about}" />
                         </Grid>
                     </TabItem.Header>
-                    <Border Background="#f3f3f3">
+                    <Border>
                         <Grid Height="400" Margin="65,0">
                             <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
                             <Grid.Resources>
                                 <Style TargetType="{x:Type TextBlock}">
                                     <Setter Property="Margin" Value="10,25,0,0" />
                                     <Setter Property="FontSize" Value="14" />
+                                    <Setter Property="Foreground" Value="{StaticResource Color05B}" />
                                 </Style>
                             </Grid.Resources>
                             <Grid.ColumnDefinitions>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 9330e4921..1d969a24c 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -336,8 +336,6 @@ namespace Flow.Launcher
                 this.restoreButton.Visibility = Visibility.Collapsed;
             }
         }
-        
-
         private void Window_StateChanged(object sender, EventArgs e)
         {
             this.RefreshMaximizeRestoreButton();

From 55bc7853255bd75c98fb656dfee4ce15592d5692 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 15 Nov 2021 16:58:36 +0900
Subject: [PATCH 024/107] Remove HardCoded Color in Setting Window

---
 Flow.Launcher/App.xaml                        |  2 +-
 .../Resources/CustomControlTemplate.xaml      | 14 +++----
 Flow.Launcher/Resources/Dark.xaml             |  8 ++++
 Flow.Launcher/Resources/Light.xaml            |  8 ++++
 Flow.Launcher/SettingWindow.xaml              | 39 +++++++++++--------
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 9049f8e7e..6efff03c8 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -8,7 +8,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Light">
+                <ui:ThemeResources RequestedTheme="Dark">
                     <ui:ThemeResources.ThemeDictionaries>
                         <ResourceDictionary x:Key="Light">
                             <ResourceDictionary.MergedDictionaries>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 113b726a7..9677fdc8e 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -32,7 +32,7 @@
     </Style>
 
     <Style x:Key="TitleBarButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource WindowTextBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -41,7 +41,7 @@
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
                         x:Name="border"
-                        Background="#f3f3f3"
+                        Background="{StaticResource Color01B}"
                         BorderThickness="0"
                         SnapsToDevicePixels="true">
                         <ContentPresenter
@@ -54,10 +54,10 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#C6C6C6" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#B0B0B0" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color09B}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -66,7 +66,7 @@
     </Style>
 
     <Style x:Key="TitleBarCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -88,11 +88,11 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#E10000" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color10B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{DynamicResource PressedWindowCloseButtonBackgroundBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color11B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 9e67f16a9..18d5e9743 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -13,6 +13,10 @@
     <SolidColorBrush x:Key="Color05B" Color="#ffffff" />
     <SolidColorBrush x:Key="Color06B" Color="#2d2d2d" />
     <SolidColorBrush x:Key="Color07B" Color="#363636" />
+    <SolidColorBrush x:Key="Color08B" Color="#878787" />
+    <SolidColorBrush x:Key="Color09B" Color="#292929" />
+    <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
+    <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
@@ -20,6 +24,10 @@
     <Color x:Key="Color05">#ffffff</Color>
     <Color x:Key="Color06">#2d2d2d</Color>
     <Color x:Key="Color07">#363636</Color>
+    <Color x:Key="Color08">#878787</Color>
+    <Color x:Key="Color09">#292929</Color>
+    <Color x:Key="Color10">#c42b1c</Color>
+    <Color x:Key="Color11">#c81c31</Color>
 
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 5f45944d7..0e9f07513 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -13,6 +13,10 @@
     <SolidColorBrush x:Key="Color05B" Color="#000000" />
     <SolidColorBrush x:Key="Color06B" Color="#eaeaea" />
     <SolidColorBrush x:Key="Color07B" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="Color08B" Color="#878787" />
+    <SolidColorBrush x:Key="Color09B" Color="#ededed" />
+    <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
+    <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -20,6 +24,10 @@
     <Color x:Key="Color05">#000000</Color>
     <Color x:Key="Color06">#eaeaea</Color>
     <Color x:Key="Color07">#f6f6f6</Color>
+    <Color x:Key="Color08">#878787</Color>
+    <Color x:Key="Color09">#ededed</Color>
+    <Color x:Key="Color10">#c42b1c</Color>
+    <Color x:Key="Color11">#c81c31</Color>
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b632f011b..842fa12e4 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -252,8 +252,8 @@
                                 <MultiTrigger.Conditions>
                                     <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color07B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
 
                             </MultiTrigger>
@@ -262,8 +262,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
@@ -273,8 +273,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
@@ -417,12 +417,14 @@
                 Margin="4,0,0,0"
                 VerticalAlignment="Center"
                 FontSize="12"
+                Foreground="{StaticResource Color05B}"
                 Text="{DynamicResource flowlauncher_settings}">
                 <TextBlock.Style>
                     <Style TargetType="TextBlock">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
-                                <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
+                                <Setter Property="Foreground" Value="{StaticResource Color07B}" />
+                                <!--  Not work. check  -->
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -955,12 +957,13 @@
                                                     </StackPanel>
                                                     <StackPanel Grid.Column="1" Margin="12,0,14,0">
                                                         <TextBlock
+                                                            Foreground="{StaticResource Color05B}"
                                                             Text="{Binding PluginPair.Metadata.Name}"
                                                             TextWrapping="Wrap"
                                                             ToolTip="{Binding PluginPair.Metadata.Version}" />
                                                         <TextBlock
                                                             Margin="0,2,0,0"
-                                                            Foreground="#5f5f5f"
+                                                            Foreground="{StaticResource Color04B}"
                                                             TextWrapping="WrapWithOverflow">
                                                             <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                         </TextBlock>
@@ -971,6 +974,7 @@
                                                             Margin="0,0,8,0"
                                                             VerticalAlignment="Center"
                                                             FontSize="12"
+                                                            Foreground="{StaticResource Color08B}"
                                                             Text="{DynamicResource priority}" />
                                                         <Border>
                                                             <Button
@@ -992,10 +996,10 @@
                                                                         <Setter Property="Padding" Value="12,8,12,8" />
                                                                         <Setter Property="BorderThickness" Value="0" />
                                                                         <Setter Property="FontWeight" Value="DemiBold" />
-                                                                        <Setter Property="Foreground" Value="Black" />
+                                                                        <Setter Property="Foreground" Value="{StaticResource Color02B}" />
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
-                                                                                <Setter Property="Foreground" Value="#878787" />
+                                                                                <Setter Property="Foreground" Value="{StaticResource Color08B}" />
                                                                                 <Setter Property="FontWeight" Value="Normal" />
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -1074,8 +1078,8 @@
                                                             Padding="0"
                                                             HorizontalAlignment="Stretch"
                                                             VerticalAlignment="Center"
-                                                            Background="White"
-                                                            BorderBrush="#e6e6e6"
+                                                            Background="{StaticResource Color02B}"
+                                                            BorderBrush="{StaticResource Color03B}"
                                                             BorderThickness="0,1,0,0">
                                                             <!--#region SubInfo Styling-->
                                                             <Border.Style>
@@ -1100,7 +1104,6 @@
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
                                                             Content="{Binding SettingControl}" />
-
                                                     </StackPanel>
 
                                                     <StackPanel>
@@ -1383,17 +1386,18 @@
                                                     </StackPanel.Style>
                                                     <TextBlock
                                                         Padding="0,0,20,0"
+                                                        Foreground="{StaticResource Color05B}"
                                                         Text="{Binding Name}"
                                                         TextWrapping="WrapWithOverflow"
                                                         ToolTip="{Binding Version}" />
                                                     <TextBlock
                                                         Margin="0,2,0,0"
                                                         Padding="0,0,20,0"
-                                                        Foreground="#5f5f5f"
+                                                        Foreground="{StaticResource Color04B}"
                                                         TextWrapping="WrapWithOverflow">
                                                         <Run
                                                             FontSize="12"
-                                                            Foreground="#5f5f5f"
+                                                            Foreground="{StaticResource Color04B}"
                                                             Text="{Binding Description}" />
                                                     </TextBlock>
 
@@ -1436,12 +1440,14 @@
                                                                     Margin="20,0,0,0"
                                                                     Padding="0,0,0,0"
                                                                     FontWeight="Bold"
+                                                                    Foreground="{StaticResource Color05B}"
                                                                     Text="{Binding Name}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Name}" />
                                                                 <TextBlock
                                                                     Margin="10,0,0,0"
                                                                     Padding="0,0,20,0"
+                                                                    Foreground="{StaticResource Color05B}"
                                                                     Text="{Binding Version}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Version}" />
@@ -1449,7 +1455,7 @@
                                                             <StackPanel Margin="20,2,120,0" Orientation="Vertical">
                                                                 <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
                                                                     <Hyperlink
-                                                                        Foreground="#5F5F5F"
+                                                                        Foreground="{StaticResource Color04B}"
                                                                         NavigateUri="{Binding Website}"
                                                                         RequestNavigate="OnRequestNavigate">
                                                                         <Run FontSize="12" Text="{Binding Author}" />
@@ -2074,6 +2080,7 @@
                                     Padding="0,12,0,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
+                                    Foreground="{StaticResource Color05B}"
                                     Text="{DynamicResource customQueryHotkey}" />
                                 <ListView
                                     Grid.Row="4"

From 806045bc54c5b29e8c4d243aa461c57e0ab7e049 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 15 Nov 2021 19:25:05 +0900
Subject: [PATCH 025/107] - Adjust Button for Light/Dark Mode

---
 .../Resources/CustomControlTemplate.xaml      | 44 +++++++++----------
 Flow.Launcher/Resources/Dark.xaml             | 29 ++++++++++++
 Flow.Launcher/Resources/Light.xaml            | 30 +++++++++++++
 Flow.Launcher/SettingWindow.xaml              | 11 +++--
 4 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 9677fdc8e..90d00b2b7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1897,16 +1897,16 @@
                 <ControlTemplate TargetType="Button">
                     <Border
                         x:Name="Background"
-                        Background="#fefefe"
-                        BorderBrush="#e5e5e5"
-                        BorderThickness="1,1,1,0"
+                        Background="{StaticResource ButtonBackgroundColor}"
+                        BorderBrush="{StaticResource ButtonOutBorder}"
+                        BorderThickness="{StaticResource CustomButtonOutBorderThickness}"
                         CornerRadius="4"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"
                             Padding="{TemplateBinding Padding}"
-                            BorderBrush="#d3d3d3"
-                            BorderThickness="0,0,0,2"
+                            BorderBrush="{StaticResource ButtonInsideBorder}"
+                            BorderThickness="{StaticResource CustomButtonInsideBorderThickness}"
                             CornerRadius="4">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
@@ -1919,27 +1919,27 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,0" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#d3d3d3" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,2" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMouseOver}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource CustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource CustomButtonInsideBorderThickness}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#f6f6f6" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#5d5d5d" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMousePressed}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource PressedCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonMousePressedInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideMouseOverBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource PressedCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonMousePressedText}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#f6f6f6" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#9d9d9d" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonBackgroundDisabledColor}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorderDisabled}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonDisabledText}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 18d5e9743..fa94a1ebc 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -17,6 +17,11 @@
     <SolidColorBrush x:Key="Color09B" Color="#292929" />
     <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
     <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
+    <SolidColorBrush x:Key="Color12B" Color="#373737" />
+    <SolidColorBrush x:Key="Color13B" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="Color14B" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="Color16B" Color="#434343" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
@@ -28,6 +33,30 @@
     <Color x:Key="Color09">#292929</Color>
     <Color x:Key="Color10">#c42b1c</Color>
     <Color x:Key="Color11">#c81c31</Color>
+    <Color x:Key="Color12">#373737</Color>
+    <Color x:Key="Color13">#3f3f3f</Color>
+    <Color x:Key="Color14">#3f3f3f</Color>
+    <Color x:Key="Color15">#5d5d5d</Color>
+    <Color x:Key="Color16">#434343</Color>
+
+    <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonInsideBorder" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="ButtonBackgroundColor" Color="#373737" />
+    <SolidColorBrush x:Key="ButtonMouseOver" Color="#323232" />
+    <SolidColorBrush x:Key="ButtonInsideMouseOverBorder" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="ButtonMousePressed" Color="#272727" />
+    <SolidColorBrush x:Key="ButtonMousePressedInsideBorder" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="ButtonMousePressedText" Color="#cecece" />
+    <SolidColorBrush x:Key="ButtonBackgroundDisabledColor" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="ButtonInsideBorderDisabled" Color="#303030" />
+    <SolidColorBrush x:Key="ButtonDisabledText" Color="#787878" />
+    <Thickness x:Key="CustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="CustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="PressedCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+
 
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 0e9f07513..c9bdde83a 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -17,6 +17,11 @@
     <SolidColorBrush x:Key="Color09B" Color="#ededed" />
     <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
     <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
+    <SolidColorBrush x:Key="Color12B" Color="#fefefe" />
+    <SolidColorBrush x:Key="Color13B" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="Color14B" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="Color16B" Color="#f6f6f6" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -28,6 +33,31 @@
     <Color x:Key="Color09">#ededed</Color>
     <Color x:Key="Color10">#c42b1c</Color>
     <Color x:Key="Color11">#c81c31</Color>
+    <Color x:Key="Color12">#fefefe</Color>
+    <Color x:Key="Color13">#e5e5e5</Color>
+    <Color x:Key="Color14">#d3d3d3</Color>
+    <Color x:Key="Color15">#5d5d5d</Color>
+    <Color x:Key="Color16">#f6f6f6</Color>
+
+    <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="ButtonBackgroundColor" Color="#fefefe" />
+    <SolidColorBrush x:Key="ButtonMouseOver" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonInsideMouseOverBorder" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonMousePressed" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonMousePressedInsideBorder" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="ButtonMousePressedText" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="ButtonBackgroundDisabledColor" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonInsideBorderDisabled" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonDisabledText" Color="#9d9d9d" />
+    <Thickness x:Key="CustomButtonOutBorderThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="CustomButtonInsideBorderThickness">0,0,0,2</Thickness>
+    <Thickness x:Key="PressedCustomButtonOutBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
+
+
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 842fa12e4..c20ec2f73 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -996,7 +996,7 @@
                                                                         <Setter Property="Padding" Value="12,8,12,8" />
                                                                         <Setter Property="BorderThickness" Value="0" />
                                                                         <Setter Property="FontWeight" Value="DemiBold" />
-                                                                        <Setter Property="Foreground" Value="{StaticResource Color02B}" />
+                                                                        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
                                                                                 <Setter Property="Foreground" Value="{StaticResource Color08B}" />
@@ -1473,8 +1473,7 @@
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginInstallClick"
-                                                                Content="{DynamicResource install}"
-                                                                Foreground="Black" />
+                                                                Content="{DynamicResource install}" />
                                                         </Border>
                                                     </Grid>
                                                 </StackPanel>
@@ -1680,14 +1679,14 @@
                                                                 <Border
                                                                     x:Name="Bd"
                                                                     Padding="{TemplateBinding Padding}"
-                                                                    Background="#fefefe"
-                                                                    BorderBrush="#e5e5e5"
+                                                                    Background="{StaticResource Color12B}"
+                                                                    BorderBrush="{StaticResource Color03B}"
                                                                     BorderThickness="1,1,1,0"
                                                                     CornerRadius="4"
                                                                     SnapsToDevicePixels="true">
                                                                     <Border
                                                                         x:Name="Bd2"
-                                                                        BorderBrush="#d3d3d3"
+                                                                        BorderBrush="{StaticResource Color14B}"
                                                                         BorderThickness="0,0,0,2"
                                                                         CornerRadius="4">
                                                                         <ContentPresenter

From e8e139304e84df8ada7fa5ceacae259d7a8e6c70 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 16 Nov 2021 08:16:58 +0900
Subject: [PATCH 026/107] Change UseSound to Default.

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 1cb65fb85..89d2d32aa 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -83,7 +83,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         };
 
         public bool UseAnimation { get; set; } = true;
-        public bool UseSound { get; set; } = false;
+        public bool UseSound { get; set; } = true;
 
 
         /// <summary>

From 7107386eaf495c96e022a643a4c5115f8b43796d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 16 Nov 2021 14:54:58 +0900
Subject: [PATCH 027/107] - Fix First Launch Position to Center - Move
 HideStartup code to MainWindow from app.xaml.cs

---
 Flow.Launcher/App.xaml.cs        | 10 ----------
 Flow.Launcher/MainWindow.xaml.cs | 27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 52faf8658..f7729701e 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -100,16 +100,6 @@ namespace Flow.Launcher
                 AutoUpdates();
 
                 API.SaveAppAllSettings();
-
-                if (_settings.HideOnStartup)
-                {
-                    _mainVM.Hide(); 
-                }
-                else
-                {
-                    window.WindowAnimator();
-                }
-
                 Log.Info("|App.OnStartup|End Flow Launcher startup ----------------------------------------------------  ");
             });
         }
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 07a18bc80..46a842445 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -64,6 +64,7 @@ namespace Flow.Launcher
 
         private void OnLoaded(object sender, RoutedEventArgs _)
         {
+            HideStartup();
             // show notify icon when flowlauncher is hidden
             InitializeNotifyIcon();
             WindowsInteropHelper.DisableControlBox(this);
@@ -335,6 +336,8 @@ namespace Flow.Launcher
             {
                 Left = WindowLeft();
                 Top = WindowTop();
+                _settings.WindowLeft = Left;
+                _settings.WindowTop = Top;
             }
         }
 
@@ -350,7 +353,27 @@ namespace Flow.Launcher
             }
         }
 
-        private double WindowLeft()
+        public void HideStartup()
+        {
+            if (_settings.HideOnStartup)
+            {
+                _viewModel.Hide();
+            }
+            else
+            {
+                if (!_settings.HideOnStartup && _settings.WindowLeft == 0 && _settings.WindowTop == 0) /* First Launch */
+                {
+                    Left = WindowLeft();
+                    Top = WindowTop();
+                    _settings.WindowLeft = Left;
+                    _settings.WindowTop = Top;
+                }
+                _viewModel.Show();
+            }
+
+        }
+
+        public double WindowLeft()
         {
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0);
@@ -359,7 +382,7 @@ namespace Flow.Launcher
             return left;
         }
 
-        private double WindowTop()
+        public double WindowTop()
         {
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y);

From f473a7efb4ecafc043b1e809bc2179890fbcf64b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 16 Nov 2021 16:02:12 +0900
Subject: [PATCH 028/107] - Adjust Checkbox Dark Mode

---
 .../Resources/CustomControlTemplate.xaml          | 12 ++++++------
 Flow.Launcher/Resources/Dark.xaml                 | 15 ++++++++++-----
 Flow.Launcher/Resources/Light.xaml                |  7 ++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 90d00b2b7..12ca4e785 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -665,8 +665,8 @@
                                     x:Name="OuterEllipse"
                                     Width="20"
                                     Height="20"
-                                    Fill="#ededed"
-                                    Stroke="#858585"
+                                    Fill="{DynamicResource CustomRadioBackground}"
+                                    Stroke="{DynamicResource CustomRadioBorder}"
                                     StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
                                     UseLayoutRounding="False" />
                                 <Ellipse
@@ -730,8 +730,8 @@
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="#858585" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="#e5e5e5" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource HoverCustomRadioBorder}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource HoverCustomRadioBackground}" />
                             <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
                             <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
                             <Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
@@ -741,8 +741,8 @@
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="#b4b4b4" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="#dcdcdc" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource PressedCustomRadioBorder}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource PressedCustomRadioBackground}" />
                             <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
                             <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
                             <Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index fa94a1ebc..958eb5ecf 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -57,7 +57,12 @@
     <Thickness x:Key="DisabledCustomButtonOutBorderThickness">0,0,0,0</Thickness>
     <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
 
-
+    <SolidColorBrush x:Key="CustomRadioBorder" Color="#999999" />
+    <SolidColorBrush x:Key="CustomRadioBackground" Color="#1d1d1d" />
+    <SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#999999" />
+    <SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#1d1d1d" />
+    <SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
+    <SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#1d1d1d" />
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
@@ -1101,13 +1106,13 @@
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
-    <m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
-    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
-    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="Color01B" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="Color01B" />
+    <m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="Color01B" />
     <m:StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
     <m:StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index c9bdde83a..7a9db5387 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -57,7 +57,12 @@
     <Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
 
-
+    <SolidColorBrush x:Key="CustomRadioBorder" Color="#858585" />
+    <SolidColorBrush x:Key="CustomRadioBackground" Color="#ededed" />
+    <SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#858585" />
+    <SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
+    <SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#dcdcdc" />
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>

From 28dd3992b1382018d57f4dd1d66f7d05cbe06e6e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 16 Nov 2021 20:45:45 +0900
Subject: [PATCH 029/107] add ComboBox / Textarea darkmode

---
 .../Resources/CustomControlTemplate.xaml      |  74 ++++++------
 Flow.Launcher/Resources/Dark.xaml             | 111 +++++++++++++-----
 Flow.Launcher/Resources/Light.xaml            |  83 +++++++++----
 Flow.Launcher/SettingWindow.xaml              |   2 +-
 4 files changed, 181 insertions(+), 89 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 12ca4e785..583a5fcc4 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -855,8 +855,8 @@
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="#868686" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="#ededed" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
                             <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
                         </MultiTrigger>
                         <!--  UncheckedPointerOver  -->
@@ -867,9 +867,9 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
-                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="#868686" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="#868686" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="#e5e5e5" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
                             <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
                         </MultiTrigger>
                         <!--  UncheckedPressed  -->
@@ -880,9 +880,9 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="#b7b7b7" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="#b7b7b7" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="#dcdcdc" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
                             <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
                         </MultiTrigger>
                         <!--  UncheckedDisabled  -->
@@ -1304,16 +1304,16 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            BorderBrush="#e5e5e5"
-                            BorderThickness="1,1,1,0"
+                            BorderBrush="{DynamicResource CustomComboOutline}"
+                            BorderThickness="{DynamicResource CustomComboOutlineThickness}"
                             CornerRadius="4">
                             <Border
                                 x:Name="Background"
                                 MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
                                 ui:ValidationHelper.IsTemplateValidationAdornerSite="True"
                                 Background="{TemplateBinding Background}"
-                                BorderBrush="#cccccc"
-                                BorderThickness="0,0,0,2"
+                                BorderBrush="{DynamicResource CustomComboInline}"
+                                BorderThickness="{DynamicResource CustomComboInlineThickness}"
                                 CornerRadius="4" />
                         </Border>
                         <Border
@@ -1436,7 +1436,7 @@
                                 <Border
                                     x:Name="PopupBorder"
                                     HorizontalAlignment="Stretch"
-                                    Background="#f6f6f6"
+                                    Background="{DynamicResource PopUpBorderBG}"
                                     CornerRadius="{DynamicResource OverlayCornerRadius}">
                                     <Border
                                         Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
@@ -1463,35 +1463,35 @@
                     <ControlTemplate.Triggers>
                         <!--  PointerOver  -->
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource CustomComboHoverBG}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundPointerOver}" />
                             <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPointerOver}" />
                         </Trigger>
                         <!--  Pressed  -->
                         <Trigger SourceName="ToggleButton" Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource CustomComboPressedBG}" />
                             <Setter TargetName="Background" Property="BorderThickness" Value="0" />
                             <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
-                            <Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
+                            <Setter TargetName="OutLine" Property="BorderBrush" Value="{DynamicResource CustomComboPressedOutLine}" />
+                            <Setter TargetName="OutLine" Property="BorderThickness" Value="{DynamicResource PressedCustomComboOutlineThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CustomComboPressedText}" />
                             <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
                         </Trigger>
                         <!--  Disabled  -->
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource CustomComboDisabledBG}" />
                             <Setter TargetName="Background" Property="BorderThickness" Value="0" />
                             <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
-                            <Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
+                            <Setter TargetName="OutLine" Property="BorderBrush" Value="{DynamicResource CustomComboDisabledOutLine}" />
+                            <Setter TargetName="OutLine" Property="BorderThickness" Value="{DynamicResource DisabledCustomComboOutlineThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CustomComboDisabledText}" />
                             <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
                         </Trigger>
 
                         <!--  Focused  -->
                         <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
-                            <Setter TargetName="HighlightBackground" Property="Background" Value="#f0f0f0" />
+                            <Setter TargetName="HighlightBackground" Property="Background" Value="{DynamicResource CustomComboHighlightBG}" />
                             <Setter TargetName="HighlightBackground" Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
                             <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocused}" />
@@ -1735,9 +1735,9 @@
                             Grid.RowSpan="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Background="#fbfbfb"
-                            BorderBrush="#E5E5E5"
-                            BorderThickness="1,1,1,1"
+                            Background="{DynamicResource CustomTextBoxBG}"
+                            BorderBrush="{DynamicResource CustomTextBoxOutline}"
+                            BorderThickness="{DynamicResource CustomTextBoxOutlineThickness}"
                             CornerRadius="4">
                             <Border
                                 x:Name="BorderElement"
@@ -1745,8 +1745,8 @@
                                 MinHeight="{TemplateBinding MinHeight}"
                                 ui:ValidationHelper.IsTemplateValidationAdornerSite="True"
                                 Background="{TemplateBinding Background}"
-                                BorderBrush="#868686"
-                                BorderThickness="0,0,0,1"
+                                BorderBrush="{DynamicResource CustomTextBoxInline}"
+                                BorderThickness="{DynamicResource CustomTextBoxInlineThickness}"
                                 CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
                         </Border>
                         <ScrollViewer
@@ -1830,7 +1830,7 @@
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
-                            <Setter Property="Background" Value="#f6f6f6" />
+                            <Setter Property="Background" Value="{DynamicResource CustomTextBoxHoverBG}" />
                             <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
                             <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
                         </Trigger>
@@ -2053,7 +2053,7 @@
                                     Fill="{DynamicResource ToggleSwitchFillOff}"
                                     RadiusX="10"
                                     RadiusY="10"
-                                    Stroke="#5a5a5a"
+                                    Stroke="{DynamicResource ToggleSwitchStrokeOff}"
                                     StrokeThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
                                 <Rectangle
                                     x:Name="SwitchKnobBounds"
@@ -2084,7 +2084,7 @@
                                         x:Name="SwitchKnobOff"
                                         Width="10"
                                         Height="10"
-                                        Fill="#5a5a5a" />
+                                        Fill="{DynamicResource ToggleSwitchKnobFillOff}" />
                                     <Grid.RenderTransform>
                                         <TranslateTransform x:Name="KnobTranslateTransform" />
                                     </Grid.RenderTransform>
@@ -2290,9 +2290,9 @@
                                 <Condition Property="IsMouseOver" Value="true" />
                                 <Condition SourceName="SwitchThumb" Property="IsDragging" Value="false" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="#5a5a5a" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="#E5E5E5" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="#5a5a5a" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
                             <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
@@ -2300,9 +2300,9 @@
                         </MultiTrigger>
                         <!--  Pressed  -->
                         <Trigger SourceName="SwitchThumb" Property="IsDragging" Value="true">
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="#5a5a5a" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="#dcdcdc" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="#5a5a5a" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
                             <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 958eb5ecf..9cac6738f 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -6,6 +6,7 @@
     xmlns:primitives="http://schemas.modernwpf.com/2019"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
+    <SolidColorBrush x:Key="Color00B" Color="#2b2b2b" />
     <SolidColorBrush x:Key="Color01B" Color="#202020" />
     <SolidColorBrush x:Key="Color02B" Color="#2b2b2b" />
     <SolidColorBrush x:Key="Color03B" Color="#1d1d1d" />
@@ -22,6 +23,15 @@
     <SolidColorBrush x:Key="Color14B" Color="#3f3f3f" />
     <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
     <SolidColorBrush x:Key="Color16B" Color="#434343" />
+    <SolidColorBrush x:Key="Color17B" Color="#cccccc" />
+    <SolidColorBrush x:Key="Color18B" Color="#999999" />
+    <SolidColorBrush x:Key="Color19B" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="Color20B" Color="#303030" />
+    <SolidColorBrush x:Key="Color21B" Color="#464646" />
+    <SolidColorBrush x:Key="Color22B" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="Color23B" Color="#272727" />
+    <SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
+    <SolidColorBrush x:Key="Color25B" Color="#323232" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
@@ -38,11 +48,21 @@
     <Color x:Key="Color14">#3f3f3f</Color>
     <Color x:Key="Color15">#5d5d5d</Color>
     <Color x:Key="Color16">#434343</Color>
+    <Color x:Key="Color17">#cccccc</Color>
+    <Color x:Key="Color18">#999999</Color>
+    <Color x:Key="Color19">#2a2a2a</Color>
+    <Color x:Key="Color20">#303030</Color>
+    <Color x:Key="Color21">#464646</Color>
+    <Color x:Key="Color22">#3c3c3c</Color>
+    <Color x:Key="Color23">#272727</Color>
+    <Color x:Key="Color24">#9a9a9a</Color>
+    <Color x:Key="Color25">#323232</Color>
+
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#3f3f3f" />
     <SolidColorBrush x:Key="ButtonBackgroundColor" Color="#373737" />
-    <SolidColorBrush x:Key="ButtonMouseOver" Color="#323232" />
+    <SolidColorBrush x:Key="ButtonMouseOver" Color="#3c3c3c" />
     <SolidColorBrush x:Key="ButtonInsideMouseOverBorder" Color="#3f3f3f" />
     <SolidColorBrush x:Key="ButtonMousePressed" Color="#272727" />
     <SolidColorBrush x:Key="ButtonMousePressedInsideBorder" Color="#2a2a2a" />
@@ -64,7 +84,36 @@
     <SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
     <SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#1d1d1d" />
 
-    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
+
+    <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
+    <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color22B" />
+    <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color23B" />
+    <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color19B" />
+    <m:StaticResource x:Key="CustomComboPressedText" ResourceKey="Color08B" />
+    <m:StaticResource x:Key="CustomComboDisabledBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboDisabledOutLine" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CustomComboDisabledText" ResourceKey="Color08B" />
+    <m:StaticResource x:Key="CustomComboHighlightBG" ResourceKey="Color22B" />
+
+
+    <Thickness x:Key="CustomComboOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CustomComboInlineThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DisabledCustomComboOutlineThickness">1,1,1,1</Thickness>
+
+
+    <m:StaticResource x:Key="CustomTextBoxOutline" ResourceKey="Color20B" />
+    <m:StaticResource x:Key="CustomTextBoxBG" ResourceKey="Color06B" />
+    <m:StaticResource x:Key="CustomTextBoxInline" ResourceKey="Color24B" />
+    <m:StaticResource x:Key="CustomTextBoxHoverBG" ResourceKey="Color25B" />
+
+    <Thickness x:Key="CustomTextBoxOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CustomTextBoxInlineThickness">0,0,0,1</Thickness>
+
+
+    <CornerRadius x:Key="ControlCornerRadius">4,4,4,4</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
 
     <SolidColorBrush x:Key="SystemAccentColorDark1Brush" Color="{m:DynamicColor SystemAccentColorDark1}" />
@@ -517,11 +566,11 @@
     <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="Color21B" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorDark1Brush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemControlBackgroundAccentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlForegroundAccentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
@@ -529,11 +578,11 @@
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="Color20B" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemControlBackgroundAccentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
@@ -543,9 +592,9 @@
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="Color02B" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="Color02B" />
+    <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="Color02B" />
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <m:StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
@@ -559,8 +608,8 @@
     <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
     <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
     <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-    <m:StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
-    <m:StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <m:StaticResource x:Key="ComboBoxBackground" ResourceKey="Color12B" />
+    <m:StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="Color22B" />
     <m:StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
     <m:StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <m:StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
@@ -611,7 +660,7 @@
     <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <m:StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
     <m:StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ComboBoxItemBackground" ResourceKey="Color12B" />
     <m:StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
     <m:StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
     <m:StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
@@ -1216,23 +1265,23 @@
     <m:StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <m:StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
     <m:StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-    <m:StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <m:StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <m:StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <m:StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
-    <m:StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
-    <m:StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemAccentColorLight2Brush" />
+    <m:StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
     <m:StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
     <m:StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <m:StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemAccentColorLight2Brush" />
 
     <!--  Resources for SplitButton  -->
     <m:StaticResource x:Key="SplitButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
@@ -1393,15 +1442,15 @@
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="Color19B" />
     <m:StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="Color18B" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="Color18B" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="Color18B" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
@@ -1409,13 +1458,13 @@
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="Color17B" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="Color02B" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="Color02B" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="Color02B" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOnDisabled" ResourceKey="SystemControlPageBackgroundBaseLowBrush" />
 
     <!--  Resources for ToolTip  -->
@@ -1465,9 +1514,9 @@
     <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <m:StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <m:StaticResource x:Key="TextControlBackground" ResourceKey="Color09B" />
     <m:StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
-    <m:StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <m:StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="Color01B" />
     <m:StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <m:StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <m:StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
@@ -1479,7 +1528,7 @@
     <m:StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
     <m:StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <m:StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 7a9db5387..6ee7e110d 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -6,11 +6,12 @@
     xmlns:primitives="http://schemas.modernwpf.com/2019"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
+    <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
     <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
     <SolidColorBrush x:Key="Color02B" Color="#ffffff" />
     <SolidColorBrush x:Key="Color03B" Color="#e5e5e5" />
     <SolidColorBrush x:Key="Color04B" Color="#5f5f5f" />
-    <SolidColorBrush x:Key="Color05B" Color="#000000" />
+    <SolidColorBrush x:Key="Color05B" Color="#1b1b1b" />
     <SolidColorBrush x:Key="Color06B" Color="#eaeaea" />
     <SolidColorBrush x:Key="Color07B" Color="#f6f6f6" />
     <SolidColorBrush x:Key="Color08B" Color="#878787" />
@@ -22,6 +23,12 @@
     <SolidColorBrush x:Key="Color14B" Color="#d3d3d3" />
     <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
     <SolidColorBrush x:Key="Color16B" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="Color17B" Color="#868686" />
+    <SolidColorBrush x:Key="Color18B" Color="#b7b7b7" />
+    <SolidColorBrush x:Key="Color19B" Color="#dcdcdc" />
+    <SolidColorBrush x:Key="Color20B" Color="#5a5a5a" />
+    <SolidColorBrush x:Key="Color21B" Color="#cccccc" />
+    <SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -38,6 +45,12 @@
     <Color x:Key="Color14">#d3d3d3</Color>
     <Color x:Key="Color15">#5d5d5d</Color>
     <Color x:Key="Color16">#f6f6f6</Color>
+    <Color x:Key="Color17">#868686</Color>
+    <Color x:Key="Color18">#b7b7b7</Color>
+    <Color x:Key="Color19">#dcdcdc</Color>
+    <Color x:Key="Color20">#5a5a5a</Color>
+    <Color x:Key="Color21">#cccccc</Color>
+    <Color x:Key="Color22">#f0f0f0</Color>
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />
@@ -54,8 +67,8 @@
     <Thickness x:Key="CustomButtonInsideBorderThickness">0,0,0,2</Thickness>
     <Thickness x:Key="PressedCustomButtonOutBorderThickness">1,1,1,1</Thickness>
     <Thickness x:Key="PressedCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
-    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,0</Thickness>
-    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,0</Thickness>
 
     <SolidColorBrush x:Key="CustomRadioBorder" Color="#858585" />
     <SolidColorBrush x:Key="CustomRadioBackground" Color="#ededed" />
@@ -64,9 +77,39 @@
     <SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
     <SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#dcdcdc" />
 
+    <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
+    <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CustomComboPressedText" ResourceKey="Color08B" />
+    <m:StaticResource x:Key="CustomComboDisabledBG" ResourceKey="Color07B" />
+    <m:StaticResource x:Key="CustomComboDisabledOutLine" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CustomComboDisabledText" ResourceKey="Color08B" />
+    <m:StaticResource x:Key="CustomComboHighlightBG" ResourceKey="Color22B" />
+
+
+    <Thickness x:Key="CustomComboOutlineThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="CustomComboInlineThickness">0,0,0,2</Thickness>
+    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DisabledCustomComboOutlineThickness">1,1,1,1</Thickness>
+
+
+    <m:StaticResource x:Key="CustomTextBoxOutline" ResourceKey="Color03B" />
+    <m:StaticResource x:Key="CustomTextBoxBG" ResourceKey="Color00B" />
+    <m:StaticResource x:Key="CustomTextBoxInline" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="CustomTextBoxHoverBG" ResourceKey="Color16B" />
+
+    <Thickness x:Key="CustomTextBoxOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CustomTextBoxInlineThickness">0,0,0,1</Thickness>
+
+
+
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
 
+
     <SolidColorBrush x:Key="SystemAccentColorDark1Brush" Color="{m:DynamicColor SystemAccentColorDark1}" />
     <SolidColorBrush x:Key="SystemAccentColorDark2Brush" Color="{m:DynamicColor SystemAccentColorDark2}" />
     <SolidColorBrush x:Key="SystemAccentColorDark3Brush" Color="{m:DynamicColor SystemAccentColorDark3}" />
@@ -504,8 +547,8 @@
     <m:StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="Colr18B" />
     <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -515,9 +558,9 @@
     <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="Color18B" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
@@ -527,9 +570,9 @@
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="Color09B" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="Color13B" />
+    <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="Color19B" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
     <m:StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
@@ -1395,13 +1438,13 @@
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <m:StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="Color09B" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="Color03B" />
+    <m:StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="Color19B" />
     <m:StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="Color20B" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
@@ -1411,9 +1454,9 @@
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemControlHighlightListAccentHighBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="Color17B" />
+    <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="Color20B" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index c20ec2f73..b7559027d 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -68,7 +68,7 @@
             </Setter>
         </Style>
         <Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
-            <Setter Property="Background" Value="{StaticResource Color02B}" />
+            <Setter Property="Background" Value="{StaticResource Color00B}" />
             <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />

From 9b96510ffdc68229df91a44b9d1745c289a4c396 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 16 Nov 2021 21:50:19 +0900
Subject: [PATCH 030/107] - Adjust Tab Header Style

---
 .../Resources/CustomControlTemplate.xaml      | 10 ++++
 Flow.Launcher/Resources/Dark.xaml             |  1 +
 Flow.Launcher/Resources/Light.xaml            |  3 +-
 Flow.Launcher/SettingWindow.xaml              | 58 ++++---------------
 4 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 583a5fcc4..193e0da7a 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -13,6 +13,16 @@
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+    </Style>
+    <Style x:Key="TabMenuIcon" TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0,0,12,0" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="SettingSeparatorStyle" TargetType="{x:Type Separator}">
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 9cac6738f..99354c678 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -32,6 +32,7 @@
     <SolidColorBrush x:Key="Color23B" Color="#272727" />
     <SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
     <SolidColorBrush x:Key="Color25B" Color="#323232" />
+    <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 6ee7e110d..e2eb9070f 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -29,6 +29,7 @@
     <SolidColorBrush x:Key="Color20B" Color="#5a5a5a" />
     <SolidColorBrush x:Key="Color21B" Color="#cccccc" />
     <SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
+    <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -106,7 +107,7 @@
 
 
 
-    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
+    <CornerRadius x:Key="ControlCornerRadius">4,4,4,4</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
 
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b7559027d..ca8a32c90 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -181,7 +181,7 @@
                                         x:Name="Spacer"
                                         Width="Auto"
                                         Height="Auto"
-                                        Margin="8,4,8,0"
+                                        Margin="16,0,8,8"
                                         Padding="0,0,0,0"
                                         BorderBrush="Transparent"
                                         BorderThickness="0">
@@ -191,7 +191,7 @@
                                             CornerRadius="5">
                                             <ContentPresenter
                                                 x:Name="ContentSite"
-                                                Margin="12,12,0,12"
+                                                Margin="12,11,0,11"
                                                 HorizontalAlignment="LEFT"
                                                 VerticalAlignment="Center"
                                                 ContentSource="Header"
@@ -484,7 +484,6 @@
                 Grid.Column="0"
                 Grid.ColumnSpan="5"
                 Height="auto"
-                Background="#f3f3f3"
                 SelectedIndex="1"
                 TabStripPlacement="Left">
                 <TabItem Style="{DynamicResource logo}">
@@ -517,12 +516,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xe713;
                             </TextBlock>
                             <TextBlock
@@ -865,12 +859,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xea86;
                             </TextBlock>
                             <TextBlock
@@ -1239,12 +1228,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xe719;
                             </TextBlock>
                             <TextBlock
@@ -1496,12 +1480,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xe790;
                             </TextBlock>
                             <TextBlock
@@ -1697,12 +1676,12 @@
                                                                 </Border>
                                                                 <ControlTemplate.Triggers>
                                                                     <Trigger Property="IsMouseOver" Value="true">
-                                                                        <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
+                                                                        <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="#ffffff" />
+                                                                        <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
                                                                     </Trigger>
                                                                 </ControlTemplate.Triggers>
                                                             </ControlTemplate>
@@ -1947,12 +1926,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xe92e;
                             </TextBlock>
                             <TextBlock
@@ -2145,12 +2119,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xec27;
                             </TextBlock>
                             <TextBlock
@@ -2321,12 +2290,7 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="0,0,12,0"
-                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                FontSize="20"
-                                Style="{StaticResource TabMenu}">
+                            <TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
                                 &#xe946;
                             </TextBlock>
                             <TextBlock

From adb00d82f1816a905c40294e4156b5ebc9cb79f7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 00:28:42 +0900
Subject: [PATCH 031/107] Redesign About Page

---
 Flow.Launcher.Infrastructure/Constant.cs |   2 +
 Flow.Launcher/Languages/en.xaml          |   2 +-
 Flow.Launcher/SettingWindow.xaml         | 270 ++++++++++++++++-------
 Flow.Launcher/SettingWindow.xaml.cs      |  10 +
 4 files changed, 203 insertions(+), 81 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index a5b89c300..594b51156 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -36,6 +36,8 @@ namespace Flow.Launcher.Infrastructure
         public const string DefaultTheme = "Darker";
 
         public const string Themes = "Themes";
+        public const string Settings = "Settings";
+        public const string Logs = "Logs";
 
         public const string Website = "https://flow-launcher.github.io";
     }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 5ca6bdbfd..b8f214538 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -134,7 +134,7 @@
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
-    <system:String x:Key="documentation">Usage Tips:</system:String>
+    <system:String x:Key="documentation">Usage Tips</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ca8a32c90..e20621c4a 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -181,21 +181,36 @@
                                         x:Name="Spacer"
                                         Width="Auto"
                                         Height="Auto"
-                                        Margin="16,0,8,8"
+                                        Margin="14,4,8,4"
                                         Padding="0,0,0,0"
                                         BorderBrush="Transparent"
                                         BorderThickness="0">
                                         <Border
                                             x:Name="border"
+                                            Height="40"
                                             Background="{StaticResource Color01B}"
                                             CornerRadius="5">
-                                            <ContentPresenter
-                                                x:Name="ContentSite"
-                                                Margin="12,11,0,11"
-                                                HorizontalAlignment="LEFT"
-                                                VerticalAlignment="Center"
-                                                ContentSource="Header"
-                                                TextBlock.Foreground="#000" />
+                                            <Grid>
+                                                <Canvas>
+                                                    <Rectangle
+                                                        x:Name="Bullet"
+                                                        Canvas.Left="0"
+                                                        Width="4"
+                                                        Height="18"
+                                                        Margin="0,11,0,11"
+                                                        Fill="{DynamicResource ToggleSwitchFillOn}"
+                                                        RadiusX="2"
+                                                        RadiusY="2"
+                                                        Visibility="Hidden" />
+                                                    <ContentPresenter
+                                                        x:Name="ContentSite"
+                                                        Margin="12,11,0,11"
+                                                        HorizontalAlignment="LEFT"
+                                                        VerticalAlignment="Center"
+                                                        ContentSource="Header"
+                                                        TextBlock.Foreground="#000" />
+                                                </Canvas>
+                                            </Grid>
                                         </Border>
                                     </Border>
                                 </Grid>
@@ -207,6 +222,7 @@
                             </Trigger>
                             <Trigger Property="IsSelected" Value="True">
                                 <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
+                                <Setter TargetName="Bullet" Property="Visibility" Value="Visible" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -2300,78 +2316,172 @@
                         </Grid>
                     </TabItem.Header>
                     <Border>
-                        <Grid Height="400" Margin="65,0">
-                            <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
-                            <Grid.Resources>
-                                <Style TargetType="{x:Type TextBlock}">
-                                    <Setter Property="Margin" Value="10,25,0,0" />
-                                    <Setter Property="FontSize" Value="14" />
-                                    <Setter Property="Foreground" Value="{StaticResource Color05B}" />
-                                </Style>
-                            </Grid.Resources>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <TextBlock
-                                Grid.Row="0"
-                                Grid.ColumnSpan="2"
-                                FontSize="12"
-                                Text="{Binding ActivatedTimes, Mode=OneWay}" />
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Text="{DynamicResource website}" />
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                HorizontalAlignment="Left">
-                                <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding Website, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Text="Version" />
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Text="{Binding Version}" />
-                            <TextBlock
-                                Grid.Row="3"
-                                Grid.Column="0"
-                                Text="{DynamicResource releaseNotes}" />
-                            <TextBlock Grid.Row="3" Grid.Column="1">
-                                <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <TextBlock
-                                Grid.Row="4"
-                                Grid.Column="0"
-                                Text="{DynamicResource documentation}" />
-                            <TextBlock Grid.Row="4" Grid.Column="1">
-                                <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding Documentation, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <Button
-                                Grid.Row="5"
-                                Grid.Column="0"
-                                Margin="10,30,10,10"
-                                HorizontalAlignment="Left"
-                                Click="OnCheckUpdates"
-                                Content="{DynamicResource checkUpdates}" />
-                        </Grid>
+                        <ScrollViewer
+                            Margin="0,0,0,0"
+                            Background="{StaticResource Color01B}"
+                            ScrollViewer.CanContentScroll="False">
+                            <StackPanel Margin="5,14,25,30" Orientation="Vertical">
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Margin="0,5,0,5"
+                                    FontSize="30"
+                                    Style="{StaticResource PageTitle}"
+                                    Text="{DynamicResource about}"
+                                    TextAlignment="left" />
+                                <StackPanel Orientation="Horizontal">
+                                    <Border
+                                        Width="200"
+                                        Height="120"
+                                        Margin="0,8,0,0"
+                                        Padding="24,24,24,24"
+                                        HorizontalAlignment="Left"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <Grid>
+                                            <TextBlock
+                                                FontSize="14"
+                                                Foreground="{DynamicResource Color05B}"
+                                                Text="{DynamicResource version}"
+                                                TextWrapping="WrapWithOverflow" />
+                                            <TextBlock
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Bottom"
+                                                DockPanel.Dock="Bottom"
+                                                FontSize="22"
+                                                Foreground="{DynamicResource Color05B}"
+                                                Text="{Binding Version}"
+                                                TextWrapping="WrapWithOverflow" />
+                                        </Grid>
+                                    </Border>
+                                </StackPanel>
+
+                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource update}" />
+                                        </StackPanel>
+                                        <Button
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Right"
+                                            Click="OnCheckUpdates"
+                                            Content="{DynamicResource checkUpdates}"
+                                            Style="{StaticResource AccentButtonStyle}" />
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe895;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+
+                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding Website, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xeb41;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe8fd;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding Documentation, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe82f;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer" />
+                                        </StackPanel>
+                                        <StackPanel
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Right"
+                                            Orientation="Horizontal">
+                                            <Button
+                                                Margin="0,0,12,0"
+                                                Click="OpenSettingFolder"
+                                                Content="Setting Folder" />
+                                            <Button Click="OpenLogFolder" Content="Log Folder" />
+                                        </StackPanel>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xec7a;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+                                <TextBlock
+                                    Margin="14,14,0,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Bottom"
+                                    DockPanel.Dock="Bottom"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource Color15B}"
+                                    Text="{Binding ActivatedTimes, Mode=OneWay}"
+                                    TextWrapping="WrapWithOverflow" />
+
+                            </StackPanel>
+                        </ScrollViewer>
                     </Border>
                 </TabItem>
             </TabControl>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 1d969a24c..045ece8fe 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -273,6 +273,16 @@ namespace Flow.Launcher
             PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
         }
 
+        private void OpenSettingFolder(object sender, RoutedEventArgs e)
+        {
+            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
+        }
+
+        private void OpenLogFolder(object sender, RoutedEventArgs e)
+        {
+            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs));
+        }
+
         private void OnPluginStoreRefreshClick(object sender, RoutedEventArgs e)
         {
             _ = viewModel.RefreshExternalPluginsAsync();

From fca65603ea9a97e2b7f3fca9a6f419fbd059f3b9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 07:56:32 +0900
Subject: [PATCH 032/107] Change Glyph property to style

---
 .../Resources/CustomControlTemplate.xaml      |   5 +
 Flow.Launcher/SettingWindow.xaml              | 174 ++++--------------
 2 files changed, 36 insertions(+), 143 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 193e0da7a..f029168f3 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -10,6 +10,11 @@
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="Glyph" TargetType="{x:Type TextBlock}">
+        <Setter Property="Grid.Column" Value="0" />
+        <Setter Property="Margin" Value="24 0 16 0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e20621c4a..66e979f8c 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -118,6 +118,12 @@
             <Setter Property="Margin" Value="0,4,0,4" />
         </Style>
 
+        <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" />
+        </Style>
+
         <Style x:Key="logo" TargetType="{x:Type TabItem}">
             <!--#region Logo Style-->
             <Setter Property="Margin" Value="0" />
@@ -565,13 +571,7 @@
                                         IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
                                         Style="{DynamicResource SideControlCheckBox}"
                                         Unchecked="OnAutoStartupUncheck" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xe8fc;
                                     </TextBlock>
                                 </ItemsControl>
@@ -583,13 +583,7 @@
                                         <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" />
                                     </StackPanel>
                                     <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xed1a;
                                     </TextBlock>
                                 </ItemsControl>
@@ -630,13 +624,7 @@
                                         <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" />
                                     </StackPanel>
                                     <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xe7fc;
                                     </TextBlock>
                                 </ItemsControl>
@@ -652,13 +640,7 @@
                                         IsChecked="{Binding Settings.ShouldUsePinyin}"
                                         Style="{DynamicResource SideControlCheckBox}"
                                         ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xe98a;
                                     </TextBlock>
                                 </ItemsControl>
@@ -675,13 +657,7 @@
                                         FocusVisualMargin="5"
                                         IsOn="{Binding AutoUpdates}"
                                         Style="{DynamicResource SideToggleSwitch}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xecc5;
                                     </TextBlock>
                                 </ItemsControl>
@@ -699,13 +675,7 @@
                                         FocusVisualMargin="5"
                                         IsOn="{Binding PortableMode}"
                                         Style="{DynamicResource SideToggleSwitch}" />
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xe88e;
                                     </TextBlock>
                                 </ItemsControl>
@@ -786,13 +756,7 @@
                                                 HorizontalContentAlignment="Center"
                                                 ItemsSource="{Binding MaxResultsRange}"
                                                 SelectedItem="{Binding Settings.MaxResultsToShow}" />
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20"
-                                                Style="{StaticResource Glyph}">
+                                            <TextBlock Style="{StaticResource Glyph}">
                                                 &#xe8fd;
                                             </TextBlock>
                                         </ItemsControl>
@@ -819,13 +783,7 @@
                                             Content="{Binding Settings.CustomExplorer.Name}" />
                                     </StackPanel>
 
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20"
-                                        Style="{StaticResource Glyph}">
+                                    <TextBlock Style="{StaticResource Glyph}">
                                         &#xe838;
                                     </TextBlock>
                                 </ItemsControl>
@@ -1597,13 +1555,7 @@
                                                 Width="100"
                                                 Margin="0,0,2,0"
                                                 IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20"
-                                                Style="{StaticResource Glyph}">
+                                            <TextBlock Style="{StaticResource Glyph}">
                                                 &#xeb91;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1632,13 +1584,7 @@
                                                     TickFrequency="10"
                                                     Value="{Binding WindowWidthSize, Mode=TwoWay}" />
                                             </StackPanel>
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20"
-                                                Style="{StaticResource Glyph}">
+                                            <TextBlock Style="{StaticResource Glyph}">
                                                 &#xe740;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1776,13 +1722,7 @@
                                                         Width="100"
                                                         Margin="0,0,2,0"
                                                         IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
-                                                    <TextBlock
-                                                        Grid.Column="0"
-                                                        Margin="24,0,16,0"
-                                                        VerticalAlignment="Center"
-                                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20"
-                                                        Style="{StaticResource Glyph}">
+                                                    <TextBlock Style="{StaticResource Glyph}">
                                                         &#xf6b8;
                                                     </TextBlock>
                                                 </ItemsControl>
@@ -1832,13 +1772,7 @@
                                                             </ComboBox.ItemTemplate>
                                                         </ComboBox>
                                                     </StackPanel>
-                                                    <TextBlock
-                                                        Grid.Column="0"
-                                                        Margin="24,0,16,0"
-                                                        VerticalAlignment="Center"
-                                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20"
-                                                        Style="{StaticResource Glyph}">
+                                                    <TextBlock Style="{StaticResource Glyph}">
                                                         &#xe990;
                                                     </TextBlock>
                                                 </ItemsControl>
@@ -1888,13 +1822,7 @@
                                                             </ComboBox.ItemTemplate>
                                                         </ComboBox>
                                                     </StackPanel>
-                                                    <TextBlock
-                                                        Grid.Column="0"
-                                                        Margin="24,0,16,0"
-                                                        VerticalAlignment="Center"
-                                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                                        FontSize="20"
-                                                        Style="{StaticResource Glyph}">
+                                                    <TextBlock Style="{StaticResource Glyph}">
                                                         &#xe8fd;
                                                     </TextBlock>
                                                 </ItemsControl>
@@ -1916,13 +1844,7 @@
                                                     Click="OpenPluginFolder"
                                                     Content="{DynamicResource OpenThemeFolder}"
                                                     DockPanel.Dock="Top" />
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    Margin="24,0,16,0"
-                                                    VerticalAlignment="Center"
-                                                    FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20"
-                                                    Style="{StaticResource Glyph}">
+                                                <TextBlock Style="{StaticResource Glyph}">
                                                     &#xe838;
                                                 </TextBlock>
                                             </ItemsControl>
@@ -1992,13 +1914,7 @@
                                                 HotkeyChanged="OnHotkeyChanged"
                                                 Loaded="OnHotkeyControlLoaded" />
 
-                                            <TextBlock
-                                                Grid.Column="0"
-                                                Margin="24,0,16,0"
-                                                VerticalAlignment="Center"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
-                                                FontSize="20"
-                                                Style="{StaticResource Glyph}">
+                                            <TextBlock Style="{StaticResource Glyph}">
                                                 &#xeda7;
                                             </TextBlock>
                                         </ItemsControl>
@@ -2361,17 +2277,12 @@
                                         </StackPanel>
                                         <Button
                                             Grid.Column="1"
+                                            Margin="0,0,-20,0"
                                             HorizontalAlignment="Right"
                                             Click="OnCheckUpdates"
                                             Content="{DynamicResource checkUpdates}"
                                             Style="{StaticResource AccentButtonStyle}" />
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20"
-                                            Style="{StaticResource Glyph}">
+                                        <TextBlock Style="{StaticResource Glyph}">
                                             &#xe895;
                                         </TextBlock>
                                     </ItemsControl>
@@ -2383,18 +2294,12 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
                                         </StackPanel>
-                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                        <TextBlock Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                                 <Run Text="{Binding Website, Mode=OneWay}" />
                                             </Hyperlink>
                                         </TextBlock>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20"
-                                            Style="{StaticResource Glyph}">
+                                        <TextBlock Style="{StaticResource Glyph}">
                                             &#xeb41;
                                         </TextBlock>
                                     </ItemsControl>
@@ -2405,18 +2310,12 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
                                         </StackPanel>
-                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                        <TextBlock Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                                 <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
                                             </Hyperlink>
                                         </TextBlock>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20"
-                                            Style="{StaticResource Glyph}">
+                                        <TextBlock Style="{StaticResource Glyph}">
                                             &#xe8fd;
                                         </TextBlock>
                                     </ItemsControl>
@@ -2427,18 +2326,12 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
                                         </StackPanel>
-                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                        <TextBlock Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                                 <Run Text="{Binding Documentation, Mode=OneWay}" />
                                             </Hyperlink>
                                         </TextBlock>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20"
-                                            Style="{StaticResource Glyph}">
+                                        <TextBlock Style="{StaticResource Glyph}">
                                             &#xe82f;
                                         </TextBlock>
                                     </ItemsControl>
@@ -2451,6 +2344,7 @@
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="1"
+                                            Margin="0,0,-20,0"
                                             HorizontalAlignment="Right"
                                             Orientation="Horizontal">
                                             <Button
@@ -2459,13 +2353,7 @@
                                                 Content="Setting Folder" />
                                             <Button Click="OpenLogFolder" Content="Log Folder" />
                                         </StackPanel>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20"
-                                            Style="{StaticResource Glyph}">
+                                        <TextBlock Style="{StaticResource Glyph}">
                                             &#xec7a;
                                         </TextBlock>
                                     </ItemsControl>

From f4974fbcab7587049eb20c2e489c4ccc86c1fbe5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 08:12:52 +0900
Subject: [PATCH 033/107] change hyperlink and accent button in dark

---
 Flow.Launcher/Resources/Dark.xaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 99354c678..e2b266b29 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -257,7 +257,7 @@
     <SolidColorBrush x:Key="SystemControlHighlightListLowBrush" Color="{m:StaticColor SystemListLowColor}" />
     <SolidColorBrush x:Key="SystemControlHighlightChromeWhiteBrush" Color="{m:StaticColor SystemChromeWhiteColor}" />
     <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{m:DynamicColor SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{m:DynamicColor SystemAccentColorLight2}" />
     <SolidColorBrush x:Key="SystemControlHyperlinkBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
     <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumBrush" Color="{m:StaticColor SystemBaseMediumColor}" />
     <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumHighBrush" Color="{m:StaticColor SystemBaseMediumHighColor}" />
@@ -1547,13 +1547,13 @@
     <SolidColorBrush x:Key="TitleBarButtonBackgroundInactive" Color="Transparent" />
 
     <!--  Resources for AccentButtonStyle  -->
-    <m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
     <m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
     <m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
-    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
-    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="Color01B" />
+    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="Color01B" />
+    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="Color23B" />
     <m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />

From 5bbe5f5e8f169fbfa8aefe093cc81aa600e1cbbf Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 08:16:58 +0900
Subject: [PATCH 034/107] Add RefreshMaxmizeResotreButton in Onload

---
 Flow.Launcher/SettingWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 045ece8fe..7b710d2ba 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -40,6 +40,7 @@ namespace Flow.Launcher
         #region General
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
+            RefreshMaximizeRestoreButton();
             // Fix (workaround) for the window freezes after lock screen (Win+L)
             // https://stackoverflow.com/questions/4951058/software-rendering-mode-wpf
             HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;

From 2b9cb442bd4ce6e03de6d1a47711eeb00193d3e4 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 08:37:00 +0900
Subject: [PATCH 035/107] Fix Window DeActive Style in TitleBar Button

---
 Flow.Launcher/SettingWindow.xaml | 61 +++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 66e979f8c..6a379ca01 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -440,18 +440,7 @@
                 VerticalAlignment="Center"
                 FontSize="12"
                 Foreground="{StaticResource Color05B}"
-                Text="{DynamicResource flowlauncher_settings}">
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
-                                <Setter Property="Foreground" Value="{StaticResource Color07B}" />
-                                <!--  Not work. check  -->
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
-            </TextBlock>
+                Text="{DynamicResource flowlauncher_settings}" />
 
             <Button
                 Grid.Column="2"
@@ -463,7 +452,17 @@
                     Height="32"
                     Data="M 18,15 H 28"
                     Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                    StrokeThickness="1" />
+                    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>
             <Button
                 Name="maximizeButton"
@@ -475,7 +474,17 @@
                     Height="32"
                     Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z"
                     Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                    StrokeThickness="1" />
+                    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>
             <Button
                 Name="restoreButton"
@@ -487,7 +496,17 @@
                     Height="32"
                     Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5"
                     Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                    StrokeThickness="1" />
+                    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>
             <Button
                 Grid.Column="4"
@@ -498,7 +517,17 @@
                     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" />
+                    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>
 
             <TabControl

From 67a435216fba17ffcb47bd24279cde646fcfcbcf Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 10:23:12 +0900
Subject: [PATCH 036/107] Change hardcoded style in SelectFileManagerWindow

---
 .../Resources/CustomControlTemplate.xaml      |  12 +-
 Flow.Launcher/Resources/Dark.xaml             |   4 +
 Flow.Launcher/Resources/Light.xaml            |   4 +
 Flow.Launcher/SelectFileManagerWindow.xaml    | 150 +++++++++++-------
 4 files changed, 111 insertions(+), 59 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index f029168f3..c5c71f6d7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5,13 +5,19 @@
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
 
+    <!--  Popup Color  -->
+    <Style x:Key="PageBackgroundColor" TargetType="{x:Type Window}">
+        <Setter Property="Background" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+    </Style>
+
     <!--  Setting Window  -->
     <Style x:Key="PageTitle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="Glyph" TargetType="{x:Type TextBlock}">
         <Setter Property="Grid.Column" Value="0" />
-        <Setter Property="Margin" Value="24 0 16 0" />
+        <Setter Property="Margin" Value="24,0,16,0" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontSize" Value="20" />
         <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
@@ -20,13 +26,13 @@
     <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
     <Style x:Key="TabMenuIcon" TargetType="{x:Type TextBlock}">
         <Setter Property="Margin" Value="0,0,12,0" />
         <Setter Property="FontSize" Value="16" />
-        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
         <Setter Property="Foreground" Value="{StaticResource Color05B}" />
     </Style>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index e2b266b29..4c02fde8c 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -33,6 +33,10 @@
     <SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
     <SolidColorBrush x:Key="Color25B" Color="#323232" />
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="PopuBGColor" Color="#2b2b2b" />
+    <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
+    <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#202020" />
+    <SolidColorBrush x:Key="PopupButtonAreaBorderColor" Color="#3f3f3f" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index e2eb9070f..c4a3aa139 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -30,6 +30,10 @@
     <SolidColorBrush x:Key="Color21B" Color="#cccccc" />
     <SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
+    <SolidColorBrush x:Key="PopupTextColor" Color="#1b1b1b" />
+    <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#f3f3f3" />
+    <SolidColorBrush x:Key="PopupButtonAreaBorderColor" Color="#e5e5e5" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index eba794c96..2adac5639 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -7,25 +7,63 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{DynamicResource fileManagerWindow}"
-    Background="#f3f3f3"
+    Width="600"
+    Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
-    SizeToContent="WidthAndHeight"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <Grid Width="600">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <!--<Border
+        Padding="26,26,26,0"
+        Background="{DynamicResource PopupContentAreaBGColor}"
+        BorderBrush="{DynamicResource PopupContentAreaBorderColor}"
+        BorderThickness="0,0,0,1">-->
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border
-            Padding="26,26,26,0"
-            Background="#ffffff"
-            BorderBrush="#e5e5e5"
-            BorderThickness="0,0,0,1">
-            <Grid>
+        <Grid>
+            <StackPanel>
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                    <Grid Grid.Row="0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button
+                            Grid.Column="4"
+                            Click="btnCancel_Click"
+                            Style="{StaticResource TitleBarCloseButtonStyle}">
+                            <Path
+                                Width="46"
+                                Height="32"
+                                Data="M 18,11 27,20 M 18,20 27,11"
+                                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                                StrokeThickness="1">
+                                <Path.Style>
+                                    <Style TargetType="Path">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                                <Setter Property="Opacity" Value="0.5" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Path.Style>
+                            </Path>
+                        </Button>
+                    </Grid>
+                </StackPanel>
+                <StackPanel Margin="26,12,26,0">
+                    <StackPanel Grid.Row="1" Margin="0,0,0,12">
                         <TextBlock
                             Grid.Column="0"
                             Margin="0,0,0,0"
@@ -38,14 +76,10 @@
                     <StackPanel>
                         <TextBlock
                             FontSize="14"
-                            Foreground="#1b1b1b"
                             Text="{DynamicResource fileManager_tips}"
                             TextAlignment="Left"
                             TextWrapping="WrapWithOverflow" />
-                        <TextBlock
-                            Margin="0,14,0,0"
-                            FontSize="14"
-                            Foreground="#1b1b1b">
+                        <TextBlock Margin="0,14,0,0" FontSize="14">
                             <TextBlock Text="{DynamicResource fileManager_tips2}" TextWrapping="WrapWithOverflow" />
                         </TextBlock>
                     </StackPanel>
@@ -86,7 +120,7 @@
                     <Rectangle
                         Height="1"
                         Margin="0,20,0,12"
-                        Fill="#cecece" />
+                        Fill="{StaticResource Color03B}" />
                     <StackPanel
                         Margin="0,0,0,0"
                         HorizontalAlignment="Stretch"
@@ -199,46 +233,50 @@
                         </Grid>
                     </StackPanel>
                 </StackPanel>
-            </Grid>
+            </StackPanel>
+        </Grid>
+
+        <Border
+            Grid.Row="2"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="0,0,5,0"
+                    Click="btnCancel_Click"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,0,0"
+                    Click="btnDone_Click"
+                    Content="{DynamicResource done}"
+                    ForceCursor="True">
+                    <Button.Style>
+                        <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=directoryArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=fileArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </StackPanel>
         </Border>
-        <StackPanel
-            Grid.Row="1"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <Button
-                x:Name="btnCancel"
-                Width="100"
-                Height="30"
-                Margin="0,0,5,0"
-                Click="btnCancel_Click"
-                Content="{DynamicResource cancel}" />
-            <Button
-                x:Name="btnDone"
-                Width="100"
-                Height="30"
-                Margin="5,0,0,0"
-                Click="btnDone_Click"
-                Content="{DynamicResource done}"
-                ForceCursor="True">
-                <Button.Style>
-                    <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=directoryArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=fileArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Button.Style>
-            </Button>
-        </StackPanel>
     </Grid>
 </Window>

From 0fbec350cb8be5a2af5fc5d24b79a33d49219ee7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 14:17:17 +0900
Subject: [PATCH 037/107] Darkmode CPriority Change Window

---
 Flow.Launcher/PriorityChangeWindow.xaml       |  167 +--
 .../Resources/CustomControlTemplate.xaml      | 1051 +++++++++--------
 Flow.Launcher/Resources/Dark.xaml             |   16 +-
 Flow.Launcher/Resources/Light.xaml            |   11 +
 Flow.Launcher/SettingWindow.xaml              |    2 +-
 5 files changed, 652 insertions(+), 595 deletions(-)

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index bbe601010..d8fda81e3 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -7,84 +7,117 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{DynamicResource changePriorityWindow}"
-    Background="#F3F3F3"
-    BorderBrush="#cecece"
+    Width="350"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
     Loaded="PriorityChangeWindow_Loaded"
     MouseDown="window_MouseDown"
     ResizeMode="NoResize"
-    SizeToContent="WidthAndHeight"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <Grid Width="350">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border
-            Padding="26,26,26,0"
-            Background="#ffffff"
-            BorderBrush="#e5e5e5"
-            BorderThickness="0,0,0,1">
-            <Grid>
-                <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="0,0,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="20"
-                            FontWeight="SemiBold"
-                            Text="{DynamicResource changePriorityWindow}"
-                            TextAlignment="Left" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            FontSize="14"
-                            Foreground="#1b1b1b"
-                            Text="{DynamicResource priority_tips}"
-                            TextAlignment="Left"
-                            TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
 
-                    <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
-                        <TextBlock
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource priority}" />
-                        <ui:NumberBox
-                            x:Name="tbAction"
-                            Width="190"
-                            Height="34"
-                            Margin="10,0,15,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Minimum="0"
-                            SmallChange="1"
-                            SpinButtonPlacementMode="Inline" />
-                    </StackPanel>
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="4"
+                        Click="BtnCancel_OnClick"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26,12,26,0">
+                <StackPanel Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource changePriorityWindow}"
+                        TextAlignment="Left" />
                 </StackPanel>
-            </Grid>
-        </Border>
-        <StackPanel
-            Grid.Row="1"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <Button
-                x:Name="btnCancel"
-                Width="100"
-                Height="30"
-                Margin="0,0,5,0"
-                Click="BtnCancel_OnClick"
-                Content="{DynamicResource cancel}" />
-            <Button
-                x:Name="btnDone"
-                Width="100"
-                Height="30"
-                Margin="5,0,0,0"
-                Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
+                <StackPanel>
+                    <TextBlock
+                        FontSize="14"
+                        Text="{DynamicResource priority_tips}"
+                        TextAlignment="Left"
+                        TextWrapping="WrapWithOverflow" />
+                </StackPanel>
+
+                <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
+                    <TextBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource priority}" />
+                    <ui:NumberBox
+                        x:Name="tbAction"
+                        Width="200"
+                        Margin="10,0,15,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        CornerRadius="4"
+                        Minimum="0"
+                        SmallChange="1"
+                        SpinButtonPlacementMode="Inline" />
+                </StackPanel>
+            </StackPanel>
         </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="0,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,0,0"
+                    Click="btnDone_OnClick">
+                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+                </Button>
+            </StackPanel>
+        </Border>
     </Grid>
 </Window>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index c5c71f6d7..ad0340f67 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -123,531 +123,7 @@
     </Style>
 
     <!--  Repeat Button  -->
-    <Style x:Key="DefaultRepeatButtonStyle" TargetType="RepeatButton">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
-        <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
-        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-3" />
-        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Border
-                        x:Name="Background"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="4"
-                        SnapsToDevicePixels="True">
-                        <Border
-                            x:Name="Border"
-                            Padding="{TemplateBinding Padding}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Focusable="False"
-                                RecognizesAccessKey="True"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f2f2f2" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f5f5f5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="transparent" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 
-    <Style BasedOn="{StaticResource DefaultRepeatButtonStyle}" TargetType="RepeatButton" />
-
-    <!--  Number Box  -->
-
-    <Thickness x:Key="NumberBoxPopupIndicatorMargin">0,0,8,0</Thickness>
-
-    <Style
-        x:Key="NumberBoxSpinButtonStyle"
-        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
-        TargetType="RepeatButton">
-        <Style.Setters>
-            <Setter Property="IsTabStop" Value="False" />
-            <Setter Property="MinWidth" Value="34" />
-            <Setter Property="Height" Value="34" />
-            <Setter Property="Margin" Value="4,0,0,0" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
-            <Setter Property="ContentTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <Border CornerRadius="4">
-                            <ui:FontIconFallback Data="{Binding}" />
-                        </Border>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="NumberBoxPopupSpinButtonStyle"
-        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
-        TargetType="RepeatButton">
-        <Style.Setters>
-            <Setter Property="Focusable" Value="False" />
-            <Setter Property="Width" Value="32" />
-            <Setter Property="Height" Value="24" />
-            <Setter Property="Background" Value="{DynamicResource NumberBoxPopupSpinButtonBackground}" />
-            <Setter Property="BorderThickness" Value="{DynamicResource NumberBoxPopupSpinButtonBorderThickness}" />
-            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
-            <Setter Property="ContentTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <ui:FontIconFallback Data="{Binding}" />
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="NumberBoxTextBoxStyle"
-        BasedOn="{StaticResource DefaultTextBoxStyle}"
-        TargetType="TextBox">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="TextBox">
-                    <ControlTemplate.Resources>
-                        <StreamGeometry x:Key="ScrollUpDown">M 10 2.138672 L 4.189453 7.939453 L 3.310547 7.060547 L 10 0.361328 L 16.689453 7.060547 L 15.810547 7.939453 Z M 10 17.861328 L 15.810547 12.060547 L 16.689453 12.939453 L 10 19.638672 L 3.310547 12.939453 L 4.189453 12.060547 Z</StreamGeometry>
-                        <Style x:Key="DeleteButtonStyle" TargetType="Button">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="Button">
-                                        <ControlTemplate.Resources>
-                                            <StreamGeometry x:Key="Cancel">M 10.888672 10 L 17.626953 16.748047 L 16.748047 17.626953 L 10 10.888672 L 3.251953 17.626953 L 2.373047 16.748047 L 9.111328 10 L 2.373047 3.251953 L 3.251953 2.373047 L 10 9.111328 L 16.748047 2.373047 L 17.626953 3.251953 Z</StreamGeometry>
-                                        </ControlTemplate.Resources>
-                                        <Border
-                                            x:Name="ButtonLayoutGrid"
-                                            Background="{DynamicResource TextControlButtonBackground}"
-                                            BorderBrush="{DynamicResource TextControlButtonBorderBrush}"
-                                            BorderThickness="{TemplateBinding BorderThickness}">
-                                            <ui:FontIconFallback
-                                                x:Name="GlyphElement"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Data="{StaticResource Cancel}"
-                                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                                FontSize="12"
-                                                FontStyle="Normal"
-                                                Foreground="{DynamicResource TextControlButtonForeground}" />
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsMouseOver" Value="true">
-                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
-                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
-                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
-                                            </Trigger>
-                                            <Trigger Property="IsPressed" Value="true">
-                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
-                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
-                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
-                                            </Trigger>
-                                            <Trigger Property="IsEnabled" Value="false">
-                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
-                                                <Setter TargetName="ButtonLayoutGrid" Property="Opacity" Value="0" />
-                                            </Trigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </ControlTemplate.Resources>
-                    <Grid SnapsToDevicePixels="True">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <ui:ContentPresenterEx
-                            x:Name="HeaderContentPresenter"
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
-                            VerticalAlignment="Top"
-                            Content="{TemplateBinding ui:ControlHelper.Header}"
-                            ContentTemplate="{TemplateBinding ui:ControlHelper.HeaderTemplate}"
-                            FontWeight="Normal"
-                            Foreground="{DynamicResource TextControlHeaderForeground}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextWrapping="Wrap"
-                            Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
-                        <Border
-                            x:Name="BorderElement"
-                            Grid.Row="1"
-                            Grid.RowSpan="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="3"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ui:ValidationHelper.IsTemplateValidationAdornerSite="True"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
-                        <ScrollViewer
-                            x:Name="PART_ContentHost"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Margin="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            Focusable="False"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                            IsTabStop="False"
-                            Style="{DynamicResource TextControlContentHostStyle}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
-                        <TextBlock
-                            x:Name="PlaceholderTextContentPresenter"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            Foreground="{TemplateBinding ui:ControlHelper.PlaceholderForeground}"
-                            IsHitTestVisible="False"
-                            Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"
-                            TextAlignment="{TemplateBinding TextAlignment}"
-                            TextWrapping="{TemplateBinding TextWrapping}" />
-                        <Button
-                            x:Name="DeleteButton"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            MinWidth="34"
-                            Padding="{DynamicResource HelperButtonThemePadding}"
-                            VerticalAlignment="Stretch"
-                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius,
-                                                                            Converter={StaticResource RightCornerRadiusFilterConverter}}"
-                            ui:TextBoxHelper.IsDeleteButton="True"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Focusable="False"
-                            FontSize="{TemplateBinding FontSize}"
-                            IsTabStop="False"
-                            Style="{StaticResource DeleteButtonStyle}"
-                            Visibility="Collapsed" />
-                        <ContentPresenter
-                            x:Name="DescriptionPresenter"
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Content="{TemplateBinding ui:ControlHelper.Description}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
-                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
-                        <ui:FontIconFallback
-                            Grid.Row="1"
-                            Grid.Column="2"
-                            Margin="{StaticResource NumberBoxPopupIndicatorMargin}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Data="{StaticResource ScrollUpDown}"
-                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                            FontSize="12"
-                            Foreground="{DynamicResource NumberBoxPopupIndicatorForeground}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="ButtonStates">
-                                <VisualState x:Name="ButtonVisible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="ButtonCollapsed" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="ui:ControlHelper.PlaceholderForeground" Value="{x:Null}">
-                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
-                        </Trigger>
-                        <Trigger Property="ui:TextBoxHelper.HasText" Value="True">
-                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
-                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
-                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
-                        </Trigger>
-                        <Trigger Property="IsSelectionActive" Value="true">
-                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
-                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
-                            <Setter TargetName="BorderElement" Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsKeyboardFocused" Value="True" />
-                                <Condition Property="ui:TextBoxHelper.HasText" Value="True" />
-                                <Condition Property="IsReadOnly" Value="False" />
-                                <Condition Property="AcceptsReturn" Value="False" />
-                                <Condition Property="TextWrapping" Value="NoWrap" />
-                            </MultiTrigger.Conditions>
-                            <Setter Property="ui:TextBoxHelper.IsDeleteButtonVisible" Value="True" />
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="ui:NumberBox">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ui:NumberBox">
-                    <ControlTemplate.Resources>
-                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
-                    </ControlTemplate.Resources>
-
-                    <Grid ui:ThemeManager.HasThemeResources="True">
-                        <Grid.Resources>
-                            <ui:ResourceDictionaryEx>
-                                <ui:ResourceDictionaryEx.ThemeDictionaries>
-                                    <ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
-                                    </ResourceDictionary>
-
-                                    <ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
-                                    </ResourceDictionary>
-
-                                    <ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
-                                    </ResourceDictionary>
-                                </ui:ResourceDictionaryEx.ThemeDictionaries>
-                            </ui:ResourceDictionaryEx>
-                        </Grid.Resources>
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ui:ContentPresenterEx
-                            x:Name="HeaderContentPresenter"
-                            Grid.ColumnSpan="3"
-                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
-                            VerticalAlignment="Top"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="Normal"
-                            Foreground="{DynamicResource TextControlHeaderForeground}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextWrapping="Wrap"
-                            Visibility="Collapsed" />
-
-                        <TextBox
-                            x:Name="InputBox"
-                            Grid.Row="1"
-                            ui:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}"
-                            ui:ControlHelper.PlaceholderText="{TemplateBinding PlaceholderText}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            InputScope="{TemplateBinding InputScope}"
-                            SelectionBrush="{TemplateBinding SelectionBrush}"
-                            TextAlignment="{TemplateBinding TextAlignment}" />
-
-                        <Popup
-                            x:Name="UpDownPopup"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            AllowsTransparency="True"
-                            HorizontalOffset="{DynamicResource NumberBoxPopupHorizonalOffset}"
-                            Placement="Right"
-                            VerticalOffset="{DynamicResource NumberBoxPopupVerticalOffset}">
-                            <ui:ThemeShadowChrome
-                                CornerRadius="{DynamicResource OverlayCornerRadius}"
-                                Depth="{DynamicResource NumberBoxPopupShadowDepth}"
-                                IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
-                                <Border
-                                    x:Name="PopupContentRoot"
-                                    Background="{DynamicResource NumberBoxPopupBackground}"
-                                    BorderBrush="{DynamicResource NumberBoxPopupBorderBrush}"
-                                    BorderThickness="{DynamicResource NumberBoxPopupBorderThickness}"
-                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                    <Grid>
-
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="*" />
-                                        </Grid.RowDefinitions>
-
-                                        <RepeatButton
-                                            x:Name="PopupUpSpinButton"
-                                            Content="{StaticResource ChevronUp}"
-                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
-
-                                        <RepeatButton
-                                            x:Name="PopupDownSpinButton"
-                                            Grid.Row="1"
-                                            Content="{StaticResource ChevronDown}"
-                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
-                                    </Grid>
-                                </Border>
-                            </ui:ThemeShadowChrome>
-                        </Popup>
-
-                        <RepeatButton
-                            x:Name="UpSpinButton"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            ui:ControlHelper.CornerRadius="0"
-                            Content="{StaticResource ChevronUp}"
-                            FontSize="11"
-                            Style="{StaticResource NumberBoxSpinButtonStyle}"
-                            Visibility="Collapsed" />
-
-                        <RepeatButton
-                            x:Name="DownSpinButton"
-                            Grid.Row="1"
-                            Grid.Column="2"
-                            ui:ControlHelper.CornerRadius="0"
-                            Content="{StaticResource ChevronDown}"
-                            FontSize="11"
-                            Style="{StaticResource NumberBoxSpinButtonStyle}"
-                            Visibility="Collapsed" />
-
-                        <ContentPresenter
-                            x:Name="DescriptionPresenter"
-                            Grid.Row="2"
-                            Grid.ColumnSpan="2"
-                            Content="{TemplateBinding Description}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
-                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled" />
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="SpinButtonStates">
-                                <VisualState x:Name="SpinButtonsCollapsed" />
-                                <VisualState x:Name="SpinButtonsVisible" />
-                                <VisualState x:Name="SpinButtonsPopup" />
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="UpSpinButtonEnabledStates">
-                                <VisualState x:Name="UpSpinButtonEnabled" />
-                                <VisualState x:Name="UpSpinButtonDisabled">
-                                    <Storyboard>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="UpSpinButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
-                                        </BooleanAnimationUsingKeyFrames>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupUpSpinButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
-                                        </BooleanAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="DownSpinButtonEnabledStates">
-                                <VisualState x:Name="DownSpinButtonEnabled" />
-                                <VisualState x:Name="DownSpinButtonDisabled">
-                                    <Storyboard>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="DownSpinButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
-                                        </BooleanAnimationUsingKeyFrames>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupDownSpinButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
-                                        </BooleanAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
-                        </Trigger>
-                        <!--  SpinButtonsVisible  -->
-                        <Trigger Property="SpinButtonPlacementMode" Value="Inline">
-                            <Setter TargetName="DownSpinButton" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="UpSpinButton" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="InputBox" Property="ui:ControlHelper.CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                        </Trigger>
-                        <!--  SpinButtonsPopup  -->
-                        <Trigger Property="SpinButtonPlacementMode" Value="Compact">
-                            <Setter TargetName="InputBox" Property="Style" Value="{StaticResource NumberBoxTextBoxStyle}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
     <!--  Radio Button  -->
     <Style x:Key="DefaultRadioButtonStyle" TargetType="RadioButton">
         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -2683,5 +2159,532 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+
+    <Style x:Key="DefaultRepeatButtonStyle" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource NumberBoxColor26B}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-3" />
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Border
+                        x:Name="Background"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="4"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="Border"
+                            Padding="{TemplateBinding Padding}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource NumberBoxColor23B}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NumberBoxColor26B}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource NumberBoxColor24B}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NumberBoxColor25B}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Background" Property="Background" Value="transparent" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NumberBoxColor25B}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultRepeatButtonStyle}" TargetType="RepeatButton" />
+
+    <!--  Number Box  -->
+
+    <Thickness x:Key="NumberBoxPopupIndicatorMargin">0,0,8,0</Thickness>
+
+    <Style
+        x:Key="NumberBoxSpinButtonStyle"
+        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
+        TargetType="RepeatButton">
+        <Style.Setters>
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="MinWidth" Value="34" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <ui:FontIconFallback Data="{Binding}" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style
+        x:Key="NumberBoxPopupSpinButtonStyle"
+        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
+        TargetType="RepeatButton">
+        <Style.Setters>
+            <Setter Property="Focusable" Value="False" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="Background" Value="{DynamicResource NumberBoxPopupSpinButtonBackground}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource NumberBoxPopupSpinButtonBorderThickness}" />
+            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <ui:FontIconFallback Data="{Binding}" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style
+        x:Key="NumberBoxTextBoxStyle"
+        BasedOn="{StaticResource DefaultTextBoxStyle}"
+        TargetType="TextBox">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <ControlTemplate.Resources>
+                        <StreamGeometry x:Key="ScrollUpDown">M 10 2.138672 L 4.189453 7.939453 L 3.310547 7.060547 L 10 0.361328 L 16.689453 7.060547 L 15.810547 7.939453 Z M 10 17.861328 L 15.810547 12.060547 L 16.689453 12.939453 L 10 19.638672 L 3.310547 12.939453 L 4.189453 12.060547 Z</StreamGeometry>
+                        <Style x:Key="DeleteButtonStyle" TargetType="Button">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="Button">
+                                        <ControlTemplate.Resources>
+                                            <StreamGeometry x:Key="Cancel">M 10.888672 10 L 17.626953 16.748047 L 16.748047 17.626953 L 10 10.888672 L 3.251953 17.626953 L 2.373047 16.748047 L 9.111328 10 L 2.373047 3.251953 L 3.251953 2.373047 L 10 9.111328 L 16.748047 2.373047 L 17.626953 3.251953 Z</StreamGeometry>
+                                        </ControlTemplate.Resources>
+                                        <Border
+                                            x:Name="ButtonLayoutGrid"
+                                            Background="{DynamicResource TextControlButtonBackground}"
+                                            BorderBrush="{DynamicResource TextControlButtonBorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                                            <ui:FontIconFallback
+                                                x:Name="GlyphElement"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{StaticResource Cancel}"
+                                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                                FontSize="12"
+                                                FontStyle="Normal"
+                                                Foreground="{DynamicResource TextControlButtonForeground}" />
+                                        </Border>
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
+                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
+                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
+                                            </Trigger>
+                                            <Trigger Property="IsPressed" Value="true">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+                                            </Trigger>
+                                            <Trigger Property="IsEnabled" Value="false">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Opacity" Value="0" />
+                                            </Trigger>
+                                        </ControlTemplate.Triggers>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </ControlTemplate.Resources>
+                    <Grid SnapsToDevicePixels="True">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:ContentPresenterEx
+                            x:Name="HeaderContentPresenter"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
+                            VerticalAlignment="Top"
+                            Content="{TemplateBinding ui:ControlHelper.Header}"
+                            ContentTemplate="{TemplateBinding ui:ControlHelper.HeaderTemplate}"
+                            FontWeight="Normal"
+                            Foreground="{DynamicResource TextControlHeaderForeground}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextWrapping="Wrap"
+                            Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
+                        <Border
+                            x:Name="BorderElement"
+                            Grid.Row="1"
+                            Grid.RowSpan="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            ui:ValidationHelper.IsTemplateValidationAdornerSite="True"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            Focusable="False"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            IsTabStop="False"
+                            Style="{DynamicResource TextControlContentHostStyle}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                        <TextBlock
+                            x:Name="PlaceholderTextContentPresenter"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            Foreground="{TemplateBinding ui:ControlHelper.PlaceholderForeground}"
+                            IsHitTestVisible="False"
+                            Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"
+                            TextAlignment="{TemplateBinding TextAlignment}"
+                            TextWrapping="{TemplateBinding TextWrapping}" />
+                        <Button
+                            x:Name="DeleteButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            MinWidth="34"
+                            Padding="{DynamicResource HelperButtonThemePadding}"
+                            VerticalAlignment="Stretch"
+                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius,
+                                                                            Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                            ui:TextBoxHelper.IsDeleteButton="True"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Focusable="False"
+                            FontSize="{TemplateBinding FontSize}"
+                            IsTabStop="False"
+                            Style="{StaticResource DeleteButtonStyle}"
+                            Visibility="Collapsed" />
+                        <ContentPresenter
+                            x:Name="DescriptionPresenter"
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{TemplateBinding ui:ControlHelper.Description}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
+                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
+                        <ui:FontIconFallback
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Margin="{StaticResource NumberBoxPopupIndicatorMargin}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Data="{StaticResource ScrollUpDown}"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="12"
+                            Foreground="{DynamicResource NumberBoxPopupIndicatorForeground}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ButtonStates">
+                                <VisualState x:Name="ButtonVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="ButtonCollapsed" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="ui:ControlHelper.PlaceholderForeground" Value="{x:Null}">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
+                        </Trigger>
+                        <Trigger Property="ui:TextBoxHelper.HasText" Value="True">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsSelectionActive" Value="true">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
+                            <Setter TargetName="BorderElement" Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsKeyboardFocused" Value="True" />
+                                <Condition Property="ui:TextBoxHelper.HasText" Value="True" />
+                                <Condition Property="IsReadOnly" Value="False" />
+                                <Condition Property="AcceptsReturn" Value="False" />
+                                <Condition Property="TextWrapping" Value="NoWrap" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ui:TextBoxHelper.IsDeleteButtonVisible" Value="True" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ui:NumberBox">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="CornerRadius" Value="4" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ui:NumberBox">
+                    <ControlTemplate.Resources>
+                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
+                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
+                    </ControlTemplate.Resources>
+
+                    <Grid ui:ThemeManager.HasThemeResources="True">
+                        <Grid.Resources>
+                            <ui:ResourceDictionaryEx>
+                                <ui:ResourceDictionaryEx.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
+                                    </ResourceDictionary>
+
+                                    <ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
+                                    </ResourceDictionary>
+
+                                    <ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+                                    </ResourceDictionary>
+                                </ui:ResourceDictionaryEx.ThemeDictionaries>
+                            </ui:ResourceDictionaryEx>
+                        </Grid.Resources>
+
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ui:ContentPresenterEx
+                            x:Name="HeaderContentPresenter"
+                            Grid.ColumnSpan="3"
+                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
+                            VerticalAlignment="Top"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="Normal"
+                            Foreground="{DynamicResource TextControlHeaderForeground}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextWrapping="Wrap"
+                            Visibility="Collapsed" />
+
+                        <TextBox
+                            x:Name="InputBox"
+                            Grid.Row="1"
+                            ui:ControlHelper.CornerRadius="4"
+                            ui:ControlHelper.PlaceholderText="{TemplateBinding PlaceholderText}"
+                            Background="{DynamicResource CustomNumberBoxBG}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{DynamicResource Color05B}"
+                            InputScope="{TemplateBinding InputScope}"
+                            SelectionBrush="{TemplateBinding SelectionBrush}"
+                            TextAlignment="{TemplateBinding TextAlignment}" />
+
+                        <Popup
+                            x:Name="UpDownPopup"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            AllowsTransparency="True"
+                            HorizontalOffset="{DynamicResource NumberBoxPopupHorizonalOffset}"
+                            Placement="Right"
+                            VerticalOffset="{DynamicResource NumberBoxPopupVerticalOffset}">
+                            <ui:ThemeShadowChrome
+                                CornerRadius="{DynamicResource OverlayCornerRadius}"
+                                Depth="{DynamicResource NumberBoxPopupShadowDepth}"
+                                IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
+                                <Border
+                                    x:Name="PopupContentRoot"
+                                    Background="{DynamicResource NumberBoxPopupBackground}"
+                                    BorderBrush="{DynamicResource NumberBoxPopupBorderBrush}"
+                                    BorderThickness="{DynamicResource NumberBoxPopupBorderThickness}"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                    <Grid>
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+
+                                        <RepeatButton
+                                            x:Name="PopupUpSpinButton"
+                                            Content="{StaticResource ChevronUp}"
+                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+
+                                        <RepeatButton
+                                            x:Name="PopupDownSpinButton"
+                                            Grid.Row="1"
+                                            Content="{StaticResource ChevronDown}"
+                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+                                    </Grid>
+                                </Border>
+                            </ui:ThemeShadowChrome>
+                        </Popup>
+
+                        <RepeatButton
+                            x:Name="UpSpinButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="4,0,0,0"
+                            ui:ControlHelper.CornerRadius="4"
+                            Content="{StaticResource ChevronUp}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Visibility="Collapsed" />
+
+                        <RepeatButton
+                            x:Name="DownSpinButton"
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            ui:ControlHelper.CornerRadius="4"
+                            Content="{StaticResource ChevronDown}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Visibility="Collapsed" />
+
+                        <ContentPresenter
+                            x:Name="DescriptionPresenter"
+                            Grid.Row="2"
+                            Grid.ColumnSpan="2"
+                            Content="{TemplateBinding Description}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
+                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SpinButtonStates">
+                                <VisualState x:Name="SpinButtonsCollapsed" />
+                                <VisualState x:Name="SpinButtonsVisible" />
+                                <VisualState x:Name="SpinButtonsPopup" />
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="UpSpinButtonEnabledStates">
+                                <VisualState x:Name="UpSpinButtonEnabled" />
+                                <VisualState x:Name="UpSpinButtonDisabled">
+                                    <Storyboard>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="UpSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupUpSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="DownSpinButtonEnabledStates">
+                                <VisualState x:Name="DownSpinButtonEnabled" />
+                                <VisualState x:Name="DownSpinButtonDisabled">
+                                    <Storyboard>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="DownSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupDownSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
+                        </Trigger>
+                        <!--  SpinButtonsVisible  -->
+                        <Trigger Property="SpinButtonPlacementMode" Value="Inline">
+                            <Setter TargetName="DownSpinButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="UpSpinButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="InputBox" Property="ui:ControlHelper.CornerRadius" Value="4" />
+                        </Trigger>
+                        <!--  SpinButtonsPopup  -->
+                        <Trigger Property="SpinButtonPlacementMode" Value="Compact">
+                            <Setter TargetName="InputBox" Property="Style" Value="{StaticResource NumberBoxTextBoxStyle}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
     <!--#endregion-->
 </ResourceDictionary>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 4c02fde8c..7c631bdc2 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -28,10 +28,16 @@
     <SolidColorBrush x:Key="Color19B" Color="#2a2a2a" />
     <SolidColorBrush x:Key="Color20B" Color="#303030" />
     <SolidColorBrush x:Key="Color21B" Color="#464646" />
-    <SolidColorBrush x:Key="Color22B" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="Color22B" Color="#3C3C3C" />
     <SolidColorBrush x:Key="Color23B" Color="#272727" />
     <SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
     <SolidColorBrush x:Key="Color25B" Color="#323232" />
+    <SolidColorBrush x:Key="NumberBoxColor23B" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="NumberBoxColor24B" Color="#272727" />
+    <SolidColorBrush x:Key="NumberBoxColor25B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="NumberBoxColor26B" Color="#ffffff" />
+    <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#2b2b2b" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
@@ -62,6 +68,10 @@
     <Color x:Key="Color23">#272727</Color>
     <Color x:Key="Color24">#9a9a9a</Color>
     <Color x:Key="Color25">#323232</Color>
+    <Color x:Key="NumberBoxColor23">#f2f2f2</Color>
+    <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
+    <Color x:Key="NumberBoxColor25">#464646</Color>
+    <Color x:Key="NumberBoxColor26">#ffffff</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
@@ -1515,8 +1525,8 @@
     <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
     <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
     <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
-    <m:StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForeground" ResourceKey="Color05B" />
+    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="Color05B" />
     <m:StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
     <m:StaticResource x:Key="TextControlBackground" ResourceKey="Color09B" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index c4a3aa139..9dd240f4d 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -29,6 +29,12 @@
     <SolidColorBrush x:Key="Color20B" Color="#5a5a5a" />
     <SolidColorBrush x:Key="Color21B" Color="#cccccc" />
     <SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
+    <SolidColorBrush x:Key="NumberBoxColor23B" Color="#f2f2f2" />
+    <SolidColorBrush x:Key="NumberBoxColor24B" Color="#f5f5f5" />
+    <SolidColorBrush x:Key="NumberBoxColor25B" Color="#878787" />
+    <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
+    <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#1b1b1b" />
@@ -56,6 +62,11 @@
     <Color x:Key="Color20">#5a5a5a</Color>
     <Color x:Key="Color21">#cccccc</Color>
     <Color x:Key="Color22">#f0f0f0</Color>
+    <Color x:Key="NumberBoxColor23">#f2f2f2</Color>
+    <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
+    <Color x:Key="NumberBoxColor25">#878787</Color>
+    <Color x:Key="NumberBoxColor26">#1b1b1b</Color>
+
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 6a379ca01..f846dd057 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2369,7 +2369,7 @@
                                 <Border Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer" />
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer's Tool" />
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="1"

From c725181eeef9915af059cf181bcbf01bad9f065b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 14:39:10 +0900
Subject: [PATCH 038/107] Darkmode CustomQueryHotkey/HotkeyControl

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 195 +++++++++++++++-----
 Flow.Launcher/HotkeyControl.xaml            |  65 +++++--
 Flow.Launcher/Resources/Dark.xaml           |   4 +-
 3 files changed, 197 insertions(+), 67 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 23bd89906..4ba55b110 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -1,59 +1,160 @@
-<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        Icon="Images\app.png"
-        ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        MouseDown="window_MouseDown"
-        Title="{DynamicResource customeQueryHotkeyTitle}" Height="345" Width="500" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.CustomQueryHotkeySetting"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+    Title="{DynamicResource customeQueryHotkeyTitle}"
+    Width="500"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    Icon="Images\app.png"
+    MouseDown="window_MouseDown"
+    ResizeMode="NoResize"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="Close"/>
+        <KeyBinding Key="Escape" Command="Close" />
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="Close" Executed="cmdEsc_OnPress"/>
+        <CommandBinding Command="Close" Executed="cmdEsc_OnPress" />
     </Window.CommandBindings>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
-            <Grid>
-                <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource customeQueryHotkeyTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock 
-                           Text="{DynamicResource customeQueryHotkeyTips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal" Margin="0 20 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Width="60"/>
-                        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" HorizontalAlignment="Left" HorizontalContentAlignment="Left" Width="200"/>
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal" Margin="0 0 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Width="60"
-                   HorizontalAlignment="Left" Text="{DynamicResource customQuery}" />
-                        <TextBox x:Name="tbAction" Margin="10" Width="250" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
-                    Content="{DynamicResource preview}" />
-                    </StackPanel>
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="4"
+                        Click="BtnCancel_OnClick"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26,0,26,0">
+                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource customeQueryHotkeyTitle}"
+                        TextAlignment="Left" />
                 </StackPanel>
-            </Grid>
-        </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="32"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnAdd" Margin="5 0 10 0" Width="100" Height="32" Click="btnAdd_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
+                <StackPanel>
+                    <TextBlock
+                        FontSize="14"
+                        Text="{DynamicResource customeQueryHotkeyTips}"
+                        TextAlignment="Left"
+                        TextWrapping="WrapWithOverflow" />
+                </StackPanel>
+
+                <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Width="60"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource hotkey}" />
+                    <flowlauncher:HotkeyControl
+                        x:Name="ctlHotkey"
+                        Grid.Column="1"
+                        Width="200"
+                        Height="34"
+                        Margin="10,0,10,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        HorizontalContentAlignment="Left" />
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource actionKeyword}" />
+                </StackPanel>
+
+                <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Width="60"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource customQuery}" />
+                    <TextBox
+                        x:Name="tbAction"
+                        Width="250"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center" />
+                    <Button
+                        x:Name="btnTestActionKeyword"
+                        Height="30"
+                        Padding="10,5,10,5"
+                        Click="BtnTestActionKeyword_OnClick"
+                        Content="{DynamicResource preview}" />
+                </StackPanel>
+            </StackPanel>
         </StackPanel>
+        <Border
+            Grid.Row="1"
+            Margin="0,14,0,0"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="32"
+                    Margin="10,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnAdd"
+                    Width="100"
+                    Height="32"
+                    Margin="5,0,10,0"
+                    Click="btnAdd_OnClick">
+                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+                </Button>
+            </StackPanel>
+        </Border>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 285a282ef..94cdc6703 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -1,26 +1,55 @@
-<UserControl x:Class="Flow.Launcher.HotkeyControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
-             mc:Ignorable="d"
-             Height="24"
-             d:DesignHeight="300" d:DesignWidth="300">
+<UserControl
+    x:Class="Flow.Launcher.HotkeyControl"
+    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:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Height="24"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="200"/>
+            <ColumnDefinition Width="200" />
         </Grid.ColumnDefinitions>
-        <Popup x:Name="popup" AllowDrop="True" PopupAnimation="Fade" PlacementTarget="{Binding ElementName=tbHotkey}" IsOpen="{Binding IsKeyboardFocused, ElementName=tbHotkey, Mode=OneWay}" StaysOpen="True" AllowsTransparency="True" Placement="Top" VerticalOffset="-5">
-            <Border Background="#f6f6f6" BorderBrush="#cecece" BorderThickness="1" CornerRadius="6" Width="120" Height="30">
-                <TextBlock x:Name="tbMsg" FontSize="13" FontWeight="SemiBold" Visibility="Visible" Margin="0 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                    press key
+        <Popup
+            x:Name="popup"
+            AllowDrop="True"
+            AllowsTransparency="True"
+            IsOpen="{Binding IsKeyboardFocused, ElementName=tbHotkey, Mode=OneWay}"
+            Placement="Top"
+            PlacementTarget="{Binding ElementName=tbHotkey}"
+            PopupAnimation="Fade"
+            StaysOpen="True"
+            VerticalOffset="-5">
+            <Border
+                Width="140"
+                Height="30"
+                Background="{DynamicResource Color01B}"
+                BorderBrush="{DynamicResource Color21B}"
+                BorderThickness="1"
+                CornerRadius="4">
+                <TextBlock
+                    x:Name="tbMsg"
+                    Margin="0,0,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="13"
+                    FontWeight="SemiBold"
+                    Foreground="{DynamicResource Color05B}"
+                    Visibility="Visible">
+                    Press key
                 </TextBlock>
             </Border>
         </Popup>
-        
-        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center"
-                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" input:InputMethod.IsInputMethodEnabled="False" Margin="0 0 18 0">
-        </TextBox>
+
+        <TextBox
+            x:Name="tbHotkey"
+            Margin="0,0,18,0"
+            VerticalContentAlignment="Center"
+            input:InputMethod.IsInputMethodEnabled="False"
+            PreviewKeyDown="TbHotkey_OnPreviewKeyDown"
+            TabIndex="100" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 7c631bdc2..4933dc021 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -39,9 +39,9 @@
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
-    <SolidColorBrush x:Key="PopuBGColor" Color="#2b2b2b" />
+    <SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
-    <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#202020" />
+    <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#2b2b2b" />
     <SolidColorBrush x:Key="PopupButtonAreaBorderColor" Color="#3f3f3f" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>

From 7333b571091ec15b786ad3d4f13f78c94376bbb5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 15:04:57 +0900
Subject: [PATCH 039/107] - remove Bookmark/websearch setting panel hardcoded
 bgcolor - Adjust Colors in settingwindow

---
 Flow.Launcher/Resources/Dark.xaml             |   2 +
 Flow.Launcher/Resources/Light.xaml            |   2 +
 Flow.Launcher/SettingWindow.xaml              |  26 +-
 .../Views/SettingsControl.xaml                | 138 +++++++----
 .../SettingsControl.xaml                      | 229 ++++++++++++------
 5 files changed, 255 insertions(+), 142 deletions(-)

diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 4933dc021..581b1f10e 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -37,6 +37,7 @@
     <SolidColorBrush x:Key="NumberBoxColor25B" Color="#5d5d5d" />
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#ffffff" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
+    <SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
@@ -72,6 +73,7 @@
     <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
     <Color x:Key="NumberBoxColor25">#464646</Color>
     <Color x:Key="NumberBoxColor26">#ffffff</Color>
+    <Color x:Key="HoverStoreGrid">#272727</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 9dd240f4d..4e8abc1bc 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -34,6 +34,7 @@
     <SolidColorBrush x:Key="NumberBoxColor25B" Color="#878787" />
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
+    <SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
@@ -66,6 +67,7 @@
     <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
     <Color x:Key="NumberBoxColor25">#878787</Color>
     <Color x:Key="NumberBoxColor26">#1b1b1b</Color>
+    <Color x:Key="HoverStoreGrid">#f6f6f6</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f846dd057..17b18acb2 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1118,65 +1118,65 @@
                                                                         MaxWidth="100"
                                                                         Margin="10,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource author}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding PluginPair.Metadata.Author}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_init_time}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding InitilizaTime}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_query_time}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding QueryTime}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="| version" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding PluginPair.Metadata.Version}" />
 
                                                                     <TextBlock
@@ -1187,7 +1187,7 @@
                                                                         Cursor="Hand"
                                                                         FontSize="12">
                                                                         <Hyperlink
-                                                                            Foreground="#8F8F8F"
+                                                                            Foreground="{DynamicResource PluginInfoColor}"
                                                                             NavigateUri="{Binding PluginPair.Metadata.Website}"
                                                                             RequestNavigate="OnRequestNavigate">
                                                                             <Run Text="Website" />
@@ -1201,7 +1201,7 @@
                                                                         VerticalAlignment="Center"
                                                                         Cursor="Hand"
                                                                         FontSize="12"
-                                                                        Foreground="#8f8f8f"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         MouseUp="OnPluginDirecotyClick"
                                                                         Text="{DynamicResource pluginDirectory}"
                                                                         TextDecorations="Underline" />
@@ -1412,7 +1412,7 @@
                                                         VerticalAlignment="Stretch"
                                                         Panel.ZIndex="1">
                                                         <Grid.Background>
-                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource Color07}" />
+                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource HoverStoreGrid}" />
                                                         </Grid.Background>
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index abe1f0ad5..59bdf222b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -1,72 +1,106 @@
-<UserControl x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             mc:Ignorable="d"
-             Background="White"
-             d:DesignHeight="300" d:DesignWidth="500"
-             DataContext="{Binding RelativeSource={RelativeSource Self}}">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="80" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <StackPanel>
-            <Grid Grid.Row="0" Margin="30 20 0 0">
+            <Grid Grid.Row="0" Margin="30,20,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="160" />
-                    <ColumnDefinition Width="140"/>
-                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="140" />
+                    <ColumnDefinition Width="100" />
                 </Grid.ColumnDefinitions>
-                <Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
-                       FontSize="15" Margin="10 5 0 0"/>
-                <RadioButton Grid.Column="1" Name="NewWindowBrowser"
-                             IsChecked="{Binding OpenInNewBrowserWindow}"
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"/>
-                <RadioButton Grid.Column="2" Name="NewTabInBrowser"
-                             IsChecked="{Binding OpenInNewTab, Mode=OneTime}"
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"/>
+                <Label
+                    Grid.Column="0"
+                    Margin="10,5,0,0"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
+                    FontSize="15" />
+                <RadioButton
+                    Name="NewWindowBrowser"
+                    Grid.Column="1"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
+                    IsChecked="{Binding OpenInNewBrowserWindow}" />
+                <RadioButton
+                    Name="NewTabInBrowser"
+                    Grid.Column="2"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"
+                    IsChecked="{Binding OpenInNewTab, Mode=OneTime}" />
             </Grid>
         </StackPanel>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
-            <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
-                   Height="28" Margin="10"/>
-            <TextBox x:Name="BrowserPathBox" 
-                     HorizontalAlignment="Left" 
-                     Height="30" 
-                     TextWrapping="NoWrap" 
-                     VerticalAlignment="Center"
-                     Text="{Binding Settings.BrowserPath}"
-                     Width="240"
-                     Margin="10"/>
-            <Button x:Name="ViewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
-                    HorizontalAlignment="Left" Margin="10" Width="100" Height="30" Click="OnChooseClick" FontSize="14" />
+        <StackPanel
+            Grid.Row="1"
+            Height="60"
+            Margin="30,20,0,0"
+            VerticalAlignment="Top"
+            Orientation="Horizontal">
+            <Label
+                Height="28"
+                Margin="10"
+                Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}" />
+            <TextBox
+                x:Name="BrowserPathBox"
+                Width="240"
+                Height="30"
+                Margin="10"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Text="{Binding Settings.BrowserPath}"
+                TextWrapping="NoWrap" />
+            <Button
+                x:Name="ViewButton"
+                Width="100"
+                Height="30"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Click="OnChooseClick"
+                Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
+                FontSize="14" />
         </StackPanel>
-        <StackPanel Grid.Row="2" Orientation="Vertical" Margin="30,20,0,0">
-            <TextBlock Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" Margin="10"/>
-            <ListView Grid.Row="2" ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
-                      SelectedItem="{Binding SelectedCustomBrowser}"
-                      Margin="10"
-                      BorderBrush="DarkGray"
-                      BorderThickness="1"
-                      Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                      Height="auto"
-                      Name="CustomBrowsers"
-                      MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser">
+        <StackPanel
+            Grid.Row="2"
+            Margin="30,20,0,0"
+            Orientation="Vertical">
+            <TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
+            <ListView
+                Name="CustomBrowsers"
+                Grid.Row="2"
+                Height="auto"
+                Margin="10"
+                BorderBrush="DarkGray"
+                BorderThickness="1"
+                ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
+                MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser"
+                SelectedItem="{Binding SelectedCustomBrowser}"
+                Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
                 <ListView.View>
                     <GridView>
-                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}"/>
-                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}"/>
+                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
                     </GridView>
                 </ListView.View>
             </ListView>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" 
-                        Margin="10" Click="NewCustomBrowser" Width="80" />
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" 
-                        Margin="10" Click="DeleteCustomBrowser" Width="80"/>
+                <Button
+                    Width="80"
+                    Margin="10"
+                    Click="NewCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
+                <Button
+                    Width="80"
+                    Margin="10"
+                    Click="DeleteCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 68f5adc3b..2d4da962b 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -1,128 +1,203 @@
-<UserControl x:Class="Flow.Launcher.Plugin.WebSearch.SettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
-             mc:Ignorable="d"
-             Background="White"
-             d:DataContext="{d:DesignInstance vm:SettingsViewModel}"
-             d:DesignHeight="300" d:DesignWidth="500">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.WebSearch.SettingsControl"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
+    d:DataContext="{d:DesignInstance vm:SettingsViewModel}"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    mc:Ignorable="d">
     <UserControl.Resources>
-        <Style TargetType="TextBox" x:Key="BrowserPathBoxStyle">
-            <Setter Property="Height" Value="28"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Style x:Key="BrowserPathBoxStyle" TargetType="TextBox">
+            <Setter Property="Height" Value="28" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
         <DataTemplate x:Key="HeaderTemplateArrowUp">
             <DockPanel>
-                <TextBlock HorizontalAlignment="Center" Text="{Binding}"/>
-                <Path x:Name="arrow"
-           StrokeThickness = "1"            
-           Fill            = "gray"
-           Data            = "M 5,10 L 15,10 L 10,5 L 5,10"/>
+                <TextBlock HorizontalAlignment="Center" Text="{Binding}" />
+                <Path
+                    x:Name="arrow"
+                    Data="M 5,10 L 15,10 L 10,5 L 5,10"
+                    Fill="gray"
+                    StrokeThickness="1" />
             </DockPanel>
         </DataTemplate>
         <DataTemplate x:Key="HeaderTemplateArrowDown">
             <DockPanel>
-                <TextBlock HorizontalAlignment="Center" Text="{Binding }"/>
-                <Path x:Name="arrow"
-              StrokeThickness = "1"            
-              Fill            = "gray"
-              Data            = "M 5,5 L 10,10 L 15,5 L 5,5"/>
+                <TextBlock HorizontalAlignment="Center" Text="{Binding}" />
+                <Path
+                    x:Name="arrow"
+                    Data="M 5,5 L 10,10 L 15,5 L 5,5"
+                    Fill="gray"
+                    StrokeThickness="1" />
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
-    <Grid Margin="14 14 14 0">
+    <Grid Margin="14,14,14,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="48" />
             <RowDefinition Height="40" />
             <RowDefinition />
-            <RowDefinition Height="56"/>
+            <RowDefinition Height="56" />
             <RowDefinition Height="50" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" HorizontalAlignment="Left" Orientation="Horizontal" Margin="14 0 0 0">
-            <Label Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" Margin="0 15 20 0"/>
-            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_window}" Click="OnNewBrowserWindowClick" 
-                         Margin="0 0 20 0"/>
-            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}" Click="OnNewTabClick" />
+        <StackPanel
+            Grid.Row="0"
+            Margin="14,0,0,0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal">
+            <Label Margin="0,15,20,0" Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" />
+            <RadioButton
+                Name="NewWindowBrowser"
+                Margin="0,0,20,0"
+                Click="OnNewBrowserWindowClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_new_window}"
+                GroupName="OpenSearchBehaviour" />
+            <RadioButton
+                Name="NewTabInBrowser"
+                Click="OnNewTabClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}"
+                GroupName="OpenSearchBehaviour" />
         </StackPanel>
-        <StackPanel Grid.Row="1" HorizontalAlignment="Left" Margin="14 3 0 0" Orientation="Horizontal">
-            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 10 0" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="0,0,0,0" TextChanged="OnBrowserPathTextChanged"
-                     Width="250" Style="{StaticResource BrowserPathBoxStyle}"/>
-            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="10,0,0,0"  
-                    Click="OnChooseClick" FontSize="13" Content="{DynamicResource flowlauncher_plugin_websearch_choose}" Width="80"/>
+        <StackPanel
+            Grid.Row="1"
+            Margin="14,3,0,0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal">
+            <Label
+                Margin="0,0,10,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" />
+            <TextBox
+                x:Name="browserPathBox"
+                Width="250"
+                Margin="0,0,0,0"
+                HorizontalAlignment="Left"
+                Style="{StaticResource BrowserPathBoxStyle}"
+                TextChanged="OnBrowserPathTextChanged" />
+            <Button
+                x:Name="viewButton"
+                Width="80"
+                Margin="10,0,0,0"
+                HorizontalAlignment="Left"
+                Click="OnChooseClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_choose}"
+                FontSize="13" />
         </StackPanel>
-        <ListView Margin="0 18 0 0" ItemsSource="{Binding Settings.SearchSources}"
-                  SelectedItem="{Binding Settings.SelectedSearchSource}"
-                  x:Name="SearchSourcesListView"
-                  Grid.Row="2"
-                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                  BorderBrush="DarkGray"
-                  BorderThickness="1"
-                  GridViewColumnHeader.Click="SortByColumn"
-                  MouseDoubleClick="MouseDoubleClickItem">
+        <ListView
+            x:Name="SearchSourcesListView"
+            Grid.Row="2"
+            Margin="0,18,0,0"
+            BorderBrush="DarkGray"
+            BorderThickness="1"
+            GridViewColumnHeader.Click="SortByColumn"
+            ItemsSource="{Binding Settings.SearchSources}"
+            MouseDoubleClick="MouseDoubleClickItem"
+            SelectedItem="{Binding Settings.SelectedSearchSource}"
+            Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
             <ListView.View>
                 <GridView>
                     <GridViewColumn Width="50">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <Image Source="{Binding Path=IconPath}" Width="20" Height="20" Margin="6 0 0 0"/>
+                                <Image
+                                    Width="20"
+                                    Height="20"
+                                    Margin="6,0,0,0"
+                                    Source="{Binding Path=IconPath}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}"
-                                    DisplayMemberBinding="{Binding ActionKeyword}"
-                                    Width="130">
+                    <GridViewColumn
+                        Width="130"
+                        DisplayMemberBinding="{Binding ActionKeyword}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding ActionKeyword}"/>
+                                <TextBlock Text="{Binding ActionKeyword}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_title}"
-                                    DisplayMemberBinding="{Binding Title}" Width="350">
+                    <GridViewColumn
+                        Width="350"
+                        DisplayMemberBinding="{Binding Title}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_title}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Title}"/>
+                                <TextBlock Text="{Binding Title}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_enable}"
-                                    DisplayMemberBinding="{Binding Enabled}"
-                                    Width="80">
+                    <GridViewColumn
+                        Width="80"
+                        DisplayMemberBinding="{Binding Enabled}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_enable}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Enabled}"/>
+                                <TextBlock Text="{Binding Enabled}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
                 </GridView>
             </ListView.View>
         </ListView>
-        <StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
-            <Button Click="OnDeleteSearchSearchClick" Width="100" Margin="10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
-            <Button Click="OnEditSearchSourceClick" Width="100" Margin="10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
-            <Button Click="OnAddSearchSearchClick" Width="100" Margin="10 10 0 10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
+        <StackPanel
+            Grid.Row="3"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                Width="100"
+                Margin="10"
+                Click="OnDeleteSearchSearchClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
+            <Button
+                Width="100"
+                Margin="10"
+                Click="OnEditSearchSourceClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
+            <Button
+                Width="100"
+                Margin="10,10,0,10"
+                Click="OnAddSearchSearchClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
-        <Border BorderThickness="0 1 0 0" Grid.Row="4" Margin="0 0 0 0" BorderBrush="#cecece" HorizontalAlignment="Stretch">
-            <DockPanel HorizontalAlignment="Right" Margin="0 14 0 0">
-                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
-                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" Margin="14 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                    <ComboBox ItemsSource="{Binding Settings.Suggestions}" VerticalAlignment="Center"
-                      SelectedItem="{Binding Settings.SelectedSuggestion}"
-                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="0 0 20 0" FontSize="11" Height="30"/>
-                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" Margin="0 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                    <CheckBox IsChecked="{Binding Settings.EnableSuggestion}"
-                      Margin="0 0 0 0"
-                      Name="EnableSuggestion"/>
+        <Border
+            Grid.Row="4"
+            Margin="0,0,0,0"
+            HorizontalAlignment="Stretch"
+            BorderBrush="#cecece"
+            BorderThickness="0,1,0,0">
+            <DockPanel Margin="0,14,0,0" HorizontalAlignment="Right">
+                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                    <Label
+                        Margin="14,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
+                    <ComboBox
+                        Height="30"
+                        Margin="0,0,20,0"
+                        VerticalAlignment="Center"
+                        FontSize="11"
+                        IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}"
+                        ItemsSource="{Binding Settings.Suggestions}"
+                        SelectedItem="{Binding Settings.SelectedSuggestion}" />
+                    <Label
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" />
+                    <CheckBox
+                        Name="EnableSuggestion"
+                        Margin="0,0,0,0"
+                        IsChecked="{Binding Settings.EnableSuggestion}" />
                 </StackPanel>
-                <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
-        </DockPanel>
+                <!--  Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working  -->
+            </DockPanel>
         </Border>
     </Grid>
 </UserControl>
\ No newline at end of file

From 1b7c9d30613a839a95346c3e0125e0cd3571b97d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 16:43:12 +0900
Subject: [PATCH 040/107] Add Darkmode item in setting window Darkmode
 Actionkewords popup

---
 Flow.Launcher/ActionKeywords.xaml  | 189 ++++++++++++++++++-----------
 Flow.Launcher/Languages/en.xaml    |   4 +
 Flow.Launcher/Resources/Dark.xaml  |   4 +
 Flow.Launcher/Resources/Light.xaml |   1 +
 Flow.Launcher/SettingWindow.xaml   |  27 ++++-
 5 files changed, 152 insertions(+), 73 deletions(-)

diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 32892768d..3d0e00459 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -1,85 +1,136 @@
-<Window x:Class="Flow.Launcher.ActionKeywords"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="{DynamicResource actionKeywordsTitle}"
-        Icon="Images\app.png"
-        ResizeMode="NoResize"
-        Loaded="ActionKeyword_OnLoaded"
-        WindowStartupLocation="CenterScreen"
-        Height="365" Width="450" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.ActionKeywords"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="{DynamicResource actionKeywordsTitle}"
+    Width="450"
+    Height="345"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    Icon="Images\app.png"
+    Loaded="ActionKeyword_OnLoaded"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
-            <Grid>
+        <Grid>
+            <StackPanel Grid.Row="0">
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource actionKeywordsTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button
+                            Grid.Column="4"
+                            Click="BtnCancel_OnClick"
+                            Style="{StaticResource TitleBarCloseButtonStyle}">
+                            <Path
+                                Width="46"
+                                Height="32"
+                                Data="M 18,11 27,20 M 18,20 27,11"
+                                Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                                StrokeThickness="1">
+                                <Path.Style>
+                                    <Style TargetType="Path">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                                <Setter Property="Opacity" Value="0.5" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Path.Style>
+                            </Path>
+                        </Button>
+                    </Grid>
+                </StackPanel>
+                <StackPanel Margin="26,12,26,0">
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource actionKeywordsTitle}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                        <TextBlock 
-                           Text="{DynamicResource actionkeyword_tips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                        <TextBlock
+                            FontSize="14"
+                            Text="{DynamicResource actionkeyword_tips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 18 0 0">
-                        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
-                        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="14 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold"/>
+                    <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource currentActionKeywords}" />
+                        <TextBlock
+                            x:Name="tbOldActionKeyword"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="14,10,10,10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
-
-                        <TextBox x:Name="tbAction" Margin="10 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
-
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource newActionKeyword}" />
+                        <TextBox
+                            x:Name="tbAction"
+                            Width="105"
+                            Margin="10,10,15,10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center" />
                     </StackPanel>
                 </StackPanel>
-            </Grid>
+            </StackPanel>
+        </Grid>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="10,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,10,0"
+                    Click="btnDone_OnClick">
+                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+                </Button>
+            </StackPanel>
         </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="30"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="5 0 10 0" Width="100" Height="30" Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
-        </StackPanel>
     </Grid>
-    <!--
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="60"/>
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
-        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" />
-        
-        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="170 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
-        </StackPanel>
-
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
-                   Text="{DynamicResource actionkeyword_tips}" />
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
-        </StackPanel>
-    </Grid>
-        -->
 </Window>
\ No newline at end of file
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index b8f214538..fe1c5dd91 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -83,6 +83,10 @@
     <system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
+    <system:String x:Key="DarkMode">Dark Mode</system:String>
+    <system:String x:Key="DarkModeDefault">System Default</system:String>
+    <system:String x:Key="DarkModeLight">Light</system:String>
+    <system:String x:Key="DarkModeDark">Dark</system:String>
 
     <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 581b1f10e..388f329d0 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -39,6 +39,10 @@
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
     <SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
 
+    <SolidColorBrush x:Key="BasicLabelColor" Color="#ffffff" />
+    <SolidColorBrush x:Key="BasicSeparatorColor" Color="#cecece" />
+    <SolidColorBrush x:Key="BasicLineColor" Color="#cecece" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 4e8abc1bc..864cd01ce 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -35,6 +35,7 @@
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
     <SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
+    <SolidColorBrush x:Key="BasicLabelColor" Color="#1b1b1b" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f6e1f95f1..28707d212 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1354,9 +1354,9 @@
                                                         Height="32"
                                                         Margin="8,0,6,0"
                                                         VerticalAlignment="Center"
-                                                    RenderOptions.BitmapScalingMode="HighQuality"
-                                                    Source="{Binding IcoPath, IsAsync=True}"
-                                                    Stretch="Uniform" />
+                                                        RenderOptions.BitmapScalingMode="HighQuality"
+                                                        Source="{Binding IcoPath, IsAsync=True}"
+                                                        Stretch="Uniform" />
                                                 </StackPanel>
                                                 <StackPanel
                                                     Grid.Column="1"
@@ -1862,7 +1862,26 @@
                                     </Border>
 
                                     <StackPanel>
-                                        <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
+                                        <Border Margin="0,12,0,12" Style="{DynamicResource SettingGroupBox}">
+                                            <ItemsControl Style="{StaticResource SettingGrid}">
+                                                <StackPanel Style="{StaticResource TextPanel}">
+                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource DarkMode}" />
+                                                </StackPanel>
+                                                <ComboBox
+                                                    Grid.Column="2"
+                                                    MaxWidth="200"
+                                                    Margin="10,0,18,0"
+                                                    DisplayMemberPath="Display"
+                                                    ItemsSource="{Binding LastQueryModes}"
+                                                    SelectedValue="{Binding Settings.LastQueryMode}"
+                                                    SelectedValuePath="Value" />
+                                                <TextBlock Style="{StaticResource Glyph}">
+                                                    &#xe708;
+                                                </TextBlock>
+                                            </ItemsControl>
+                                        </Border>
+
+                                        <Border Margin="0,0,0,18" Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />

From ef71f6dee27b5b441487562ac457871a79e2bbcc Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 16:59:09 +0900
Subject: [PATCH 041/107] Fix Plugin List Color in Light Mode

---
 Flow.Launcher/SettingWindow.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 28707d212..b32ba36e8 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -244,7 +244,7 @@
         </Style>
 
         <Style x:Key="PluginList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="{StaticResource Color02B}" />
+            <Setter Property="Background" Value="{StaticResource Color00B}" />
             <Setter Property="Padding" Value="0,12,0,12" />
             <Setter Property="Margin" Value="0,0,18,5" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -284,7 +284,7 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color00B}" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
@@ -295,7 +295,7 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color00B}" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />

From ae7de8db0932ee71b0506cca74479dd371ccde3a Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 17 Nov 2021 21:00:36 +1100
Subject: [PATCH 042/107] refactor to use ShellCommand

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs |  2 ++
 .../SharedCommands/ShellCommand.cs            | 28 +++++++++++++++++--
 Flow.Launcher/PublicAPIInstance.cs            | 12 +++-----
 Plugins/Flow.Launcher.Plugin.Shell/Main.cs    |  2 +-
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs      |  4 +--
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 3cadae176..7d4741630 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -33,6 +33,8 @@ namespace Flow.Launcher.Plugin
         /// Run a shell command or external program
         /// </summary>
         /// <param name="cmd">The command or program to run</param>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
         void ShellRun(string cmd);
 
         /// <summary>
diff --git a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
index c5d43a3d9..a2eea19a7 100644
--- a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
+++ b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -60,17 +60,39 @@ namespace Flow.Launcher.Plugin.SharedCommands
             return sb.ToString();
         }
 
-        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "")
+        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "", bool createNoWindow = false)
         {
             var info = new ProcessStartInfo
             {
                 FileName = fileName,
                 WorkingDirectory = workingDirectory,
                 Arguments = arguments,
-                Verb = verb
+                Verb = verb,
+                CreateNoWindow = createNoWindow
             };
 
             return info;
         }
+
+        /// <summary>
+        /// Runs a windows command using the provided ProcessStartInfo
+        /// </summary>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
+        public static void Execute(ProcessStartInfo info)
+        {
+            Execute(Process.Start, info);
+        }
+
+        /// <summary>
+        /// Runs a windows command using the provided ProcessStartInfo using a custom execute command function
+        /// </summary>
+        /// <param name="Func startProcess">allows you to pass in a custom command execution function</param>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
+        public static void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartInfo info)
+        {
+            startProcess(info);
+        }
     }
 }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index c528b8229..6ca14c215 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -14,6 +14,7 @@ using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
 using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher.Plugin.SharedCommands;
 using System.Threading;
 using System.IO;
 using Flow.Launcher.Infrastructure.Http;
@@ -102,15 +103,10 @@ namespace Flow.Launcher
                 SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);
             });
         }
-
         public void ShellRun(string cmd)
         {
-            System.Diagnostics.Process process = new();
-            var startInfo = process.StartInfo;
-            startInfo.FileName = "cmd.exe";
-            startInfo.Arguments = $"/C {cmd}";
-            startInfo.CreateNoWindow = true;
-            process.Start();
+            var startInfo = ShellCommand.SetProcessStartInfo("cmd.exe", arguments: $"/C {cmd}", createNoWindow: true);
+            ShellCommand.Execute(startInfo);
         }
 
         public void StartLoadingBar() => _mainVM.ProgressBarVisibility = Visibility.Visible;
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 0a934ab32..c6b4999e1 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -251,7 +251,7 @@ namespace Flow.Launcher.Plugin.Shell
         {
             try
             {
-                startProcess(info);
+                ShellCommand.Execute(startProcess, info);
             }
             catch (FileNotFoundException e)
             {
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 282c8a25d..fcf2df4a5 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -190,8 +190,8 @@ namespace Flow.Launcher.Plugin.Sys
                         var info = ShellCommand.SetProcessStartInfo("shutdown", arguments:"/h");
                         info.WindowStyle = ProcessWindowStyle.Hidden;
                         info.UseShellExecute = true;
-                        
-                        Process.Start(info);
+
+                        ShellCommand.Execute(info);
                         
                         return true;
                     }

From 02d101a30b520c8d2ab2b26b6b347b72e6339c87 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 17 Nov 2021 21:04:00 +1100
Subject: [PATCH 043/107] fix formatting

---
 Flow.Launcher/PublicAPIInstance.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 1d0136c6f..360529ea9 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -106,6 +106,7 @@ namespace Flow.Launcher
                 SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);
             });
         }
+
         public void ShellRun(string cmd)
         {
             var startInfo = ShellCommand.SetProcessStartInfo("cmd.exe", arguments: $"/C {cmd}", createNoWindow: true);

From 3e38a9035cca56eef9e23bda088bba4b56dfd9b6 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 17 Nov 2021 21:07:44 +1100
Subject: [PATCH 044/107] version bump plugins

---
 Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +-
 Plugins/Flow.Launcher.Plugin.Sys/plugin.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
index 6b20eeef9..b71dba2da 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.5",
+  "Version": "1.4.6",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
index 42e8058e5..1a8f008c3 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
@@ -4,7 +4,7 @@
   "Name": "System Commands",
   "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
   "Author": "qianlifeng",
-  "Version": "1.5.0",
+  "Version": "1.5.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",

From ef56d91c2ff117fd19b0e2cc06b749d0b431632b Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Thu, 18 Nov 2021 05:56:51 +1100
Subject: [PATCH 045/107] add filename param to ShellRun command for running
 other shell types

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 2 +-
 Flow.Launcher/PublicAPIInstance.cs            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index a5602ac13..0897de8a4 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -35,7 +35,7 @@ namespace Flow.Launcher.Plugin
         /// <param name="cmd">The command or program to run</param>
         /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
         /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
-        void ShellRun(string cmd);
+        void ShellRun(string cmd, string filename = "cmd.exe");
 
         /// <summary>
         /// Save everything, all of Flow Launcher and plugins' data and settings
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 360529ea9..eda173ee1 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -107,9 +107,9 @@ namespace Flow.Launcher
             });
         }
 
-        public void ShellRun(string cmd)
+        public void ShellRun(string cmd, string filename = "cmd.exe")
         {
-            var startInfo = ShellCommand.SetProcessStartInfo("cmd.exe", arguments: $"/C {cmd}", createNoWindow: true);
+            var startInfo = ShellCommand.SetProcessStartInfo(filename, arguments: $"/C {cmd}", createNoWindow: true);
             ShellCommand.Execute(startInfo);
         }
 

From 8cf93907e98e330d7e8e165bcc887888f2c98cb7 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Thu, 18 Nov 2021 05:59:37 +1100
Subject: [PATCH 046/107] update comment

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 0897de8a4..908284bb9 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -30,9 +30,10 @@ namespace Flow.Launcher.Plugin
         void RestartApp();
 
         /// <summary>
-        /// Run a shell command or external program
+        /// Run a shell command
         /// </summary>
         /// <param name="cmd">The command or program to run</param>
+        /// <param name="filename">the shell type to run, e.g. powershell.exe</param>
         /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
         /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
         void ShellRun(string cmd, string filename = "cmd.exe");

From a7ef5895b700cc4c6e60fac7780309bc12660b2b Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Thu, 18 Nov 2021 06:15:38 +1100
Subject: [PATCH 047/107] update StartInfo arguments if cmd shell type

---
 Flow.Launcher/PublicAPIInstance.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index eda173ee1..d0dc54874 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -109,7 +109,9 @@ namespace Flow.Launcher
 
         public void ShellRun(string cmd, string filename = "cmd.exe")
         {
-            var startInfo = ShellCommand.SetProcessStartInfo(filename, arguments: $"/C {cmd}", createNoWindow: true);
+            var args = filename == "cmd.exe" ? $"/C {cmd}" : $"{cmd}";
+
+            var startInfo = ShellCommand.SetProcessStartInfo(filename, arguments: args, createNoWindow: true);
             ShellCommand.Execute(startInfo);
         }
 

From a301d8efabdf72c5f786344aa4098be6cb070501 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 18 Nov 2021 11:06:00 +0900
Subject: [PATCH 048/107] Adjust Position Update Timing

---
 Flow.Launcher/MainWindow.xaml.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 46a842445..75c6b2a2b 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -268,6 +268,8 @@ namespace Flow.Launcher
                 sb.Children.Add(da);
                 sb.Children.Add(da2);
                 sb.Completed += (_, _) => _animating = false;
+                _settings.WindowLeft = Left;
+                _settings.WindowTop = Top;
                 sb.Begin(FlowMainWindow);
             }
         }
@@ -336,8 +338,7 @@ namespace Flow.Launcher
             {
                 Left = WindowLeft();
                 Top = WindowTop();
-                _settings.WindowLeft = Left;
-                _settings.WindowTop = Top;
+
             }
         }
 
@@ -355,19 +356,13 @@ namespace Flow.Launcher
 
         public void HideStartup()
         {
+            UpdatePosition();
             if (_settings.HideOnStartup)
             {
                 _viewModel.Hide();
             }
             else
             {
-                if (!_settings.HideOnStartup && _settings.WindowLeft == 0 && _settings.WindowTop == 0) /* First Launch */
-                {
-                    Left = WindowLeft();
-                    Top = WindowTop();
-                    _settings.WindowLeft = Left;
-                    _settings.WindowTop = Top;
-                }
                 _viewModel.Show();
             }
 

From 092b4593f8a30106043200fe929614f006f7f11d Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Thu, 18 Nov 2021 10:35:45 -0500
Subject: [PATCH 049/107] Detect URL and install

---
 .../PluginsManager.cs                         | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index cd1ab4571..d87a015a9 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -302,6 +302,37 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 .ToList();
         }
 
+        internal List<Result> InstallFromWeb(string url)
+        {
+            var fileName = url.Split("/").Last();
+            var filePath = Path.Combine(DataLocation.PluginsDirectory, fileName);
+            var plugin = new UserPlugin
+            {
+                ID = "",
+                Name = fileName.Split(".").First(),
+                Author = "N/A",
+                UrlDownload = url
+            };
+            var result = new Result
+            {
+                Title = $"{url}",
+                SubTitle = $"Download and Install from URL",
+                Action = e =>
+                {
+                    if (e.SpecialKeyState.CtrlPressed)
+                    {
+                        SearchWeb.NewTabInBrowser(url);
+                        return ShouldHideWindow;
+                    }
+
+                    Application.Current.MainWindow.Hide();
+                    _ = InstallOrUpdate(plugin);
+                    return ShouldHideWindow;
+                }
+            };
+            return new List<Result> { result };
+        }
+        
         internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName, CancellationToken token)
         {
             if (!PluginsManifest.UserPlugins.Any())
@@ -337,6 +368,10 @@ namespace Flow.Launcher.Plugin.PluginsManager
                             ContextData = x
                         });
 
+            if (Uri.IsWellFormedUriString(searchNameWithoutKeyword, UriKind.Absolute))
+            {
+                return InstallFromWeb(searchNameWithoutKeyword);
+            }
             return Search(results, searchNameWithoutKeyword);
         }
 
@@ -372,8 +407,8 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_install_errormetadatafile"));
                 return;
             }
-
-            string newPluginPath = Path.Combine(DataLocation.PluginsDirectory, $"{plugin.Name}-{plugin.Version}");
+            var directory = String.IsNullOrEmpty(plugin.Version) ? $"{plugin.Name}" : $"{plugin.Name}-{plugin.Version}";
+            string newPluginPath = Path.Combine(DataLocation.PluginsDirectory, directory);
 
             FilesFolders.CopyAll(pluginFolderPath, newPluginPath);
 
@@ -467,4 +502,4 @@ namespace Flow.Launcher.Plugin.PluginsManager
             return new List<Result>();
         }
     }
-}
\ No newline at end of file
+}

From 8c50d13aa5ab5da540a9903f7c0ba2e324313505 Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Thu, 18 Nov 2021 11:40:06 -0500
Subject: [PATCH 050/107] Use correct icon

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index d87a015a9..644309c1e 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -317,6 +317,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             {
                 Title = $"{url}",
                 SubTitle = $"Download and Install from URL",
+                IcoPath = icoPath,
                 Action = e =>
                 {
                     if (e.SpecialKeyState.CtrlPressed)

From cf056a92c04db5d310a2a83d3227aae333786d9e Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Thu, 18 Nov 2021 11:47:21 -0500
Subject: [PATCH 051/107] Filename as title for result

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 644309c1e..fe434c4e4 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -315,7 +315,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             };
             var result = new Result
             {
-                Title = $"{url}",
+                Title = fileName,
                 SubTitle = $"Download and Install from URL",
                 IcoPath = icoPath,
                 Action = e =>

From eaf0649d971999b8e146f6572004c786da6c737b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 19 Nov 2021 09:17:48 +0900
Subject: [PATCH 052/107] Add Delay to Opacity when Main Window Deactive

---
 Flow.Launcher/Helper/SingletonWindowOpener.cs | 1 -
 Flow.Launcher/MainWindow.xaml.cs              | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Helper/SingletonWindowOpener.cs b/Flow.Launcher/Helper/SingletonWindowOpener.cs
index fdfaaa4fc..8efc9be99 100644
--- a/Flow.Launcher/Helper/SingletonWindowOpener.cs
+++ b/Flow.Launcher/Helper/SingletonWindowOpener.cs
@@ -10,7 +10,6 @@ namespace Flow.Launcher.Helper
         {
             var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.GetType() == typeof(T))
                          ?? (T)Activator.CreateInstance(typeof(T), args);
-            Application.Current.MainWindow.Hide();
             
             // Fix UI bug
             // Add `window.WindowState = WindowState.Normal`
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 75c6b2a2b..46db842df 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -315,9 +315,10 @@ namespace Flow.Launcher
         }
 
 
-        private void OnDeactivated(object sender, EventArgs e)
+        private async void OnDeactivated(object sender, EventArgs e)
         {
             _viewModel.Save();
+            await Task.Delay(100);
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();

From 45250437fdf77983881228d2493f97e977888519 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 19 Nov 2021 11:12:22 +0900
Subject: [PATCH 053/107] Change Icon uniform property from uniformtofill (Fix
 wide icon cut)

---
 Flow.Launcher/ResultListBox.xaml | 172 ++++++++++++++++++++-----------
 1 file changed, 112 insertions(+), 60 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index d52474d3f..c674e9a70 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -1,25 +1,32 @@
-<ListBox x:Class="Flow.Launcher.ResultListBox"
-         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-         xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-         xmlns:converter="clr-namespace:Flow.Launcher.Converters"
-         mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
-         d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
-         MaxHeight="{Binding MaxHeight}"
-         SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-         SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-         HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}"
-         Margin="{Binding Margin}"
-         Visibility="{Binding Visbility}"
-         Style="{DynamicResource BaseListboxStyle}" Focusable="False"
-         KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
-         VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard"
-         SelectionChanged="OnSelectionChanged"
-         IsSynchronizedWithCurrentItem="True"
-         PreviewMouseDown="ListBox_PreviewMouseDown">
-    <!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083-->
+<ListBox
+    x:Class="Flow.Launcher.ResultListBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converter="clr-namespace:Flow.Launcher.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
+    MaxHeight="{Binding MaxHeight}"
+    Margin="{Binding Margin}"
+    HorizontalContentAlignment="Stretch"
+    d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
+    d:DesignHeight="100"
+    d:DesignWidth="100"
+    Focusable="False"
+    IsSynchronizedWithCurrentItem="True"
+    ItemsSource="{Binding Results}"
+    KeyboardNavigation.DirectionalNavigation="Cycle"
+    PreviewMouseDown="ListBox_PreviewMouseDown"
+    SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+    SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+    SelectionChanged="OnSelectionChanged"
+    SelectionMode="Single"
+    Style="{DynamicResource BaseListboxStyle}"
+    VirtualizingStackPanel.IsVirtualizing="True"
+    VirtualizingStackPanel.VirtualizationMode="Standard"
+    Visibility="{Binding Visbility}"
+    mc:Ignorable="d">
+    <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
     <ListBox.ItemTemplate>
         <DataTemplate>
@@ -30,46 +37,88 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0"
-                          Cursor="Hand" UseLayoutRounding="False">
+                    <Grid
+                        Margin="0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Stretch"
+                        Cursor="Hand"
+                        UseLayoutRounding="False">
                         <Grid.Resources>
-                            <converter:HighlightTextConverter x:Key="HighlightTextConverter"/>
+                            <converter:HighlightTextConverter x:Key="HighlightTextConverter" />
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="60" />
-                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Visibility="{Binding ShowOpenResultHotkey}" Grid.Column="2" Margin="0 0 10 0">
-                            <TextBlock Margin="12 0 12 0" Style="{DynamicResource ItemHotkeyStyle}" HorizontalAlignment="Right" Opacity="0.8" VerticalAlignment="Center" Padding="0 10 0 10" x:Name="Hotkey">
+                        <StackPanel
+                            Grid.Column="2"
+                            Margin="0,0,10,0"
+                            Visibility="{Binding ShowOpenResultHotkey}">
+                            <TextBlock
+                                x:Name="Hotkey"
+                                Margin="12,0,12,0"
+                                Padding="0,10,0,10"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Opacity="0.8"
+                                Style="{DynamicResource ItemHotkeyStyle}">
                                 <TextBlock.Visibility>
-                                    <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" />
+                                    <Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                 </TextBlock.Visibility>
                                 <TextBlock.Text>
                                     <MultiBinding StringFormat="{}{0}+{1}">
                                         <Binding Path="OpenResultModifiers" />
-                                        <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OrdinalConverter}" />
+                                        <Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                     </MultiBinding>
                                 </TextBlock.Text>
                             </TextBlock>
                         </StackPanel>
-                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="9 0 0 0">
-                            <Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Center" Source="{Binding Image}" Visibility="{Binding ShowIcon}"  Margin="0 0 0 0" Stretch="UniformToFill"/>
+                        <Border
+                            Margin="9,0,0,0"
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                            <Image
+                                x:Name="ImageIcon"
+                                Width="32"
+                                Height="32"
+                                Margin="0,0,0,0"
+                                HorizontalAlignment="Center"
+                                Source="{Binding Image}"
+                                Stretch="Uniform"
+                                Visibility="{Binding ShowIcon}" />
                         </Border>
-                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="9 0 0 0">
-                            <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Glyph.Glyph}" FontFamily="{Binding Glyph.FontFamily}" Visibility="{Binding ShowGlyph}" Style="{DynamicResource ItemGlyph}"/>
+                        <Border
+                            Margin="9,0,0,0"
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontFamily="{Binding Glyph.FontFamily}"
+                                Style="{DynamicResource ItemGlyph}"
+                                Text="{Binding Glyph.Glyph}"
+                                Visibility="{Binding ShowGlyph}" />
                         </Border>
-                        <Grid Margin="6 0 10 0" Grid.Column="1" HorizontalAlignment="Stretch">
+                        <Grid
+                            Grid.Column="1"
+                            Margin="6,0,10,0"
+                            HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition />
-                                <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
+                                <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
 
-                            <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
-                                       VerticalAlignment="Center" ToolTip="{Binding ShowTitleToolTip}" x:Name="Title"
-                                       Text="{Binding Result.Title}">
+                            <TextBlock
+                                x:Name="Title"
+                                VerticalAlignment="Center"
+                                DockPanel.Dock="Left"
+                                Style="{DynamicResource ItemTitleStyle}"
+                                Text="{Binding Result.Title}"
+                                ToolTip="{Binding ShowTitleToolTip}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.Title" />
@@ -77,8 +126,13 @@
                                     </MultiBinding>
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding ShowSubTitleToolTip}"
-                                       Grid.Row="1" x:Name="SubTitle" Text="{Binding Result.SubTitle}" MinWidth="750">
+                            <TextBlock
+                                x:Name="SubTitle"
+                                Grid.Row="1"
+                                MinWidth="750"
+                                Style="{DynamicResource ItemSubTitleStyle}"
+                                Text="{Binding Result.SubTitle}"
+                                ToolTip="{Binding ShowSubTitleToolTip}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.SubTitle" />
@@ -92,11 +146,9 @@
                     </Grid>
                 </Button.Content>
             </Button>
-            <!-- a result item height is 52 including margin -->
+            <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
-                <DataTrigger
-                    Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                    Value="True">
+                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
                     <Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
                     <Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
                     <Setter TargetName="Hotkey" Property="Style" Value="{DynamicResource ItemHotkeySelectedStyle}" />
@@ -105,7 +157,7 @@
             </DataTemplate.Triggers>
         </DataTemplate>
     </ListBox.ItemTemplate>
-    <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
+    <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
@@ -117,23 +169,23 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                SnapsToDevicePixels="True">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border
+                            x:Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Bd" Property="Background"
-                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                <Setter TargetName="Bd" Property="BorderBrush"
-                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource ItemSelectedBackgroundColor}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>

From e500b3517d1993b391f88577de6c1cafdae4e7aa Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Fri, 19 Nov 2021 14:24:28 +0900
Subject: [PATCH 054/107] Apply suggestions from code review

Co-authored-by: Jeremy Wu <jeremy24wu@gmail.com>
---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 1 -
 Flow.Launcher/Flow.Launcher.csproj                    | 1 -
 Flow.Launcher/MainWindow.xaml.cs                      | 8 +++-----
 Flow.Launcher/SettingWindow.xaml.cs                   | 1 -
 Flow.Launcher/ViewModel/MainViewModel.cs              | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 89d2d32aa..0816d7626 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -85,7 +85,6 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public bool UseAnimation { get; set; } = true;
         public bool UseSound { get; set; } = true;
 
-
         /// <summary>
         /// when false Alphabet static service will always return empty results
         /// </summary>
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 1f24b325f..f431504c2 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -77,7 +77,6 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Remove="Resources\open.wav" />
     <Content Include="Resources\Segoe Fluent Icons.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 46db842df..82afdc2b2 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -274,7 +274,6 @@ namespace Flow.Launcher
             }
         }
 
-
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ChangedButton == MouseButton.Left) DragMove();
@@ -318,7 +317,9 @@ namespace Flow.Launcher
         private async void OnDeactivated(object sender, EventArgs e)
         {
             _viewModel.Save();
-            await Task.Delay(100);
+            // need time to initialize the main query window animation
+            if (_settings.UseAnimation)
+                await Task.Delay(100);
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();
@@ -339,11 +340,9 @@ namespace Flow.Launcher
             {
                 Left = WindowLeft();
                 Top = WindowTop();
-
             }
         }
 
-
         private void OnLocationChanged(object sender, EventArgs e)
         {
             if (_animating)
@@ -366,7 +365,6 @@ namespace Flow.Launcher
             {
                 _viewModel.Show();
             }
-
         }
 
         public double WindowLeft()
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 88d4f2895..6d280ea3e 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -44,7 +44,6 @@ namespace Flow.Launcher
             HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
             HwndTarget hwndTarget = hwndSource.CompositionTarget;
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
-
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 9870053c2..aa0efdca6 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -758,9 +758,9 @@ namespace Flow.Launcher.ViewModel
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
+
             WinToggleStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
-
         }
 
         #endregion

From 7a0ef5c68adc54bc7e14742eda67fdedd23c2c81 Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Fri, 19 Nov 2021 14:25:19 +0900
Subject: [PATCH 055/107] Update Flow.Launcher/Languages/en.xaml

Co-authored-by: Jeremy Wu <jeremy24wu@gmail.com>
---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d9775d8b1..a2d5900a9 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -84,7 +84,7 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="SoundEffect">Sound Effect</system:String>
-    <system:String x:Key="SoundEffectTip">Play a small sound when window open</system:String>
+    <system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
     <system:String x:Key="Animation">Animation</system:String>
     <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
 

From 8f1a9bfa944e03cf6183b4428d6eddb04ec3a32e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 19 Nov 2021 19:34:49 +0900
Subject: [PATCH 056/107] Remove Save in OnDeactivated

---
 Flow.Launcher/MainWindow.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 82afdc2b2..7ecafbf76 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -316,7 +316,6 @@ namespace Flow.Launcher
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
-            _viewModel.Save();
             // need time to initialize the main query window animation
             if (_settings.UseAnimation)
                 await Task.Delay(100);

From 2e2d2591d75c137ce3ab47161db1c4bc591144fb Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Fri, 19 Nov 2021 10:59:32 -0500
Subject: [PATCH 057/107] Block install if manual install exists

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index fe434c4e4..0ebbc2fdb 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -104,7 +104,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         internal async Task InstallOrUpdate(UserPlugin plugin)
         {
-            if (PluginExists(plugin.ID))
+            if (PluginExists(plugin.ID) || Directory.Exists(Path.Combine(DataLocation.PluginsDirectory, plugin.Name)))
             {
                 if (Context.API.GetAllPlugins()
                     .Any(x => x.Metadata.ID == plugin.ID && x.Metadata.Version.CompareTo(plugin.Version) < 0))

From 99405395ec418043fd76d73acf5838a8767c7de0 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 20 Nov 2021 18:47:10 +1100
Subject: [PATCH 058/107] add plugin installation notifications

---
 .../Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml | 4 +++-
 .../Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index c36a1dcaa..ba08dc3c5 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -10,6 +10,8 @@
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress... Please wait</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Install failed: unable to find the plugin.json metadata file from the new plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_title">Error installing plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_subtitle">Error occured while trying to install {0}</system:String>
@@ -36,6 +38,6 @@
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_newissue_title">Suggest an enhancement or submit an issue</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_newissue_subtitle">Suggest an enhancement or submit an issue to the plugin developer</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_title">Go to Flow's plugins repository</system:String>
-    <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle">Visit the PluginsManifest repository to see comunity-made plugin submissions</system:String>
+    <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle">Visit the PluginsManifest repository to see community-made plugin submissions</system:String>
     
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 0ebbc2fdb..419cae00f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -47,7 +47,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         private Task _downloadManifestTask = Task.CompletedTask;
 
-
         internal Task UpdateManifestAsync()
         {
             if (_downloadManifestTask.Status == TaskStatus.Running)
@@ -150,7 +149,11 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
                     Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
 
+                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_install_title"),
+                    Context.API.GetTranslation("plugin_pluginsmanager_install_in_progress"));
+
                 Install(plugin, filePath);
+
             }
             catch (Exception e)
             {
@@ -163,6 +166,9 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 return;
             }
 
+            Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_install_title"),
+                    Context.API.GetTranslation("plugin_pluginsmanager_install_success_restart"));
+
             Context.API.RestartApp();
         }
 

From 73c1031e0f950c4c2c743560aa77e49ae12023c6 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 20 Nov 2021 20:01:57 +1100
Subject: [PATCH 059/107] append new guid as zip and file name, update error
 messaging

---
 .../Languages/en.xaml                         |  4 +--
 .../PluginsManager.cs                         | 25 +++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index ba08dc3c5..0c0e8ea33 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -10,9 +10,9 @@
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
-    <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress... Please wait</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress. Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
-    <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Install failed: unable to find the plugin.json metadata file from the new plugin</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_title">Error installing plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_subtitle">Error occured while trying to install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_noresult_title">No update available</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 419cae00f..546b31111 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -103,7 +103,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         internal async Task InstallOrUpdate(UserPlugin plugin)
         {
-            if (PluginExists(plugin.ID) || Directory.Exists(Path.Combine(DataLocation.PluginsDirectory, plugin.Name)))
+            if (PluginExists(plugin.ID))
             {
                 if (Context.API.GetAllPlugins()
                     .Any(x => x.Metadata.ID == plugin.ID && x.Metadata.Version.CompareTo(plugin.Version) < 0))
@@ -137,7 +137,12 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 MessageBoxButton.YesNo) == MessageBoxResult.No)
                 return;
 
-            var filePath = Path.Combine(DataLocation.PluginsDirectory, $"{plugin.Name}-{plugin.Version}.zip");
+            // at minimum should provide a name, but handle plugin that is not downloaded from plugins manifest and is a url download
+            var downloadFilename = string.IsNullOrEmpty(plugin.Version)
+                                    ? $"{plugin.Name}-{Guid.NewGuid()}.zip" 
+                                    : $"{plugin.Name}-{plugin.Version}.zip";
+
+            var filePath = Path.Combine(DataLocation.PluginsDirectory, downloadFilename);
 
             try
             {
@@ -153,11 +158,10 @@ namespace Flow.Launcher.Plugin.PluginsManager
                     Context.API.GetTranslation("plugin_pluginsmanager_install_in_progress"));
 
                 Install(plugin, filePath);
-
             }
             catch (Exception e)
             {
-                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
+                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
                         plugin.Name));
 
@@ -316,6 +320,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             {
                 ID = "",
                 Name = fileName.Split(".").First(),
+                Version = string.Empty,
                 Author = "N/A",
                 UrlDownload = url
             };
@@ -411,11 +416,15 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             if (string.IsNullOrEmpty(metadataJsonFilePath) || string.IsNullOrEmpty(pluginFolderPath))
             {
-                MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_install_errormetadatafile"));
-                return;
+                MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_install_errormetadatafile"),
+                Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"));
+                               
+                throw new FileNotFoundException (
+                    string.Format("Unable to find plugin.json from the extracted zip file, or this path {0} does not exist", pluginFolderPath));
             }
-            var directory = String.IsNullOrEmpty(plugin.Version) ? $"{plugin.Name}" : $"{plugin.Name}-{plugin.Version}";
-            string newPluginPath = Path.Combine(DataLocation.PluginsDirectory, directory);
+
+            var directory = string.IsNullOrEmpty(plugin.Version) ? $"{plugin.Name}-{Guid.NewGuid()}" : $"{plugin.Name}-{plugin.Version}";
+            var newPluginPath = Path.Combine(DataLocation.PluginsDirectory, directory);
 
             FilesFolders.CopyAll(pluginFolderPath, newPluginPath);
 

From 3c78802eaec9858dd70aa265eb64a0dee09a1f43 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 20 Nov 2021 18:40:21 +0900
Subject: [PATCH 060/107] - move sound play code to animator from show -
 Adjusting the delay time. - Delete unused code. - Process so that there is no
 delay when the animation settings are turned off. (Exclude erasing queries.)

---
 Flow.Launcher/MainWindow.xaml.cs         | 12 +++++--
 Flow.Launcher/ViewModel/MainViewModel.cs | 45 ++++++------------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 7ecafbf76..cbd9460de 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
+using System.Windows.Media;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using Flow.Launcher.Core.Plugin;
@@ -243,7 +244,6 @@ namespace Flow.Launcher
             { 
                 if (_animating)
                     return;
-                
                 _animating = true;
                 UpdatePosition();
                 Storyboard sb = new Storyboard();
@@ -272,6 +272,12 @@ namespace Flow.Launcher
                 _settings.WindowTop = Top;
                 sb.Begin(FlowMainWindow);
             }
+            if (_settings.UseSound)
+            {
+                MediaPlayer media = new MediaPlayer();
+                media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+                media.Play();
+            }
         }
 
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
@@ -309,7 +315,7 @@ namespace Flow.Launcher
         private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
             _viewModel.Hide();
-            await Task.Delay(100);
+            await Task.Delay(50);
             App.API.OpenSettingDialog();
         }
 
@@ -318,7 +324,7 @@ namespace Flow.Launcher
         {
             // need time to initialize the main query window animation
             if (_settings.UseAnimation)
-                await Task.Delay(100);
+                await Task.Delay(50);
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index aa0efdca6..87e38f332 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Input;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
@@ -157,26 +156,6 @@ namespace Flow.Launcher.ViewModel
                 };
             }
         }
-
-        private void UpdateLastQUeryMode()
-        {
-            switch (_settings.LastQueryMode)
-            {
-                case LastQueryMode.Empty:
-                    ChangeQueryText(string.Empty);
-                    break;
-                case LastQueryMode.Preserved:
-                    LastQuerySelected = true;
-                    break;
-                case LastQueryMode.Selected:
-                    LastQuerySelected = false;
-                    break;
-                default:
-                    throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
-
-            }
-        }
-
         private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
@@ -383,7 +362,6 @@ namespace Flow.Launcher.ViewModel
         public Visibility MainWindowVisibility { get; set; }
         public double MainWindowOpacity { get; set; } = 1;
         public bool WinToggleStatus { get; set; } = true;
-
         public double MainWindowWidth => _settings.WindowSize;
 
         public ICommand EscCommand { get; set; }
@@ -720,45 +698,42 @@ namespace Flow.Launcher.ViewModel
                 Hide();
             }
         }
-
         public void Show()
         {
-            if (_settings.UseSound)
-            {
-                MediaPlayer media = new MediaPlayer();
-                media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
-                media.Play();
-            }
+            ((MainWindow)Application.Current.MainWindow).WindowAnimator();
             MainWindowVisibility = Visibility.Visible;
             WinToggleStatus = true;
-            ((MainWindow)Application.Current.MainWindow).WindowAnimator();
             MainWindowOpacity = 1;
         }
 
         public async void Hide()
         {
-            MainWindowOpacity = 0;
             switch (_settings.LastQueryMode)
             {
                 case LastQueryMode.Empty:
                     ChangeQueryText(string.Empty);
                     MainWindowOpacity = 0; // Trick for no delay
-                    await Task.Delay(100); //Time for change to opacity
+                    await Task.Delay(50); //Time for change to opacity
                     break;
                 case LastQueryMode.Preserved:
                     MainWindowOpacity = 0;
-                    await Task.Delay(100);
+                    if (_settings.UseAnimation)
+                    {
+                        await Task.Delay(30);
+                    }
                     LastQuerySelected = true;
                     break;
                 case LastQueryMode.Selected:
                     MainWindowOpacity = 0;
-                    await Task.Delay(100);
+                    if (_settings.UseAnimation)
+                    {
+                        await Task.Delay(30);
+                    }
                     LastQuerySelected = false;
                     break;
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
-
             WinToggleStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
         }

From 4eeaaec3c7f93356477ce3736b31e5f0d87590d3 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 20 Nov 2021 21:26:56 +1100
Subject: [PATCH 061/107] fix naming when installed from url source

---
 .../Languages/en.xaml                         |  2 ++
 .../PluginsManager.cs                         | 35 +++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index 0c0e8ea33..fc4ff95ab 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -6,6 +6,7 @@
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Downloading plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_please_wait">Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded</system:String>
+    <system:String x:Key="plugin_pluginsmanager_download_error">Error: Unable to download the plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
@@ -29,6 +30,7 @@
     <!--Plugin Infos-->
     <system:String x:Key="plugin_pluginsmanager_plugin_name">Plugins Manager</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_description">Management of installing, uninstalling or updating Flow Launcher plugins</system:String>
+    <system:String x:Key="plugin_pluginsmanager_unknown_author">Unknown Author</system:String>
 
     <!--Context menu items-->
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_openwebsite_title">Open website</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 546b31111..f13e8d8ac 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -17,6 +18,8 @@ namespace Flow.Launcher.Plugin.PluginsManager
 {
     internal class PluginsManager
     {
+        const string zip = "zip";
+
         private PluginInitContext Context { get; set; }
 
         private Settings Settings { get; set; }
@@ -161,9 +164,18 @@ namespace Flow.Launcher.Plugin.PluginsManager
             }
             catch (Exception e)
             {
-                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
+                if (e is HttpRequestException)
+                {
+                    MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_download_error"),
+                                        Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"));
+
+                }
+                else
+                {
+                    Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
                         plugin.Name));
+                }
 
                 Log.Exception("PluginsManager", "An error occured while downloading plugin", e, "InstallOrUpdate");
 
@@ -314,19 +326,21 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         internal List<Result> InstallFromWeb(string url)
         {
-            var fileName = url.Split("/").Last();
-            var filePath = Path.Combine(DataLocation.PluginsDirectory, fileName);
+            var filename = url.Split("/").Last();
+            var name = filename.Split(string.Format(".{0}", zip)).First();
+
             var plugin = new UserPlugin
             {
                 ID = "",
-                Name = fileName.Split(".").First(),
+                Name = name,
                 Version = string.Empty,
-                Author = "N/A",
+                Author = Context.API.GetTranslation("plugin_pluginsmanager_unknown_author"),
                 UrlDownload = url
             };
+
             var result = new Result
             {
-                Title = fileName,
+                Title = filename,
                 SubTitle = $"Download and Install from URL",
                 IcoPath = icoPath,
                 Action = e =>
@@ -342,6 +356,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
                     return ShouldHideWindow;
                 }
             };
+
             return new List<Result> { result };
         }
         
@@ -356,6 +371,10 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim();
 
+            if (Uri.IsWellFormedUriString(searchNameWithoutKeyword, UriKind.Absolute) 
+                && searchNameWithoutKeyword.Split('.').Last() == zip)
+                return InstallFromWeb(searchNameWithoutKeyword);
+
             var results =
                 PluginsManifest
                     .UserPlugins
@@ -380,10 +399,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
                             ContextData = x
                         });
 
-            if (Uri.IsWellFormedUriString(searchNameWithoutKeyword, UriKind.Absolute))
-            {
-                return InstallFromWeb(searchNameWithoutKeyword);
-            }
             return Search(results, searchNameWithoutKeyword);
         }
 

From a796ac4c613271f4cb5024b6c84a5832df30f839 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 21 Nov 2021 00:06:53 +1100
Subject: [PATCH 062/107] add capability to only load unique plugins with the
 highest version

---
 Flow.Launcher.Core/Plugin/PluginConfig.cs | 54 +++++++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/PluginConfig.cs b/Flow.Launcher.Core/Plugin/PluginConfig.cs
index ea2119e60..4af344267 100644
--- a/Flow.Launcher.Core/Plugin/PluginConfig.cs
+++ b/Flow.Launcher.Core/Plugin/PluginConfig.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
@@ -45,8 +45,56 @@ namespace Flow.Launcher.Core.Plugin
                     }
                 }
             }
- 
-            return allPluginMetadata;
+
+            (List<PluginMetadata> uniqueList, List<PluginMetadata> duplicateList) = GetUniqueLatestPluginMetadata(allPluginMetadata);
+
+            duplicateList
+                .ForEach(
+                    x => Log.Warn("PluginConfig",
+                                    string.Format("Duplicate plugin name: {0}, id: {1}, version: {2} " +
+                                                    "not loaded due to version not the highest of the duplicates",
+                                                    x.Name, x.ID, x.Version),
+                                                    "GetUniqueLatestPluginMetadata"));
+
+            return uniqueList;
+        }
+
+        private static (List<PluginMetadata>, List<PluginMetadata>) GetUniqueLatestPluginMetadata(List<PluginMetadata> allPluginMetadata)
+        {
+            var duplicate_list = new List<PluginMetadata>();
+            var unique_list = new List<PluginMetadata>();
+
+            var duplicateGroups = allPluginMetadata.GroupBy(x => x.ID).Where(g => g.Count() > 1).Select(y => y).ToList();
+
+            foreach (var metadata in allPluginMetadata)
+            {
+                var duplicatesExist = false;
+                foreach (var group in duplicateGroups)
+                {
+                    if (metadata.ID == group.Key)
+                    {
+                        duplicatesExist = true;
+
+                        // If metadata's version greater than each duplicate's version, CompareTo > 0
+                        var count = group.Where(x => metadata.Version.CompareTo(x.Version) > 0).Count();
+                        
+                        // Only add if the meatadata's version is the highest of all duplicates in the group
+                        if (count == group.Count() - 1)
+                        {
+                            unique_list.Add(metadata);
+                        }
+                        else
+                        {
+                            duplicate_list.Add(metadata);
+                        }
+                    }
+                }
+                
+                if (!duplicatesExist)
+                    unique_list.Add(metadata);
+            }
+
+            return (unique_list, duplicate_list);
         }
 
         private static PluginMetadata GetPluginMetadata(string pluginDirectory)

From 3eeac915c3af4c45c310489a5ab30f0940422229 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 21 Nov 2021 00:04:34 +0900
Subject: [PATCH 063/107] Add Animation in Glass Icon

---
 Flow.Launcher/MainWindow.xaml    |  1 +
 Flow.Launcher/MainWindow.xaml.cs | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index cf471beb7..2b2e4b85e 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -183,6 +183,7 @@
                     </TextBox>
                     <Canvas Style="{DynamicResource SearchIconPosition}">
                         <Path
+                            Name="SearchIcon"
                             Margin="0"
                             Data="{DynamicResource SearchIconImg}"
                             Stretch="Fill"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 72ec33840..50b4efc2b 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -267,29 +267,42 @@ namespace Flow.Launcher
                 _animating = true;
                 UpdatePosition();
                 Storyboard sb = new Storyboard();
+                Storyboard iconsb = new Storyboard();
+                CircleEase easing = new CircleEase();  // or whatever easing class you want
+                easing.EasingMode = EasingMode.EaseInOut;
                 var da = new DoubleAnimation
                 {
                     From = 0,
                     To = 1,
-                    Duration = TimeSpan.FromSeconds(0.18),
+                    Duration = TimeSpan.FromSeconds(0.2),
                     FillBehavior = FillBehavior.Stop
                 };
-
                 var da2 = new DoubleAnimation
                 {
-                    From = Top + 8,
+                    From = Top + 10,
                     To = Top,
-                    Duration = TimeSpan.FromSeconds(0.18),
+                    Duration = TimeSpan.FromSeconds(0.2),
+                    FillBehavior = FillBehavior.Stop
+                };
+                var da3 = new DoubleAnimation
+                {
+                    From = 12,
+                    To = 0,
+                    EasingFunction = easing,
+                    Duration = TimeSpan.FromSeconds(0.36),
                     FillBehavior = FillBehavior.Stop
                 };
                 Storyboard.SetTarget(da, this);
                 Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
                 Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
+                Storyboard.SetTargetProperty(da3, new PropertyPath(TopProperty));
                 sb.Children.Add(da);
                 sb.Children.Add(da2);
+                iconsb.Children.Add(da3);
                 sb.Completed += (_, _) => _animating = false;
                 _settings.WindowLeft = Left;
                 _settings.WindowTop = Top;
+                iconsb.Begin(SearchIcon);
                 sb.Begin(FlowMainWindow);
             }
             if (_settings.UseSound)

From ebf9ef1d8026d7ce1af84300ef42b0ac3698340e Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 21 Nov 2021 13:31:43 +1100
Subject: [PATCH 064/107] add check downloaded plugin zip has same or lesser
 version

---
 .../Languages/en.xaml                         |  1 +
 .../PluginsManager.cs                         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index fc4ff95ab..89ed9acf3 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -14,6 +14,7 @@
     <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress. Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_title">Error installing plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_subtitle">Error occured while trying to install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_noresult_title">No update available</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index f13e8d8ac..adc4beb6c 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -438,6 +439,17 @@ namespace Flow.Launcher.Plugin.PluginsManager
                     string.Format("Unable to find plugin.json from the extracted zip file, or this path {0} does not exist", pluginFolderPath));
             }
 
+            if (SameOrLesserPluginVersionExists(metadataJsonFilePath))
+            {
+                MessageBox.Show(string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_duplicate"), plugin.Name),
+                                Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"));
+
+                throw new InvalidOperationException(
+                    string.Format("A plugin with the same ID and version already exists, " +
+                                    "or the version is greater than this downloaded plugin {0}",
+                                    plugin.Name));
+            }
+
             var directory = string.IsNullOrEmpty(plugin.Version) ? $"{plugin.Name}-{Guid.NewGuid()}" : $"{plugin.Name}-{plugin.Version}";
             var newPluginPath = Path.Combine(DataLocation.PluginsDirectory, directory);
 
@@ -532,5 +544,14 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             return new List<Result>();
         }
+
+        private bool SameOrLesserPluginVersionExists(string metadataPath)
+        {
+            var newMetadata = JsonSerializer.Deserialize<PluginMetadata>(File.ReadAllText(metadataPath));
+            return Context.API.GetAllPlugins()
+                                .Any(x => x.Metadata.ID == newMetadata.ID 
+                                    && (x.Metadata.Version == newMetadata.Version) 
+                                        || newMetadata.Version.CompareTo(x.Metadata.Version) < 0);
+        }
     }
 }

From a07252cc04af0dd3201d0866fd433ef00db1ec53 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 21 Nov 2021 16:09:49 +1100
Subject: [PATCH 065/107] add ability to switch off warning when unknown source

fixed search terms to show with out to lower
---
 .../Languages/en.xaml                         |  9 +++-
 .../Main.cs                                   | 12 ++++--
 .../PluginsManager.cs                         | 41 +++++++++++++------
 .../Settings.cs                               |  3 ++
 .../ViewModels/SettingsViewModel.cs           |  6 +++
 .../Views/PluginsManagerSettings.xaml         | 14 +++++--
 .../Views/PluginsManagerSettings.xaml.cs      |  2 +-
 7 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index 89ed9acf3..a30b8e966 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -10,6 +10,7 @@
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress. Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
@@ -25,7 +26,9 @@
     <system:String x:Key="plugin_pluginsmanager_update_alreadyexists">This plugin is already installed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_title">Plugin Manifest Download Failed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_subtitle">Please check if you can connect to github.com. This error means you may not be able to install or update plugins.</system:String>
-    
+    <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">You are installing this plugin from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning via settings)</system:String>
+
     <!--Controls-->
     
     <!--Plugin Infos-->
@@ -42,5 +45,7 @@
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_newissue_subtitle">Suggest an enhancement or submit an issue to the plugin developer</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_title">Go to Flow's plugins repository</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle">Visit the PluginsManifest repository to see community-made plugin submissions</system:String>
-    
+
+    <!--Settings menu items-->
+    <system:String x:Key="plugin_pluginsmanager_plugin_settings_unknown_source">Install from unknown source warning</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
index 89a8e0ff5..f445826fa 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
@@ -55,7 +55,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
-            var search = query.Search.ToLower();
+            var search = query.Search;
 
             if (string.IsNullOrWhiteSpace(search))
                 return pluginManager.GetDefaultHotKeys();
@@ -70,9 +70,13 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             return search switch
             {
-                var s when s.StartsWith(Settings.HotKeyInstall) => await pluginManager.RequestInstallOrUpdate(s, token),
-                var s when s.StartsWith(Settings.HotkeyUninstall) => pluginManager.RequestUninstall(s),
-                var s when s.StartsWith(Settings.HotkeyUpdate) => await pluginManager.RequestUpdate(s, token),
+                //search could be url, no need ToLower() when passed in
+                var s when s.StartsWith(Settings.HotKeyInstall, StringComparison.OrdinalIgnoreCase)
+                                => await pluginManager.RequestInstallOrUpdate(search, token),
+                var s when s.StartsWith(Settings.HotkeyUninstall, StringComparison.OrdinalIgnoreCase)
+                                => pluginManager.RequestUninstall(search),
+                var s when s.StartsWith(Settings.HotkeyUpdate, StringComparison.OrdinalIgnoreCase) 
+                                => await pluginManager.RequestUpdate(search, token),
                 _ => pluginManager.GetDefaultHotKeys().Where(hotkey =>
                 {
                     hotkey.Score = StringMatcher.FuzzySearch(search, hotkey.Title).Score;
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index adc4beb6c..f37dd86ea 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -166,17 +166,12 @@ namespace Flow.Launcher.Plugin.PluginsManager
             catch (Exception e)
             {
                 if (e is HttpRequestException)
-                {
                     MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_download_error"),
                                         Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"));
 
-                }
-                else
-                {
-                    Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
+                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
                         plugin.Name));
-                }
 
                 Log.Exception("PluginsManager", "An error occured while downloading plugin", e, "InstallOrUpdate");
 
@@ -206,7 +201,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             if (autocompletedResults.Any())
                 return autocompletedResults;
 
-            var uninstallSearch = search.Replace(Settings.HotkeyUpdate, string.Empty).TrimStart();
+            var uninstallSearch = search.Replace(Settings.HotkeyUpdate, string.Empty, StringComparison.OrdinalIgnoreCase).TrimStart();
 
             var resultsForUpdate =
                 from existingPlugin in Context.API.GetAllPlugins()
@@ -341,26 +336,46 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             var result = new Result
             {
-                Title = filename,
-                SubTitle = $"Download and Install from URL",
+                Title = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_from_web"), filename),
+                SubTitle = plugin.UrlDownload,
                 IcoPath = icoPath,
                 Action = e =>
                 {
                     if (e.SpecialKeyState.CtrlPressed)
                     {
-                        SearchWeb.NewTabInBrowser(url);
+                        SearchWeb.NewTabInBrowser(plugin.UrlDownload);
                         return ShouldHideWindow;
                     }
 
+                    if (Settings.WarnFromUnknownSource)
+                    {
+                        if (!InstallSourceKnown(plugin.UrlDownload)
+                            && MessageBox.Show(string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_unknown_source_warning"), 
+                                                        Environment.NewLine), 
+                                                Context.API.GetTranslation("plugin_pluginsmanager_install_unknown_source_warning_title"),
+                                                MessageBoxButton.YesNo) == MessageBoxResult.No)
+                            return false;
+                    }
+
                     Application.Current.MainWindow.Hide();
                     _ = InstallOrUpdate(plugin);
+                    
                     return ShouldHideWindow;
                 }
             };
 
             return new List<Result> { result };
         }
-        
+
+        private bool InstallSourceKnown(string url)
+        {
+            var author = url.Split('/')[3];
+            var acceptedSource = "https://github.com";
+            var contructedUrlPart = string.Format("{0}/{1}/", acceptedSource, author);
+
+            return url.StartsWith(acceptedSource) && Context.API.GetAllPlugins().Any(x => x.Metadata.Website.StartsWith(contructedUrlPart));
+        }
+
         internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName, CancellationToken token)
         {
             if (!PluginsManifest.UserPlugins.Any())
@@ -370,7 +385,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             token.ThrowIfCancellationRequested();
 
-            var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim();
+            var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty, StringComparison.OrdinalIgnoreCase).Trim();
 
             if (Uri.IsWellFormedUriString(searchNameWithoutKeyword, UriKind.Absolute) 
                 && searchNameWithoutKeyword.Split('.').Last() == zip)
@@ -468,7 +483,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             if (autocompletedResults.Any())
                 return autocompletedResults;
 
-            var uninstallSearch = search.Replace(Settings.HotkeyUninstall, string.Empty).TrimStart();
+            var uninstallSearch = search.Replace(Settings.HotkeyUninstall, string.Empty, StringComparison.OrdinalIgnoreCase).TrimStart();
 
             var results = Context.API
                 .GetAllPlugins()
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
index 9c5b0d29f..a951010c0 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
@@ -7,8 +7,11 @@ namespace Flow.Launcher.Plugin.PluginsManager
     internal class Settings
     {
         internal string HotKeyInstall { get; set; } = "install";
+
         internal string HotkeyUninstall { get; set; } = "uninstall";
 
         internal string HotkeyUpdate { get; set; } = "update";
+
+        public bool WarnFromUnknownSource { get; set; } = true;
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
index 8ca4c614a..11303f472 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
@@ -14,5 +14,11 @@ namespace Flow.Launcher.Plugin.PluginsManager.ViewModels
             Context = context;
             Settings = settings;
         }
+
+        public bool WarnFromUnknownSource 
+        {
+            get => Settings.WarnFromUnknownSource;
+            set => Settings.WarnFromUnknownSource = value;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
index 89d27f6ff..d75803066 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
@@ -3,10 +3,18 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Flow.Launcher.Plugin.PluginsManager.ViewModels"
         mc:Ignorable="d"
         d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        
+    <Grid Margin="70 15 0 15">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Grid.Column="0" 
+                   Text="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}" 
+                   VerticalAlignment="Center" 
+                   FontSize="14"/>
+        <CheckBox Grid.Column="1" IsChecked="{Binding WarnFromUnknownSource}" />
     </Grid>
 </UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs
index 703682e07..26668cc05 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs
@@ -16,7 +16,7 @@ namespace Flow.Launcher.Plugin.PluginsManager.Views
 
             this.viewModel = viewModel;
 
-            //RefreshView();
+            this.DataContext = viewModel;
         }
     }
 }

From c7e77e3912a6b6f6c363e2a42384b55c5299770e Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 21 Nov 2021 16:54:30 +1100
Subject: [PATCH 066/107] add tests for loading unique metadata method

---
 Flow.Launcher.Core/Plugin/PluginConfig.cs    |  2 +-
 Flow.Launcher.Test/PluginLoadTest.cs         | 91 ++++++++++++++++++++
 Flow.Launcher.Test/Plugins/PluginInitTest.cs | 17 ----
 3 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 Flow.Launcher.Test/PluginLoadTest.cs
 delete mode 100644 Flow.Launcher.Test/Plugins/PluginInitTest.cs

diff --git a/Flow.Launcher.Core/Plugin/PluginConfig.cs b/Flow.Launcher.Core/Plugin/PluginConfig.cs
index 4af344267..dd6517a7f 100644
--- a/Flow.Launcher.Core/Plugin/PluginConfig.cs
+++ b/Flow.Launcher.Core/Plugin/PluginConfig.cs
@@ -59,7 +59,7 @@ namespace Flow.Launcher.Core.Plugin
             return uniqueList;
         }
 
-        private static (List<PluginMetadata>, List<PluginMetadata>) GetUniqueLatestPluginMetadata(List<PluginMetadata> allPluginMetadata)
+        internal static (List<PluginMetadata>, List<PluginMetadata>) GetUniqueLatestPluginMetadata(List<PluginMetadata> allPluginMetadata)
         {
             var duplicate_list = new List<PluginMetadata>();
             var unique_list = new List<PluginMetadata>();
diff --git a/Flow.Launcher.Test/PluginLoadTest.cs b/Flow.Launcher.Test/PluginLoadTest.cs
new file mode 100644
index 000000000..28a0ffcb4
--- /dev/null
+++ b/Flow.Launcher.Test/PluginLoadTest.cs
@@ -0,0 +1,91 @@
+using NUnit.Framework;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Plugin;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Flow.Launcher.Test
+{
+    [TestFixture]
+    class PluginLoadTest
+    {
+        [Test]
+        public void GivenDuplicatePluginMetadatasWhenLoadedThenShouldReturnOnlyUniqueList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.1"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.2"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+            
+            // Then
+            Assert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
+            Assert.True(unique.Count() == 1);
+
+            Assert.True(duplicates.Where(x => x.Version != "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855").Count() == 6);
+        }
+
+        [Test]
+        public void GivenDuplicatePluginMetadatasWithNoUniquePluginWhenLoadedThenShouldReturnEmptyList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+
+            // Then
+            Assert.True(unique.Count() == 0);
+            Assert.True(duplicates.Count() == 2);
+        }
+    }
+}
diff --git a/Flow.Launcher.Test/Plugins/PluginInitTest.cs b/Flow.Launcher.Test/Plugins/PluginInitTest.cs
deleted file mode 100644
index 299a837ee..000000000
--- a/Flow.Launcher.Test/Plugins/PluginInitTest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using NUnit.Framework;
-using Flow.Launcher.Core.Plugin;
-using Flow.Launcher.Infrastructure.Exception;
-
-namespace Flow.Launcher.Test.Plugins
-{
-
-    [TestFixture]
-    public class PluginInitTest
-    {
-        [Test]
-        public void PublicAPIIsNullTest()
-        {
-            //Assert.Throws(typeof(Flow.LauncherFatalException), () => PluginManager.Initialize(null));
-        }
-    }
-}

From 7868d62974aa4bd39479b528507afe2835310bef Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sun, 21 Nov 2021 17:16:46 +1100
Subject: [PATCH 067/107] update test

---
 Flow.Launcher.Test/PluginLoadTest.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Test/PluginLoadTest.cs b/Flow.Launcher.Test/PluginLoadTest.cs
index 28a0ffcb4..d6ba48f19 100644
--- a/Flow.Launcher.Test/PluginLoadTest.cs
+++ b/Flow.Launcher.Test/PluginLoadTest.cs
@@ -42,12 +42,12 @@ namespace Flow.Launcher.Test
                 },
                 new PluginMetadata
                 {
-                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
                     Version = "1.0.0"
                 },
                 new PluginMetadata
                 {
-                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
                     Version = "1.0.0"
                 }
             };
@@ -59,7 +59,8 @@ namespace Flow.Launcher.Test
             Assert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
             Assert.True(unique.Count() == 1);
 
-            Assert.True(duplicates.Where(x => x.Version != "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855").Count() == 6);
+            Assert.False(duplicates.Any(x => x.Version == "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855"));
+            Assert.True(duplicates.Count() == 6);
         }
 
         [Test]

From e30af374c9854c60c5fba55a9273d54d4b5e6665 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 22 Nov 2021 14:18:14 +0900
Subject: [PATCH 068/107] Adjust Delay Duration to fix blink

---
 Flow.Launcher/MainWindow.xaml.cs         | 4 ++--
 Flow.Launcher/ViewModel/MainViewModel.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 50b4efc2b..b1a23a79c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -274,14 +274,14 @@ namespace Flow.Launcher
                 {
                     From = 0,
                     To = 1,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
                 var da2 = new DoubleAnimation
                 {
                     From = Top + 10,
                     To = Top,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
                 var da3 = new DoubleAnimation
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index ab351c3d7..c0074f1a9 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -720,7 +720,7 @@ namespace Flow.Launcher.ViewModel
                     MainWindowOpacity = 0;
                     if (_settings.UseAnimation)
                     {
-                        await Task.Delay(30);
+                        await Task.Delay(50);
                     }
                     LastQuerySelected = true;
                     break;
@@ -728,7 +728,7 @@ namespace Flow.Launcher.ViewModel
                     MainWindowOpacity = 0;
                     if (_settings.UseAnimation)
                     {
-                        await Task.Delay(30);
+                        await Task.Delay(50);
                     }
                     LastQuerySelected = false;
                     break;

From e282fc5d3843a20db6b5bee38620fd2584188846 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 22 Nov 2021 15:45:08 +0900
Subject: [PATCH 069/107] - Remove visible/collapsed code (only using opacity)
 - Remove All Delay

---
 Flow.Launcher/MainWindow.xaml.cs         |  4 ----
 Flow.Launcher/ViewModel/MainViewModel.cs | 13 ++-----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b1a23a79c..6245d4a36 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -348,16 +348,12 @@ namespace Flow.Launcher
         private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
             _viewModel.Hide();
-            await Task.Delay(50);
             App.API.OpenSettingDialog();
         }
 
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
-            // need time to initialize the main query window animation
-            if (_settings.UseAnimation)
-                await Task.Delay(50);
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index c0074f1a9..61326d911 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -702,7 +702,7 @@ namespace Flow.Launcher.ViewModel
         public void Show()
         {
             ((MainWindow)Application.Current.MainWindow).WindowAnimator();
-            MainWindowVisibility = Visibility.Visible;
+            //MainWindowVisibility = Visibility.Visible;
             WinToggleStatus = true;
             MainWindowOpacity = 1;
         }
@@ -714,29 +714,20 @@ namespace Flow.Launcher.ViewModel
                 case LastQueryMode.Empty:
                     ChangeQueryText(string.Empty);
                     MainWindowOpacity = 0; // Trick for no delay
-                    await Task.Delay(50); //Time for change to opacity
                     break;
                 case LastQueryMode.Preserved:
                     MainWindowOpacity = 0;
-                    if (_settings.UseAnimation)
-                    {
-                        await Task.Delay(50);
-                    }
                     LastQuerySelected = true;
                     break;
                 case LastQueryMode.Selected:
                     MainWindowOpacity = 0;
-                    if (_settings.UseAnimation)
-                    {
-                        await Task.Delay(50);
-                    }
                     LastQuerySelected = false;
                     break;
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
             WinToggleStatus = false;
-            MainWindowVisibility = Visibility.Collapsed;
+            MainWindowOpacity = 0;
         }
 
         #endregion

From 4df1e418d7e3f2d1d5e46b7deec31f6e4c64d011 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 22 Nov 2021 16:49:06 +0900
Subject: [PATCH 070/107] Revert "- Remove visible/collapsed code (only using
 opacity)"

This reverts commit e282fc5d3843a20db6b5bee38620fd2584188846.
---
 Flow.Launcher/MainWindow.xaml.cs         |  4 ++++
 Flow.Launcher/ViewModel/MainViewModel.cs | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 6245d4a36..b1a23a79c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -348,12 +348,16 @@ namespace Flow.Launcher
         private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
             _viewModel.Hide();
+            await Task.Delay(50);
             App.API.OpenSettingDialog();
         }
 
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
+            // need time to initialize the main query window animation
+            if (_settings.UseAnimation)
+                await Task.Delay(50);
             if (_settings.HideWhenDeactive)
             {
                 _viewModel.Hide();
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 61326d911..c0074f1a9 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -702,7 +702,7 @@ namespace Flow.Launcher.ViewModel
         public void Show()
         {
             ((MainWindow)Application.Current.MainWindow).WindowAnimator();
-            //MainWindowVisibility = Visibility.Visible;
+            MainWindowVisibility = Visibility.Visible;
             WinToggleStatus = true;
             MainWindowOpacity = 1;
         }
@@ -714,20 +714,29 @@ namespace Flow.Launcher.ViewModel
                 case LastQueryMode.Empty:
                     ChangeQueryText(string.Empty);
                     MainWindowOpacity = 0; // Trick for no delay
+                    await Task.Delay(50); //Time for change to opacity
                     break;
                 case LastQueryMode.Preserved:
                     MainWindowOpacity = 0;
+                    if (_settings.UseAnimation)
+                    {
+                        await Task.Delay(50);
+                    }
                     LastQuerySelected = true;
                     break;
                 case LastQueryMode.Selected:
                     MainWindowOpacity = 0;
+                    if (_settings.UseAnimation)
+                    {
+                        await Task.Delay(50);
+                    }
                     LastQuerySelected = false;
                     break;
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
             WinToggleStatus = false;
-            MainWindowOpacity = 0;
+            MainWindowVisibility = Visibility.Collapsed;
         }
 
         #endregion

From df4f94fdee540bdacf6afd27525258222a431f71 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 22 Nov 2021 17:18:48 +0900
Subject: [PATCH 071/107] Adjust Delay for ondeactivated

---
 Flow.Launcher/MainWindow.xaml.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b1a23a79c..1736b3f25 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -355,11 +355,9 @@ namespace Flow.Launcher
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
-            // need time to initialize the main query window animation
-            if (_settings.UseAnimation)
-                await Task.Delay(50);
             if (_settings.HideWhenDeactive)
             {
+                await Task.Delay(50);
                 _viewModel.Hide();
             }
         }

From 48c0f21a24819912a52fcb9f3d5e5b2bf02ef518 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 22 Nov 2021 19:43:14 +1100
Subject: [PATCH 072/107] only msg plugin download & install succes/failure

---
 .../Languages/en.xaml                                  |  2 --
 .../Languages/sk.xaml                                  |  1 -
 .../Languages/zh-cn.xaml                               |  1 -
 .../PluginsManager.cs                                  | 10 ----------
 4 files changed, 14 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index a30b8e966..a15c50ccf 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -4,7 +4,6 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Downloading plugin</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_error">Error: Unable to download the plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
@@ -12,7 +11,6 @@
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
-    <system:String x:Key="plugin_pluginsmanager_install_in_progress">Plugin installation in progress. Please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/sk.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/sk.xaml
index 52cd784ee..4f37dfe83 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/sk.xaml
@@ -4,7 +4,6 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Sťahovanie pluginu</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">Čakajte, prosím…</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">Úspešne stiahnuté</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} od {1} {2}{3}Chcete odinštalovať tento plugin? Po odinštalovaní sa Flow automaticky reštartuje.</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Chcete nainštalovať tento plugin? Po nainštalovaní sa Flow automaticky reštartuje.</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml
index 6a060a7fe..d74ab008f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml
@@ -4,7 +4,6 @@
 
     <!--Dialogues-->
     <system:String x:Key="plugin_pluginsmanager_downloading_plugin">下载插件</system:String>
-    <system:String x:Key="plugin_pluginsmanager_please_wait">请稍等...</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_success">下载完成</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3} 您要卸载此插件吗？ 卸载后，Flow Launcher 将自动重启。</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3} 您要安装此插件吗？ 安装后，Flow Launcher 将自动重启</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index f37dd86ea..c02780383 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -150,17 +150,11 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             try
             {
-                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
-                    Context.API.GetTranslation("plugin_pluginsmanager_please_wait"));
-
                 await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
 
                 Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
                     Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
 
-                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_install_title"),
-                    Context.API.GetTranslation("plugin_pluginsmanager_install_in_progress"));
-
                 Install(plugin, filePath);
             }
             catch (Exception e)
@@ -257,10 +251,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
                                 Task.Run(async delegate
                                 {
-                                    Context.API.ShowMsg(
-                                        Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
-                                        Context.API.GetTranslation("plugin_pluginsmanager_please_wait"));
-
                                     await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                                         .ConfigureAwait(false);
 

From 76efdfcff0cc96a2d1179012c790aa67749f19cb Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 22 Nov 2021 19:45:21 +1100
Subject: [PATCH 073/107] version bump PluginsManager

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
index 592025103..bf1ae5d8e 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
@@ -6,7 +6,7 @@
   "Name": "Plugins Manager",
   "Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
   "Author": "Jeremy Wu",
-  "Version": "1.9.0",
+  "Version": "1.10.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",

From 92ee7638d8ac5cdf672bd23f9ba06a252da2049e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 23 Nov 2021 14:33:11 +0900
Subject: [PATCH 074/107] Add Darkmode in setting Add System darkmode detection
 helper Add InitializeDarkmode in onload

---
 .../UserSettings/Settings.cs                  |   1 +
 Flow.Launcher/App.xaml                        |   3 +-
 Flow.Launcher/Flow.Launcher.csproj            |   1 +
 Flow.Launcher/Helper/SystemTheme.cs           |  76 +++++++++++
 Flow.Launcher/MainWindow.xaml.cs              |  16 ++-
 .../Resources/CustomControlTemplate.xaml      |  78 ++++++------
 Flow.Launcher/SettingWindow.xaml              | 119 +++++++++---------
 Flow.Launcher/SettingWindow.xaml.cs           | 111 +++-------------
 .../ViewModel/SettingWindowViewModel.cs       |  19 +++
 9 files changed, 227 insertions(+), 197 deletions(-)
 create mode 100644 Flow.Launcher/Helper/SystemTheme.cs

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 34e86a3ed..04d5bdca9 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -15,6 +15,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         private string language = "en";
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
+        public string DarkMode { get; set; }
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
 
diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 73da9918d..1b119d528 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -8,7 +8,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Dark">
+                <ui:ThemeResources>
                     <ui:ThemeResources.ThemeDictionaries>
                         <ResourceDictionary x:Key="Light">
                             <ResourceDictionary.MergedDictionaries>
@@ -19,7 +19,6 @@
                             <ResourceDictionary.MergedDictionaries>
                                 <ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
                             </ResourceDictionary.MergedDictionaries>
-                            <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="{StaticResource SystemBaseHighColor}" />
                         </ResourceDictionary>
                     </ui:ThemeResources.ThemeDictionaries>
                 </ui:ThemeResources>
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index fd2f5f1d9..b0560fbce 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -96,6 +96,7 @@
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SharpVectors" Version="1.7.6" />
+    <PackageReference Include="System.Management" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Flow.Launcher/Helper/SystemTheme.cs b/Flow.Launcher/Helper/SystemTheme.cs
new file mode 100644
index 000000000..3a05c3149
--- /dev/null
+++ b/Flow.Launcher/Helper/SystemTheme.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Management;
+using System.Security.Principal;
+
+namespace Flow.Launcher.Helper
+{
+    class SystemTheme
+    {
+
+        private const string PersonalizeKey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+        private const string SysThemeValueName = "SystemUsesLightTheme";
+
+        public static event EventHandler<SystemThemeChangedEventArgs> SystemThemeChanged;
+
+        public static bool GetIsSystemLightTheme() => ReadDWord(SysThemeValueName);
+
+        private static bool ReadDWord(string valueName)
+        {
+            var regkey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(PersonalizeKey);
+            if (regkey == null)
+            {
+                return false;
+            }
+
+            return (int)regkey.GetValue(valueName, 0) > 0;
+        }
+
+        public static void Initialize()
+        {
+            UpdateTheme();
+            try
+            {
+                var currentUser = WindowsIdentity.GetCurrent();
+                var query = new WqlEventQuery(string.Format("SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\\\{1}' AND ValueName='{2}'",
+                currentUser.User.Value, PersonalizeKey.Replace("\\", "\\\\"), SysThemeValueName));
+
+                ManagementEventWatcher watcher = new(query);
+
+                watcher.EventArrived += new EventArrivedEventHandler(HandleEvent);
+
+                watcher.Start();
+            }
+            catch (ManagementException managementException)
+            {
+                Debug.WriteLine($"{nameof(SystemTheme)}: " + managementException.Message);
+            }
+        }
+
+        private static void HandleEvent(object sender, EventArrivedEventArgs e)
+        {
+            UpdateTheme();
+        }
+
+        private static void UpdateTheme()
+        {
+            bool isSystemLightTheme = GetIsSystemLightTheme();
+            var args = new SystemThemeChangedEventArgs(isSystemLightTheme);
+            SystemThemeChanged?.Invoke(null, args);
+        }
+    }
+
+    public class SystemThemeChangedEventArgs : EventArgs
+    {
+        public SystemThemeChangedEventArgs(bool isSystemLightTheme)
+        {
+            IsSystemLightTheme = isSystemLightTheme;
+        }
+
+        public bool IsSystemLightTheme { get; private set; }
+    }
+}
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 16e4be8a0..261d83151 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -67,7 +67,7 @@ namespace Flow.Launcher
         {
             // show notify icon when flowlauncher is hidden
             InitializeNotifyIcon();
-
+            InitializeDarkMode();
             WindowsInteropHelper.DisableControlBox(this);
             InitProgressbarAnimation();
             InitializePosition();
@@ -372,5 +372,19 @@ namespace Flow.Launcher
         {
             QueryTextBox.CaretIndex = QueryTextBox.Text.Length;
         }
+
+        public void InitializeDarkMode()
+        {
+            if (_settings.DarkMode == "Light")
+            {
+                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
+            }
+            else if (_settings.DarkMode == "Dark")
+            {
+                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
+            }
+            else
+            { }
+        }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index ad0340f67..94e298860 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -7,13 +7,13 @@
 
     <!--  Popup Color  -->
     <Style x:Key="PageBackgroundColor" TargetType="{x:Type Window}">
-        <Setter Property="Background" Value="{StaticResource Color05B}" />
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Background" Value="{DynamicResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
 
     <!--  Setting Window  -->
     <Style x:Key="PageTitle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="Glyph" TargetType="{x:Type TextBlock}">
         <Setter Property="Grid.Column" Value="0" />
@@ -21,23 +21,23 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontSize" Value="20" />
         <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="FontFamily" Value="Segoe UI" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="TabMenuIcon" TargetType="{x:Type TextBlock}">
         <Setter Property="Margin" Value="0,0,12,0" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="SettingSeparatorStyle" TargetType="{x:Type Separator}">
-        <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
     </Style>
 
     <!--  Title Bar  -->
@@ -53,7 +53,7 @@
     </Style>
 
     <Style x:Key="TitleBarButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -62,7 +62,7 @@
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
                         x:Name="border"
-                        Background="{StaticResource Color01B}"
+                        Background="{DynamicResource Color01B}"
                         BorderThickness="0"
                         SnapsToDevicePixels="true">
                         <ContentPresenter
@@ -75,10 +75,10 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color09B}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource Color09B}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -87,7 +87,7 @@
     </Style>
 
     <Style x:Key="TitleBarCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -109,11 +109,11 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color10B}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource Color10B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color11B}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource Color11B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -1394,16 +1394,16 @@
                 <ControlTemplate TargetType="Button">
                     <Border
                         x:Name="Background"
-                        Background="{StaticResource ButtonBackgroundColor}"
-                        BorderBrush="{StaticResource ButtonOutBorder}"
-                        BorderThickness="{StaticResource CustomButtonOutBorderThickness}"
+                        Background="{DynamicResource ButtonBackgroundColor}"
+                        BorderBrush="{DynamicResource ButtonOutBorder}"
+                        BorderThickness="{DynamicResource CustomButtonOutBorderThickness}"
                         CornerRadius="4"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"
                             Padding="{TemplateBinding Padding}"
-                            BorderBrush="{StaticResource ButtonInsideBorder}"
-                            BorderThickness="{StaticResource CustomButtonInsideBorderThickness}"
+                            BorderBrush="{DynamicResource ButtonInsideBorder}"
+                            BorderThickness="{DynamicResource CustomButtonInsideBorderThickness}"
                             CornerRadius="4">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
@@ -1416,27 +1416,27 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMouseOver}" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource CustomButtonOutBorderThickness}" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorder}" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource CustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{DynamicResource CustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{DynamicResource CustomButtonInsideBorderThickness}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMousePressed}" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource PressedCustomButtonOutBorderThickness}" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonMousePressedInsideBorder}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideMouseOverBorder}" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource PressedCustomButtonInsideBorderThickness}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonMousePressedText}" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{DynamicResource PressedCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ButtonMousePressedInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonInsideMouseOverBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{DynamicResource PressedCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonMousePressedText}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonBackgroundDisabledColor}" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonOutBorderThickness}" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorderDisabled}" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonInsideBorderThickness}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonDisabledText}" />
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonBackgroundDisabledColor}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{DynamicResource DisabledCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonInsideBorderDisabled}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{DynamicResource DisabledCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonDisabledText}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -2606,7 +2606,7 @@
                             ui:ControlHelper.CornerRadius="4"
                             Content="{StaticResource ChevronUp}"
                             FontSize="{TemplateBinding FontSize}"
-                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Style="{DynamicResource NumberBoxSpinButtonStyle}"
                             Visibility="Collapsed" />
 
                         <RepeatButton
@@ -2616,7 +2616,7 @@
                             ui:ControlHelper.CornerRadius="4"
                             Content="{StaticResource ChevronDown}"
                             FontSize="{TemplateBinding FontSize}"
-                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Style="{DynamicResource NumberBoxSpinButtonStyle}"
                             Visibility="Collapsed" />
 
                         <ContentPresenter
@@ -2679,7 +2679,7 @@
                         </Trigger>
                         <!--  SpinButtonsPopup  -->
                         <Trigger Property="SpinButtonPlacementMode" Value="Compact">
-                            <Setter TargetName="InputBox" Property="Style" Value="{StaticResource NumberBoxTextBoxStyle}" />
+                            <Setter TargetName="InputBox" Property="Style" Value="{DynamicResource NumberBoxTextBoxStyle}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b32ba36e8..1c8bda508 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -68,8 +68,8 @@
             </Setter>
         </Style>
         <Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
-            <Setter Property="Background" Value="{StaticResource Color00B}" />
-            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
+            <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" />
@@ -78,12 +78,12 @@
 
         </Style>
         <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
-            <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+            <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
             <Setter Property="Margin" Value="0,0,0,0" />
         </Style>
 
         <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
-            <Setter Property="Foreground" Value="{StaticResource Color04B}" />
+            <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" />
@@ -194,7 +194,7 @@
                                         <Border
                                             x:Name="border"
                                             Height="40"
-                                            Background="{StaticResource Color01B}"
+                                            Background="{DynamicResource Color01B}"
                                             CornerRadius="5">
                                             <Grid>
                                                 <Canvas>
@@ -224,10 +224,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
                             </Trigger>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
                                 <Setter TargetName="Bullet" Property="Visibility" Value="Visible" />
                             </Trigger>
                         </ControlTemplate.Triggers>
@@ -244,11 +244,11 @@
         </Style>
 
         <Style x:Key="PluginList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="{StaticResource Color00B}" />
+            <Setter Property="Background" Value="{DynamicResource Color00B}" />
             <Setter Property="Padding" Value="0,12,0,12" />
             <Setter Property="Margin" Value="0,0,18,5" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>
@@ -274,8 +274,8 @@
                                 <MultiTrigger.Conditions>
                                     <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color07B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color07B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
 
                             </MultiTrigger>
@@ -284,8 +284,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color00B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <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" />
 
 
@@ -295,8 +295,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color00B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <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" />
 
@@ -315,10 +315,10 @@
 
         <!--#region PluginStore Style-->
         <Style x:Key="StoreList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="{StaticResource Color02B}" />
+            <Setter Property="Background" Value="{DynamicResource Color02B}" />
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="Margin" Value="0,0,8,5" />
-            <Setter Property="BorderBrush" Value="{StaticResource Color03B}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="MinWidth" Value="330" />
             <Setter Property="Height" Value="98" />
             <!--#region Template for blue highlight win10-->
@@ -346,8 +346,8 @@
                                 <MultiTrigger.Conditions>
                                     <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color07B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color07B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
 
                             </MultiTrigger>
@@ -356,8 +356,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
@@ -367,8 +367,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color02B}" />
+                                <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" />
 
@@ -399,7 +399,7 @@
                                 Grid.Column="0"
                                 Margin="0,0,0,0"
                                 Panel.ZIndex="1"
-                                Background="{StaticResource Color01B}"
+                                Background="{DynamicResource Color01B}"
                                 IsItemsHost="True" />
                             <Border
                                 Grid.Column="1"
@@ -415,7 +415,7 @@
         </Style>
     </Window.Resources>
     <Border Style="{StaticResource WindowMainPanelStyle}">
-        <Grid Background="{StaticResource Color01B}">
+        <Grid Background="{DynamicResource Color01B}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -439,14 +439,14 @@
                 Margin="4,0,0,0"
                 VerticalAlignment="Center"
                 FontSize="12"
-                Foreground="{StaticResource Color05B}"
+                Foreground="{DynamicResource Color05B}"
                 Text="{DynamicResource flowlauncher_settings}" />
 
             <Button
                 Grid.Column="2"
                 Click="OnMinimizeButtonClick"
                 RenderOptions.EdgeMode="Aliased"
-                Style="{StaticResource TitleBarButtonStyle}">
+                Style="{DynamicResource TitleBarButtonStyle}">
                 <Path
                     Width="46"
                     Height="32"
@@ -579,7 +579,7 @@
 
                     <ScrollViewer
                         Margin="0,0,0,0"
-                        Background="{StaticResource Color01B}"
+                        Background="{DynamicResource Color01B}"
                         ScrollViewer.CanContentScroll="False">
                         <StackPanel Margin="5,18,25,30" Orientation="Vertical">
                             <TextBlock
@@ -892,13 +892,13 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Padding="0,0,0,0"
-                            Background="{StaticResource Color01B}">
+                            Background="{DynamicResource Color01B}">
                             <ListBox
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
                                 HorizontalAlignment="Stretch"
-                                Background="{StaticResource Color01B}"
+                                Background="{DynamicResource Color01B}"
                                 ItemContainerStyle="{StaticResource PluginList}"
                                 ItemsSource="{Binding PluginViewModels}"
                                 ScrollViewer.CanContentScroll="False"
@@ -949,13 +949,13 @@
                                                     </StackPanel>
                                                     <StackPanel Grid.Column="1" Margin="12,0,14,0">
                                                         <TextBlock
-                                                            Foreground="{StaticResource Color05B}"
+                                                            Foreground="{DynamicResource Color05B}"
                                                             Text="{Binding PluginPair.Metadata.Name}"
                                                             TextWrapping="Wrap"
                                                             ToolTip="{Binding PluginPair.Metadata.Version}" />
                                                         <TextBlock
                                                             Margin="0,2,0,0"
-                                                            Foreground="{StaticResource Color04B}"
+                                                            Foreground="{DynamicResource Color04B}"
                                                             TextWrapping="WrapWithOverflow">
                                                             <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                         </TextBlock>
@@ -966,7 +966,7 @@
                                                             Margin="0,0,8,0"
                                                             VerticalAlignment="Center"
                                                             FontSize="12"
-                                                            Foreground="{StaticResource Color08B}"
+                                                            Foreground="{DynamicResource Color08B}"
                                                             Text="{DynamicResource priority}" />
                                                         <Border>
                                                             <Button
@@ -988,10 +988,10 @@
                                                                         <Setter Property="Padding" Value="12,8,12,8" />
                                                                         <Setter Property="BorderThickness" Value="0" />
                                                                         <Setter Property="FontWeight" Value="DemiBold" />
-                                                                        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
+                                                                        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
-                                                                                <Setter Property="Foreground" Value="{StaticResource Color08B}" />
+                                                                                <Setter Property="Foreground" Value="{DynamicResource Color08B}" />
                                                                                 <Setter Property="FontWeight" Value="Normal" />
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -1070,8 +1070,8 @@
                                                             Padding="0"
                                                             HorizontalAlignment="Stretch"
                                                             VerticalAlignment="Center"
-                                                            Background="{StaticResource Color02B}"
-                                                            BorderBrush="{StaticResource Color03B}"
+                                                            Background="{DynamicResource Color02B}"
+                                                            BorderBrush="{DynamicResource Color03B}"
                                                             BorderThickness="0,1,0,0">
                                                             <!--#region SubInfo Styling-->
                                                             <Border.Style>
@@ -1286,7 +1286,7 @@
                                 Padding="0,0,0,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
-                                Background="{StaticResource Color01B}"
+                                Background="{DynamicResource Color01B}"
                                 ItemContainerStyle="{StaticResource StoreList}"
                                 ItemsSource="{Binding ExternalPlugins}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -1375,18 +1375,18 @@
                                                     </StackPanel.Style>
                                                     <TextBlock
                                                         Padding="0,0,20,0"
-                                                        Foreground="{StaticResource Color05B}"
+                                                        Foreground="{DynamicResource Color05B}"
                                                         Text="{Binding Name}"
                                                         TextWrapping="WrapWithOverflow"
                                                         ToolTip="{Binding Version}" />
                                                     <TextBlock
                                                         Margin="0,2,0,0"
                                                         Padding="0,0,20,0"
-                                                        Foreground="{StaticResource Color04B}"
+                                                        Foreground="{DynamicResource Color04B}"
                                                         TextWrapping="WrapWithOverflow">
                                                         <Run
                                                             FontSize="12"
-                                                            Foreground="{StaticResource Color04B}"
+                                                            Foreground="{DynamicResource Color04B}"
                                                             Text="{Binding Description}" />
                                                     </TextBlock>
 
@@ -1414,7 +1414,7 @@
                                                         VerticalAlignment="Stretch"
                                                         Panel.ZIndex="1">
                                                         <Grid.Background>
-                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource HoverStoreGrid}" />
+                                                            <SolidColorBrush Opacity=".95" Color="{DynamicResource HoverStoreGrid}" />
                                                         </Grid.Background>
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
@@ -1429,14 +1429,14 @@
                                                                     Margin="20,0,0,0"
                                                                     Padding="0,0,0,0"
                                                                     FontWeight="Bold"
-                                                                    Foreground="{StaticResource Color05B}"
+                                                                    Foreground="{DynamicResource Color05B}"
                                                                     Text="{Binding Name}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Name}" />
                                                                 <TextBlock
                                                                     Margin="10,0,0,0"
                                                                     Padding="0,0,20,0"
-                                                                    Foreground="{StaticResource Color05B}"
+                                                                    Foreground="{DynamicResource Color05B}"
                                                                     Text="{Binding Version}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Version}" />
@@ -1444,7 +1444,7 @@
                                                             <StackPanel Margin="20,2,120,0" Orientation="Vertical">
                                                                 <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
                                                                     <Hyperlink
-                                                                        Foreground="{StaticResource Color04B}"
+                                                                        Foreground="{DynamicResource Color04B}"
                                                                         NavigateUri="{Binding Website}"
                                                                         RequestNavigate="OnRequestNavigate">
                                                                         <Run FontSize="12" Text="{Binding Author}" />
@@ -1601,7 +1601,7 @@
                                                     Width="100"
                                                     Margin="0,0,8,2"
                                                     VerticalAlignment="Center"
-                                                    Foreground="{StaticResource Color05B}"
+                                                    Foreground="{DynamicResource Color05B}"
                                                     Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
                                                     TextAlignment="Right" />
                                                 <Slider
@@ -1651,14 +1651,14 @@
                                                                 <Border
                                                                     x:Name="Bd"
                                                                     Padding="{TemplateBinding Padding}"
-                                                                    Background="{StaticResource Color12B}"
-                                                                    BorderBrush="{StaticResource Color03B}"
+                                                                    Background="{DynamicResource Color12B}"
+                                                                    BorderBrush="{DynamicResource Color03B}"
                                                                     BorderThickness="1,1,1,0"
                                                                     CornerRadius="4"
                                                                     SnapsToDevicePixels="true">
                                                                     <Border
                                                                         x:Name="Bd2"
-                                                                        BorderBrush="{StaticResource Color14B}"
+                                                                        BorderBrush="{DynamicResource Color14B}"
                                                                         BorderThickness="0,0,0,2"
                                                                         CornerRadius="4">
                                                                         <ContentPresenter
@@ -1868,13 +1868,14 @@
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource DarkMode}" />
                                                 </StackPanel>
                                                 <ComboBox
+                                                    x:Name="DarkModeComboBox"
                                                     Grid.Column="2"
-                                                    MaxWidth="200"
-                                                    Margin="10,0,18,0"
-                                                    DisplayMemberPath="Display"
-                                                    ItemsSource="{Binding LastQueryModes}"
-                                                    SelectedValue="{Binding Settings.LastQueryMode}"
-                                                    SelectedValuePath="Value" />
+                                                    Width="120"
+                                                    Margin="0,0,18,0"
+                                                    FontSize="14"
+                                                    ItemsSource="{Binding DarkMode}"
+                                                    SelectedItem="{Binding Settings.DarkMode}"
+                                                    SelectionChanged="DarkModeSelectedIndexChanged" />
                                                 <TextBlock Style="{StaticResource Glyph}">
                                                     &#xe708;
                                                 </TextBlock>
@@ -2035,12 +2036,12 @@
                                     Padding="0,12,0,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
-                                    Foreground="{StaticResource Color05B}"
+                                    Foreground="{DynamicResource Color05B}"
                                     Text="{DynamicResource customQueryHotkey}" />
                                 <ListView
                                     Grid.Row="4"
                                     Margin="0,0,0,0"
-                                    Background="{StaticResource Color02B}"
+                                    Background="{DynamicResource Color02B}"
                                     BorderBrush="DarkGray"
                                     BorderThickness="1"
                                     ItemsSource="{Binding Settings.CustomPluginHotkeys}"
@@ -2284,14 +2285,14 @@
                     <Border>
                         <ScrollViewer
                             Margin="0,0,0,0"
-                            Background="{StaticResource Color01B}"
+                            Background="{DynamicResource Color01B}"
                             ScrollViewer.CanContentScroll="False">
                             <StackPanel Margin="5,14,25,30" Orientation="Vertical">
                                 <TextBlock
                                     Grid.Row="2"
                                     Margin="0,5,0,5"
                                     FontSize="30"
-                                    Style="{StaticResource PageTitle}"
+                                    Style="{DynamicResource PageTitle}"
                                     Text="{DynamicResource about}"
                                     TextAlignment="left" />
                                 <StackPanel Orientation="Horizontal">
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 7b710d2ba..323847453 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -16,6 +16,8 @@ using Flow.Launcher.Helper;
 using System.Windows.Controls;
 using Flow.Launcher.Core.ExternalPlugins;
 using System.Runtime.InteropServices;
+using ThemeManager = ModernWpf.ThemeManager;
+using ApplicationTheme = ModernWpf.ApplicationTheme;
 
 namespace Flow.Launcher
 {
@@ -310,6 +312,19 @@ namespace Flow.Launcher
             }
         }
 
+        private void DarkModeSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (settings.DarkMode == "Light")
+            {
+                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
+            }
+            else if (settings.DarkMode == "Dark")
+            {
+                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
+            }
+
+        }
+
         /* Custom TitleBar */
 
         private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)
@@ -352,101 +367,5 @@ namespace Flow.Launcher
             this.RefreshMaximizeRestoreButton();
         }
 
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-            ((HwndSource)PresentationSource.FromVisual(this)).AddHook(HookProc);
-        }
-
-        public static IntPtr HookProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == WM_GETMINMAXINFO)
-            {
-                // We need to tell the system what our size should be when maximized. Otherwise it will cover the whole screen,
-                // including the task bar.
-                MINMAXINFO mmi = (MINMAXINFO)Marshal.PtrToStructure(lParam, typeof(MINMAXINFO));
-
-                // Adjust the maximized size and position to fit the work area of the correct monitor
-                IntPtr monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-
-                if (monitor != IntPtr.Zero)
-                {
-                    MONITORINFO monitorInfo = new MONITORINFO();
-                    monitorInfo.cbSize = Marshal.SizeOf(typeof(MONITORINFO));
-                    GetMonitorInfo(monitor, ref monitorInfo);
-                    RECT rcWorkArea = monitorInfo.rcWork;
-                    RECT rcMonitorArea = monitorInfo.rcMonitor;
-                    mmi.ptMaxPosition.X = Math.Abs(rcWorkArea.Left - rcMonitorArea.Left);
-                    mmi.ptMaxPosition.Y = Math.Abs(rcWorkArea.Top - rcMonitorArea.Top);
-                    mmi.ptMaxSize.X = Math.Abs(rcWorkArea.Right - rcWorkArea.Left);
-                    mmi.ptMaxSize.Y = Math.Abs(rcWorkArea.Bottom - rcWorkArea.Top);
-                }
-
-                Marshal.StructureToPtr(mmi, lParam, true);
-            }
-
-            return IntPtr.Zero;
-        }
-
-        private const int WM_GETMINMAXINFO = 0x0024;
-
-        private const uint MONITOR_DEFAULTTONEAREST = 0x00000002;
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr MonitorFromWindow(IntPtr handle, uint flags);
-
-        [DllImport("user32.dll")]
-        private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
-
-        [Serializable]
-        [StructLayout(LayoutKind.Sequential)]
-        public struct RECT
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-
-            public RECT(int left, int top, int right, int bottom)
-            {
-                this.Left = left;
-                this.Top = top;
-                this.Right = right;
-                this.Bottom = bottom;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct MONITORINFO
-        {
-            public int cbSize;
-            public RECT rcMonitor;
-            public RECT rcWork;
-            public uint dwFlags;
-        }
-
-        [Serializable]
-        [StructLayout(LayoutKind.Sequential)]
-        public struct POINT
-        {
-            public int X;
-            public int Y;
-
-            public POINT(int x, int y)
-            {
-                this.X = x;
-                this.Y = y;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct MINMAXINFO
-        {
-            public POINT ptReserved;
-            public POINT ptMaxSize;
-            public POINT ptMaxPosition;
-            public POINT ptMinTrackSize;
-            public POINT ptMaxTrackSize;
-        }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 4947ca380..a7ac164f4 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -20,6 +20,7 @@ using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
+using ApplicationTheme = ModernWpf.ApplicationTheme;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -316,6 +317,23 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        enum DarkModes
+        {
+            System,
+            Light,
+            Dark
+        }
+        public List<string> DarkMode
+        {
+            get
+            {
+                var darkModeStrings = new List<string>();
+                var enumList = Enum.GetValues(typeof(DarkModes)).Cast<DarkModes>().ToList();
+                enumList.ForEach(x => darkModeStrings.Add(x.ToString()));
+                return darkModeStrings;
+            }
+        }
+
         public double WindowWidthSize
         {
             get => Settings.WindowSize;
@@ -352,6 +370,7 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+
         public ResultsViewModel PreviewResults
         {
             get

From 6aefca2e0ee8a04884b54dca7223f7f2a0941c79 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 23 Nov 2021 15:44:26 +0900
Subject: [PATCH 075/107] Remove OS theme detection code Add some string change
 enum location

---
 .../UserSettings/Settings.cs                  |  9 ++-
 Flow.Launcher/Flow.Launcher.csproj            |  1 -
 Flow.Launcher/Helper/SystemTheme.cs           | 76 -------------------
 Flow.Launcher/Languages/en.xaml               |  3 +-
 Flow.Launcher/SettingWindow.xaml              |  9 ++-
 Flow.Launcher/SettingWindow.xaml.cs           |  1 -
 .../ViewModel/SettingWindowViewModel.cs       | 23 +++---
 7 files changed, 30 insertions(+), 92 deletions(-)
 delete mode 100644 Flow.Launcher/Helper/SystemTheme.cs

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 04d5bdca9..9e98d70e0 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -15,7 +15,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         private string language = "en";
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
-        public string DarkMode { get; set; }
+        public string DarkMode { get; set; } = "System";
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
 
@@ -164,4 +164,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         Empty,
         Preserved
     }
+
+    public enum DarkMode
+    {
+        System,
+        Light,
+        Dark
+    }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index b0560fbce..fd2f5f1d9 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -96,7 +96,6 @@
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SharpVectors" Version="1.7.6" />
-    <PackageReference Include="System.Management" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Flow.Launcher/Helper/SystemTheme.cs b/Flow.Launcher/Helper/SystemTheme.cs
deleted file mode 100644
index 3a05c3149..000000000
--- a/Flow.Launcher/Helper/SystemTheme.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Diagnostics;
-using System.Management;
-using System.Security.Principal;
-
-namespace Flow.Launcher.Helper
-{
-    class SystemTheme
-    {
-
-        private const string PersonalizeKey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
-        private const string SysThemeValueName = "SystemUsesLightTheme";
-
-        public static event EventHandler<SystemThemeChangedEventArgs> SystemThemeChanged;
-
-        public static bool GetIsSystemLightTheme() => ReadDWord(SysThemeValueName);
-
-        private static bool ReadDWord(string valueName)
-        {
-            var regkey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(PersonalizeKey);
-            if (regkey == null)
-            {
-                return false;
-            }
-
-            return (int)regkey.GetValue(valueName, 0) > 0;
-        }
-
-        public static void Initialize()
-        {
-            UpdateTheme();
-            try
-            {
-                var currentUser = WindowsIdentity.GetCurrent();
-                var query = new WqlEventQuery(string.Format("SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\\\{1}' AND ValueName='{2}'",
-                currentUser.User.Value, PersonalizeKey.Replace("\\", "\\\\"), SysThemeValueName));
-
-                ManagementEventWatcher watcher = new(query);
-
-                watcher.EventArrived += new EventArrivedEventHandler(HandleEvent);
-
-                watcher.Start();
-            }
-            catch (ManagementException managementException)
-            {
-                Debug.WriteLine($"{nameof(SystemTheme)}: " + managementException.Message);
-            }
-        }
-
-        private static void HandleEvent(object sender, EventArrivedEventArgs e)
-        {
-            UpdateTheme();
-        }
-
-        private static void UpdateTheme()
-        {
-            bool isSystemLightTheme = GetIsSystemLightTheme();
-            var args = new SystemThemeChangedEventArgs(isSystemLightTheme);
-            SystemThemeChanged?.Invoke(null, args);
-        }
-    }
-
-    public class SystemThemeChangedEventArgs : EventArgs
-    {
-        public SystemThemeChangedEventArgs(bool isSystemLightTheme)
-        {
-            IsSystemLightTheme = isSystemLightTheme;
-        }
-
-        public bool IsSystemLightTheme { get; private set; }
-    }
-}
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index fe1c5dd91..e2bcbd98c 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -84,7 +84,8 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="DarkMode">Dark Mode</system:String>
-    <system:String x:Key="DarkModeDefault">System Default</system:String>
+    <system:String x:Key="DarkModeTip">System settings will take effect from the next run.</system:String>
+    <system:String x:Key="DarkModeSystem">System Default</system:String>
     <system:String x:Key="DarkModeLight">Light</system:String>
     <system:String x:Key="DarkModeDark">Dark</system:String>
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 1c8bda508..1524a2940 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1866,15 +1866,18 @@
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource DarkMode}" />
+                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource DarkModeTip}" />
                                                 </StackPanel>
                                                 <ComboBox
                                                     x:Name="DarkModeComboBox"
                                                     Grid.Column="2"
-                                                    Width="120"
+                                                    Width="180"
                                                     Margin="0,0,18,0"
+                                                    DisplayMemberPath="Display"
                                                     FontSize="14"
-                                                    ItemsSource="{Binding DarkMode}"
-                                                    SelectedItem="{Binding Settings.DarkMode}"
+                                                    ItemsSource="{Binding DarkModes}"
+                                                    SelectedValue="{Binding Settings.DarkMode}"
+                                                    SelectedValuePath="Value"
                                                     SelectionChanged="DarkModeSelectedIndexChanged" />
                                                 <TextBlock Style="{StaticResource Glyph}">
                                                     &#xe708;
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 323847453..f1e7bdaa7 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -322,7 +322,6 @@ namespace Flow.Launcher
             {
                 ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
             }
-
         }
 
         /* Custom TitleBar */
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index a7ac164f4..e09bbe04b 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -317,20 +317,25 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        enum DarkModes
+        public class DarkMode
         {
-            System,
-            Light,
-            Dark
+            public string Display { get; set; }
+            public Infrastructure.UserSettings.DarkMode Value { get; set; }
         }
-        public List<string> DarkMode
+        public List<DarkMode> DarkModes
         {
             get
             {
-                var darkModeStrings = new List<string>();
-                var enumList = Enum.GetValues(typeof(DarkModes)).Cast<DarkModes>().ToList();
-                enumList.ForEach(x => darkModeStrings.Add(x.ToString()));
-                return darkModeStrings;
+                List<DarkMode> modes = new List<DarkMode>();
+                var enums = (Infrastructure.UserSettings.DarkMode[])Enum.GetValues(typeof(Infrastructure.UserSettings.DarkMode));
+                foreach (var e in enums)
+                {
+                    var key = $"DarkMode{e}";
+                    var display = _translater.GetTranslation(key);
+                    var m = new DarkMode { Display = display, Value = e, };
+                    modes.Add(m);
+                }
+                return modes;
             }
         }
 

From 7b4867d2eb2d744dd1786e968fe32f7373723860 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Tue, 23 Nov 2021 19:46:34 +1100
Subject: [PATCH 076/107] prevent re-triggering on deactivated

case where without it the toggle hidden is fired and then ondeactivated is also fired but with delay, and hides the window again
---
 Flow.Launcher/MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 1736b3f25..e22be38e3 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -355,7 +355,7 @@ namespace Flow.Launcher
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
-            if (_settings.HideWhenDeactive)
+            if (_settings.HideWhenDeactive && _viewModel.MainWindowVisibility != Visibility.Collapsed)
             {
                 await Task.Delay(50);
                 _viewModel.Hide();

From 2edc34589291f58302b755ab38151c855c9c7fd3 Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Wed, 24 Nov 2021 02:06:39 -0500
Subject: [PATCH 077/107] Fix or condition

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index c02780383..60059c7e9 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -555,8 +555,8 @@ namespace Flow.Launcher.Plugin.PluginsManager
             var newMetadata = JsonSerializer.Deserialize<PluginMetadata>(File.ReadAllText(metadataPath));
             return Context.API.GetAllPlugins()
                                 .Any(x => x.Metadata.ID == newMetadata.ID 
-                                    && (x.Metadata.Version == newMetadata.Version) 
-                                        || newMetadata.Version.CompareTo(x.Metadata.Version) < 0);
+                                    && (x.Metadata.Version == newMetadata.Version 
+                                        || newMetadata.Version.CompareTo(x.Metadata.Version) < 0));
         }
     }
 }

From 64f1e28baa91565543be00bc2516ac4bcc1f3da5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 24 Nov 2021 18:50:21 +0900
Subject: [PATCH 078/107] Add System Base Theme & Color Palette Adjust Default
 Themes Change Default theme to Win11System from Win11Light

---
 Flow.Launcher/App.xaml                |   2 +-
 Flow.Launcher/Languages/en.xaml       |   2 +-
 Flow.Launcher/Resources/Dark.xaml     |  14 +++
 Flow.Launcher/Resources/Light.xaml    |  13 +++
 Flow.Launcher/Themes/Win11Dark.xaml   | 127 ++++++++++++++------
 Flow.Launcher/Themes/Win11Light.xaml  |   2 +-
 Flow.Launcher/Themes/Win11System.xaml | 159 ++++++++++++++++++++++++++
 7 files changed, 279 insertions(+), 40 deletions(-)
 create mode 100644 Flow.Launcher/Themes/Win11System.xaml

diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 1b119d528..b8e2a1cfe 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -24,7 +24,7 @@
                 </ui:ThemeResources>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index e2bcbd98c..2308436a1 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -84,7 +84,7 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="DarkMode">Dark Mode</system:String>
-    <system:String x:Key="DarkModeTip">System settings will take effect from the next run.</system:String>
+    <system:String x:Key="DarkModeTip">System settings will take effect from the next run</system:String>
     <system:String x:Key="DarkModeSystem">System Default</system:String>
     <system:String x:Key="DarkModeLight">Light</system:String>
     <system:String x:Key="DarkModeDark">Dark</system:String>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 388f329d0..894a185b7 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -6,6 +6,20 @@
     xmlns:primitives="http://schemas.modernwpf.com/2019"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
+    <SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#7b7b7b" />
+    <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="ThumbColor" Color="#9a9a9a" />
+    <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
+    <SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
+    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
+    <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
+
+
     <SolidColorBrush x:Key="Color00B" Color="#2b2b2b" />
     <SolidColorBrush x:Key="Color01B" Color="#202020" />
     <SolidColorBrush x:Key="Color02B" Color="#2b2b2b" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 864cd01ce..447c21ad3 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -6,6 +6,19 @@
     xmlns:primitives="http://schemas.modernwpf.com/2019"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
+    <SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#b5b5b5" />
+    <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="ThumbColor" Color="#868686" />
+    <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
+    <SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
+    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
+    <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
+
     <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
     <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
     <SolidColorBrush x:Key="Color02B" Color="#ffffff" />
diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml
index 797241da0..31f6fb956 100644
--- a/Flow.Launcher/Themes/Win11Dark.xaml
+++ b/Flow.Launcher/Themes/Win11Dark.xaml
@@ -1,72 +1,109 @@
-<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
+    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}">
+    <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"/>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="SelectionBrush" Value="#4a5459" />
         <Setter Property="FontSize" Value="24" />
         <Setter Property="Background" Value="#202020" />
         <Setter Property="Foreground" Value="#FFFFFF" />
         <Setter Property="CaretBrush" Value="#FFFFFF" />
         <Setter Property="FontSize" Value="26" />
-        <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}">
+    <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="Padding" Value="0,4,66,0" />
         <Setter Property="Height" Value="42" />
     </Style>
-    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
+    <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}">
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}">
         <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
     </Style>
 
-    <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
+    <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}">
+    <!--  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}" >
+    <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}">
+    <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}" >
+    <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}" >
+    <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">#2d2d2d</SolidColorBrush>
-    <Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
+    <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.FontWeight" Value="Bold" />
+        <Setter Property="Inline.Foreground" Value="#0078d7" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
@@ -76,29 +113,45 @@
         <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"/>
+    <!--  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 CornerRadius="2" DockPanel.Dock="Right" Background="#9a9a9a" BorderBrush="Transparent" BorderThickness="0" />
+                    <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="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="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" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+    <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" />
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index ca78fd6e6..33aa6cdee 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -57,7 +57,7 @@
         <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="Foreground" Value="#72767d" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#eaeaea</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
     <Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml
new file mode 100644
index 000000000..bcc83be9f
--- /dev/null
+++ b/Flow.Launcher/Themes/Win11System.xaml
@@ -0,0 +1,159 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:m="http://schemas.modernwpf.com/2019"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="ItemGlyph"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
+        <Setter Property="FontSize" Value="26" />
+        <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="Height" Value="42" />
+    </Style>
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
+        <Setter Property="CornerRadius" Value="5" />
+        <Setter Property="Background" Value="{DynamicResource Color01B}" />
+    </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}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
+        <Setter Property="FontSize" Value="13" />
+    </Style>
+    <Style
+        x:Key="ItemNumberStyle"
+        BasedOn="{StaticResource BaseItemNumberStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#A6A6A6" />
+    </Style>
+    <Style
+        x:Key="ItemTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleSelectedForeground}" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor ItemSelectedBackgroundColorBrush}" />
+    <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="{DynamicResource InlineHighlight}" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+    </Style>
+    <Style
+        x:Key="ItemHotkeySelectedStyle"
+        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
+    </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="{DynamicResource ThumbColor}"
+                        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="{DynamicResource SeparatorForeground}" />
+        <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="{DynamicResource SearchIconForeground}" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+</ResourceDictionary>

From 70a2a5ca73a3669d47c55ea8137e3773c973dce2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 24 Nov 2021 19:56:11 +0900
Subject: [PATCH 079/107] Add New Themes

---
 Flow.Launcher/Themes/Atom.xaml         | 103 +++++++++++++++++++++++++
 Flow.Launcher/Themes/Darker Glass.xaml |  95 +++++++++++++++++++++++
 Flow.Launcher/Themes/Dracula.xaml      | 103 +++++++++++++++++++++++++
 3 files changed, 301 insertions(+)
 create mode 100644 Flow.Launcher/Themes/Atom.xaml
 create mode 100644 Flow.Launcher/Themes/Darker Glass.xaml
 create mode 100644 Flow.Launcher/Themes/Dracula.xaml

diff --git a/Flow.Launcher/Themes/Atom.xaml b/Flow.Launcher/Themes/Atom.xaml
new file mode 100644
index 000000000..10daf817f
--- /dev/null
+++ b/Flow.Launcher/Themes/Atom.xaml
@@ -0,0 +1,103 @@
+<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="#9fb2bf" />
+    </Style>
+    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="SelectionBrush" Value="#515a6b"/>
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Background" Value="#282c34" />
+        <Setter Property="Foreground" Value="#61afef" />
+        <Setter Property="CaretBrush" Value="#ffb86c" />
+        <Setter Property="FontSize" Value="26" />
+        <Setter Property="Padding" Value="0 4 66 0" />
+        <Setter Property="Height" Value="42" />
+    </Style>
+    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="Background" Value="#282c34" />
+        <Setter Property="Foreground" Value="#454e61" />
+        <Setter Property="FontSize" Value="26" />
+        <Setter Property="Padding" Value="0 4 66 0" />
+        <Setter Property="Height" Value="42" />
+    </Style>
+    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="BorderBrush" Value="#44475a" />
+        <Setter Property="CornerRadius" Value="5" />
+        <Setter Property="Background" Value="#282c34" />
+    </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}">
+    </Style>
+
+    <!-- Item Style -->
+    <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#9fb2bf" />
+    </Style>
+    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#6272a4 " />
+        <Setter Property="FontSize" Value="13" />
+    </Style>
+    <Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#6272a4" />
+    </Style>
+    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="#e5c07b" />
+    </Style>
+    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="#c678dd" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2c313c</SolidColorBrush>
+    <Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
+        <Setter Property="Cursor" Value="Arrow" />
+    </Style>
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.Foreground" Value="#e06c75 " />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#6272a4" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}"  BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#56b6c2" />
+    </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 CornerRadius="2" DockPanel.Dock="Right" Background="#b4b5b7" BorderBrush="Transparent" BorderThickness="0" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
+    </Style>
+    <Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#495162"/>
+        <Setter Property="Height" Value="1"/>
+        <Setter Property="Margin" Value="12 0 12 8"/>
+    </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#495162" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="0.8" />
+    </Style>
+</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Darker Glass.xaml b/Flow.Launcher/Themes/Darker Glass.xaml
new file mode 100644
index 000000000..de37dd192
--- /dev/null
+++ b/Flow.Launcher/Themes/Darker Glass.xaml	
@@ -0,0 +1,95 @@
+<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="#ebebeb" />
+    </Style>
+    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="Foreground" Value="#ebebeb" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
+            <Setter Property="Foreground" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
+            <Setter Property="CornerRadius" Value="5" />
+        <Setter Property="BorderThickness" Value="1 1 0 0" />
+        <Setter Property="BorderBrush" Value="#666666" />
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="#333333" Opacity="0.95"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="White" Opacity="0.5"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
+    </Style>
+
+    <!-- Item Style -->
+    <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0, -10"/>
+        <Setter Property="Foreground" Value="#ebebeb"/>
+    </Style>
+    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#787878"/>
+    </Style>
+    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
+        <Setter Property="Margin" Value="0, -10"/>
+        <Setter Property="Foreground" Value="#ffffff"/>
+    </Style>
+    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#949494"/>
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#545454</SolidColorBrush>
+
+    <!-- button style in the middle of the scrollbar -->
+    <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#525252" BorderBrush="Transparent" BorderThickness="0" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background" Value="#a0a0a0"/>
+    </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#FFFFFF" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="0.2" />
+    </Style>
+        <Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#787878"/>
+        <Setter Property="Height" Value="1"/>
+        <Setter Property="Margin" Value="0 0 0 8"/>
+        <Setter Property="Opacity" Value="0.3" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#787878" />
+        <Setter Property="Opacity" Value="0.1" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#787878" />
+        <Setter Property="Opacity" Value="0.1" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml
new file mode 100644
index 000000000..c661d33e3
--- /dev/null
+++ b/Flow.Launcher/Themes/Dracula.xaml
@@ -0,0 +1,103 @@
+<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="#f8f8f2" />
+    </Style>
+    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="SelectionBrush" Value="#ff79c6"/>
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Background" Value="#282a36" />
+        <Setter Property="Foreground" Value="#f8f8f2" />
+        <Setter Property="CaretBrush" Value="#ffb86c" />
+        <Setter Property="FontSize" Value="26" />
+        <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="#282a36" />
+        <Setter Property="Foreground" Value="#6272a4" />
+        <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="2" />
+        <Setter Property="BorderBrush" Value="#44475a" />
+        <Setter Property="CornerRadius" Value="5" />
+        <Setter Property="Background" Value="#282a36" />
+    </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}">
+    </Style>
+
+    <!-- Item Style -->
+    <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#f8f8f2" />
+    </Style>
+    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#6272a4" />
+        <Setter Property="FontSize" Value="13" />
+    </Style>
+    <Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#6272a4" />
+    </Style>
+    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="#ff79c6" />
+    </Style>
+    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="#6272a4" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#44475a</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="#bd93f9" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#6272a4" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}"  BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}">
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="#ff79c6" />
+    </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 CornerRadius="2" DockPanel.Dock="Right" Background="#44475a" BorderBrush="Transparent" BorderThickness="0" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
+    </Style>
+    <Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#44475a"/>
+        <Setter Property="Height" Value="1"/>
+        <Setter Property="Margin" Value="12 0 12 8"/>
+    </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#6272a4" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="0.8" />
+    </Style>
+</ResourceDictionary>

From 2b722852e456ecc912b94c134c81ab8fbbd54305 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 24 Nov 2021 20:43:17 +0900
Subject: [PATCH 080/107] Add Strings in about panel Add github / docs link

---
 Flow.Launcher.Infrastructure/Constant.cs      |  2 +
 Flow.Launcher/Languages/en.xaml               |  5 ++
 Flow.Launcher/SettingWindow.xaml              | 48 +++++++++++++------
 .../ViewModel/SettingWindowViewModel.cs       |  2 +
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 283ab7703..081dd9909 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -40,5 +40,7 @@ namespace Flow.Launcher.Infrastructure
         public const string Logs = "Logs";
 
         public const string Website = "https://flow-launcher.github.io";
+        public const string GitHub = "https://github.com/Flow-Launcher/Flow.Launcher";
+        public const string Docs = "https://flow-launcher.github.io/docs";
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 6ccc8010e..6cd198d0b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -130,6 +130,8 @@
     <!--  Setting About  -->
     <system:String x:Key="about">About</system:String>
     <system:String x:Key="website">Website</system:String>
+    <system:String x:Key="github">Github</system:String>
+    <system:String x:Key="docs">Docs</system:String>
     <system:String x:Key="version">Version</system:String>
     <system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
     <system:String x:Key="checkUpdates">Check for Updates</system:String>
@@ -141,6 +143,9 @@
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
     <system:String x:Key="documentation">Usage Tips</system:String>
+    <system:String x:Key="devtool">DevTools</system:String>
+    <system:String x:Key="settingfolder">Setting Folder</system:String>
+    <system:String x:Key="logfolder">Log Folder</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 1524a2940..0df6233d3 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2348,11 +2348,21 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
                                         </StackPanel>
-                                        <TextBlock Style="{StaticResource SideTextAbout}">
-                                            <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                                <Run Text="{Binding Website, Mode=OneWay}" />
-                                            </Hyperlink>
-                                        </TextBlock>
+                                        <StackPanel
+                                            Grid.Column="2"
+                                            Margin="0,0,18,0"
+                                            Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,12,0">
+                                                <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                    <Run Text="{DynamicResource website}" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                            <TextBlock>
+                                                <Hyperlink NavigateUri="{Binding Github, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                    <Run Text="{DynamicResource github}" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                        </StackPanel>
                                         <TextBlock Style="{StaticResource Glyph}">
                                             &#xeb41;
                                         </TextBlock>
@@ -2366,7 +2376,7 @@
                                         </StackPanel>
                                         <TextBlock Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                                <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
+                                                <Run Text="{DynamicResource releaseNotes}" />
                                             </Hyperlink>
                                         </TextBlock>
                                         <TextBlock Style="{StaticResource Glyph}">
@@ -2380,11 +2390,21 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
                                         </StackPanel>
-                                        <TextBlock Style="{StaticResource SideTextAbout}">
-                                            <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                                <Run Text="{Binding Documentation, Mode=OneWay}" />
-                                            </Hyperlink>
-                                        </TextBlock>
+                                        <StackPanel
+                                            Grid.Column="2"
+                                            Margin="0,0,18,0"
+                                            Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,12,0">
+                                                <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                    <Run Text="{DynamicResource documentation}" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                            <TextBlock>
+                                                <Hyperlink NavigateUri="{Binding Docs, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                    <Run Text="{DynamicResource docs}" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                        </StackPanel>
                                         <TextBlock Style="{StaticResource Glyph}">
                                             &#xe82f;
                                         </TextBlock>
@@ -2394,7 +2414,7 @@
                                 <Border Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer's Tool" />
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource devtool}" />
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="1"
@@ -2404,8 +2424,8 @@
                                             <Button
                                                 Margin="0,0,12,0"
                                                 Click="OpenSettingFolder"
-                                                Content="Setting Folder" />
-                                            <Button Click="OpenLogFolder" Content="Log Folder" />
+                                                Content="{DynamicResource settingfolder}" />
+                                            <Button Click="OpenLogFolder" Content="{DynamicResource logfolder}" />
                                         </StackPanel>
                                         <TextBlock Style="{StaticResource Glyph}">
                                             &#xec7a;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index e09bbe04b..7853fed9d 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -518,6 +518,8 @@ namespace Flow.Launcher.ViewModel
         public string Website => Constant.Website;
         public string ReleaseNotes => _updater.GitHubRepository + @"/releases/latest";
         public string Documentation => Constant.Documentation;
+        public string Docs => Constant.Docs;
+        public string Github => Constant.GitHub;
         public static string Version => Constant.Version;
         public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
         #endregion

From 1dcb2731db908d4ed21c54ade0299468e5117cd9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 24 Nov 2021 21:00:08 +0900
Subject: [PATCH 081/107] Adjust Item list height

---
 Flow.Launcher/SettingWindow.xaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 0df6233d3..831b2b992 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2343,7 +2343,10 @@
                                 </Border>
 
 
-                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <Border
+                                    Height="62"
+                                    Margin="0,4,0,0"
+                                    Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
@@ -2351,6 +2354,7 @@
                                         <StackPanel
                                             Grid.Column="2"
                                             Margin="0,0,18,0"
+                                            VerticalAlignment="Center"
                                             Orientation="Horizontal">
                                             <TextBlock Margin="0,0,12,0">
                                                 <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
@@ -2369,12 +2373,12 @@
                                     </ItemsControl>
                                 </Border>
 
-                                <Border Style="{DynamicResource SettingGroupBox}">
+                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
                                         </StackPanel>
-                                        <TextBlock Style="{StaticResource SideTextAbout}">
+                                        <TextBlock VerticalAlignment="Center" Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                                 <Run Text="{DynamicResource releaseNotes}" />
                                             </Hyperlink>
@@ -2385,7 +2389,7 @@
                                     </ItemsControl>
                                 </Border>
 
-                                <Border Style="{DynamicResource SettingGroupBox}">
+                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
@@ -2393,6 +2397,7 @@
                                         <StackPanel
                                             Grid.Column="2"
                                             Margin="0,0,18,0"
+                                            VerticalAlignment="Center"
                                             Orientation="Horizontal">
                                             <TextBlock Margin="0,0,12,0">
                                                 <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">

From d1bf471117eb77c4346b582e32c674ab352ea876 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 11:53:22 +0900
Subject: [PATCH 082/107] fix Correct typos. (colr to color)

---
 Flow.Launcher/Resources/Light.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 447c21ad3..7069f35da 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -580,7 +580,7 @@
     <m:StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="Color17B" />
-    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="Colr18B" />
+    <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="Color18B" />
     <m:StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
     <m:StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />

From b1bbe8aaac9fc9e5a6aa4afc30a5c9b905f40a66 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 12:14:20 +0900
Subject: [PATCH 083/107] Add TextBlock Color / Adjust BookMarkPlugin Input
 Height

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml            | 4 ++++
 .../Views/SettingsControl.xaml                                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 94e298860..40ae07856 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5,6 +5,10 @@
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
 
+    <Style TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
+
     <!--  Popup Color  -->
     <Style x:Key="PageBackgroundColor" TargetType="{x:Type Window}">
         <Setter Property="Background" Value="{DynamicResource Color05B}" />
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 59bdf222b..1ee02fa43 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -51,7 +51,7 @@
             <TextBox
                 x:Name="BrowserPathBox"
                 Width="240"
-                Height="30"
+                Height="34"
                 Margin="10"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"

From 84182fee0c2ce24fa67e3c7f36a8ad4b03e74f31 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Wed, 24 Nov 2021 21:50:43 -0600
Subject: [PATCH 084/107] Update SettingWindow.xaml.cs

Fix System Aware Theme and Code Refactor
---
 Flow.Launcher/SettingWindow.xaml.cs | 113 ++++++++++++----------------
 1 file changed, 48 insertions(+), 65 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index f1e7bdaa7..d8bc4da6a 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -1,23 +1,26 @@
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Navigation;
-using Microsoft.Win32;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.ViewModel;
-using Flow.Launcher.Helper;
-using System.Windows.Controls;
-using Flow.Launcher.Core.ExternalPlugins;
-using System.Runtime.InteropServices;
+using Microsoft.Win32;
+using ModernWpf;
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Navigation;
+using Button = System.Windows.Controls.Button;
+using Control = System.Windows.Controls.Control;
+using MessageBox = System.Windows.MessageBox;
+using TextBox = System.Windows.Controls.TextBox;
 using ThemeManager = ModernWpf.ThemeManager;
-using ApplicationTheme = ModernWpf.ApplicationTheme;
 
 namespace Flow.Launcher
 {
@@ -62,39 +65,30 @@ namespace Flow.Launcher
 
         public static void SetStartup()
         {
-            using (var key = Registry.CurrentUser.OpenSubKey(StartupPath, true))
-            {
-                key?.SetValue(Infrastructure.Constant.FlowLauncher, Infrastructure.Constant.ExecutablePath);
-            }
+            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+            key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);
         }
 
         private void RemoveStartup()
         {
-            using (var key = Registry.CurrentUser.OpenSubKey(StartupPath, true))
-            {
-                key?.DeleteValue(Infrastructure.Constant.FlowLauncher, false);
-            }
+            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+            key?.DeleteValue(Constant.FlowLauncher, false);
         }
 
         public static bool StartupSet()
         {
-            using (var key = Registry.CurrentUser.OpenSubKey(StartupPath, true))
+            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+            var path = key?.GetValue(Constant.FlowLauncher) as string;
+            if (path != null)
             {
-                var path = key?.GetValue(Infrastructure.Constant.FlowLauncher) as string;
-                if (path != null)
-                {
-                    return path == Infrastructure.Constant.ExecutablePath;
-                }
-                else
-                {
-                    return false;
-                }
+                return path == Constant.ExecutablePath;
             }
+            return false;
         }
 
         private void OnSelectPythonDirectoryClick(object sender, RoutedEventArgs e)
         {
-            var dlg = new System.Windows.Forms.FolderBrowserDialog
+            var dlg = new FolderBrowserDialog
             {
                 SelectedPath = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)
             };
@@ -223,7 +217,7 @@ namespace Flow.Launcher
                     var uri = new Uri(website);
                     if (Uri.CheckSchemeName(uri.Scheme))
                     {
-                        SearchWeb.NewTabInBrowser(website);
+                        website.NewTabInBrowser();
                     }
                 }
             }
@@ -257,7 +251,7 @@ namespace Flow.Launcher
 
         private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
-            SearchWeb.NewTabInBrowser(e.Uri.AbsoluteUri);
+            e.Uri.AbsoluteUri.NewTabInBrowser();
             e.Handled = true;
         }
 
@@ -296,74 +290,63 @@ namespace Flow.Launcher
             if(sender is Button { DataContext: UserPlugin plugin })
             {
                 var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
-                var actionKeywrod = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
-                API.ChangeQuery($"{actionKeywrod} install {plugin.Name}");
+                var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
+                API.ChangeQuery($"{actionKeyword} install {plugin.Name}");
                 API.ShowMainWindow();
             }
         }
 
         private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
         {
-            TextBox textBox = Keyboard.FocusedElement as TextBox;
-            if (textBox != null)
+            if (Keyboard.FocusedElement is not TextBox textBox)
             {
-                TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next);
-                textBox.MoveFocus(tRequest);
+                return;
             }
+            var tRequest = new TraversalRequest(FocusNavigationDirection.Next);
+            textBox.MoveFocus(tRequest);
         }
 
-        private void DarkModeSelectedIndexChanged(object sender, EventArgs e)
+        private void DarkModeSelectedIndexChanged(object sender, EventArgs e) => ThemeManager.Current.ApplicationTheme = settings.DarkMode switch
         {
-            if (settings.DarkMode == "Light")
-            {
-                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
-            }
-            else if (settings.DarkMode == "Dark")
-            {
-                ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
-            }
-        }
+            "Light" => ApplicationTheme.Light,
+            "Dark" => ApplicationTheme.Dark,
+            "System" => null,
+            _ => ThemeManager.Current.ApplicationTheme
+        };
 
         /* Custom TitleBar */
 
         private void OnMinimizeButtonClick(object sender, RoutedEventArgs e)
         {
-            this.WindowState = WindowState.Minimized;
+            WindowState = WindowState.Minimized;
         }
 
         private void OnMaximizeRestoreButtonClick(object sender, RoutedEventArgs e)
         {
-            if (this.WindowState == WindowState.Maximized)
-            {
-                this.WindowState = WindowState.Normal;
-            }
-            else
-            {
-                this.WindowState = WindowState.Maximized;
-            }
+            WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
         }
 
         private void OnCloseButtonClick(object sender, RoutedEventArgs e)
         {
-            this.Close();
+            Close();
         }
 
         private void RefreshMaximizeRestoreButton()
         {
-            if (this.WindowState == WindowState.Maximized)
+            if (WindowState == WindowState.Maximized)
             {
-                this.maximizeButton.Visibility = Visibility.Collapsed;
-                this.restoreButton.Visibility = Visibility.Visible;
+                maximizeButton.Visibility = Visibility.Collapsed;
+                restoreButton.Visibility = Visibility.Visible;
             }
             else
             {
-                this.maximizeButton.Visibility = Visibility.Visible;
-                this.restoreButton.Visibility = Visibility.Collapsed;
+                maximizeButton.Visibility = Visibility.Visible;
+                restoreButton.Visibility = Visibility.Collapsed;
             }
         }
         private void Window_StateChanged(object sender, EventArgs e)
         {
-            this.RefreshMaximizeRestoreButton();
+            RefreshMaximizeRestoreButton();
         }
 
     }

From ec03cc2c59461434b388190114cbe00d3411da78 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 13:30:10 +0900
Subject: [PATCH 085/107] Fix Theme Item Selected Button Color

---
 Flow.Launcher/SettingWindow.xaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 831b2b992..16e518c6e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1674,7 +1674,6 @@
                                                                     <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>
@@ -1695,6 +1694,7 @@
                                                         Height="34"
                                                         Margin="0,0,0,0">
                                                         <TextBlock
+                                                            x:Name="ThemeName"
                                                             Margin="0"
                                                             Padding="14,12,14,12"
                                                             HorizontalAlignment="Center"
@@ -1704,6 +1704,11 @@
                                                             Text="{Binding}"
                                                             TextWrapping="Wrap" />
                                                     </Grid>
+                                                    <DataTemplate.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
+                                                            <Setter TargetName="ThemeName" Property="Foreground" Value="{DynamicResource Color02B}" />
+                                                        </DataTrigger>
+                                                    </DataTemplate.Triggers>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
                                             <ListBox.ItemsPanel>

From c2887e285a6038c2f6e42daf2c902af4fbf14828 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 15:34:10 +0900
Subject: [PATCH 086/107] Fix Color

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 3 ++-
 Flow.Launcher/SettingWindow.xaml                   | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 40ae07856..4dcc13309 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5,7 +5,7 @@
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
 
-    <Style TargetType="{x:Type TextBlock}">
+    <Style TargetType="{x:Type ContentControl}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
 
@@ -1450,6 +1450,7 @@
 
     <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
 
+
     <!--  - Custom Toggle Switch from modern wpf for left label  -->
     <system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
     <KeyTime x:Key="RepositionDuration">0:0:0.367</KeyTime>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 16e518c6e..b6c9d250e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1674,6 +1674,7 @@
                                                                     <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>
@@ -1704,11 +1705,6 @@
                                                             Text="{Binding}"
                                                             TextWrapping="Wrap" />
                                                     </Grid>
-                                                    <DataTemplate.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-                                                            <Setter TargetName="ThemeName" Property="Foreground" Value="{DynamicResource Color02B}" />
-                                                        </DataTrigger>
-                                                    </DataTemplate.Triggers>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
                                             <ListBox.ItemsPanel>

From ffa7e92b56c8f1a0eaf7a6809fa26ef9730e3f37 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 16:26:04 +0900
Subject: [PATCH 087/107] Adjust Disabled ContextMenu Color Adjust Alignment in
 About Panel

---
 .../Resources/CustomControlTemplate.xaml      | 68 ++++++++++++++++++-
 Flow.Launcher/Resources/Dark.xaml             |  3 +-
 Flow.Launcher/Resources/Light.xaml            |  4 +-
 Flow.Launcher/SettingWindow.xaml              |  9 ++-
 4 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 4dcc13309..f4ef3b1a9 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2591,13 +2591,13 @@
                                         <RepeatButton
                                             x:Name="PopupUpSpinButton"
                                             Content="{StaticResource ChevronUp}"
-                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+                                            Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
 
                                         <RepeatButton
                                             x:Name="PopupDownSpinButton"
                                             Grid.Row="1"
                                             Content="{StaticResource ChevronDown}"
-                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+                                            Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
                                     </Grid>
                                 </Border>
                             </ui:ThemeShadowChrome>
@@ -2692,4 +2692,68 @@
         </Setter>
     </Style>
     <!--#endregion-->
+
+    <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
+
+    <Style x:Key="ContextMenuStyleBase" TargetType="ContextMenu">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="FontStyle" Value="Normal" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="true" />
+        <Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
+        <!--<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />-->
+        <!--<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />-->
+        <!--<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />-->
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <ui:ThemeShadowChrome
+                        x:Name="Shdw"
+                        IsShadowEnabled="{TemplateBinding HasDropShadow}"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                            <Grid>
+                                <ScrollViewer
+                                    x:Name="ContextMenuScrollViewer"
+                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
+                                                                                  TypeInTargetAssembly={x:Type FrameworkElement}}}"
+                                    Margin="{TemplateBinding Padding}"
+                                    MinWidth="{DynamicResource FlyoutThemeMinWidth}">
+                                    <ItemsPresenter
+                                        RenderOptions.ClearTypeHint="Enabled"
+                                        Margin="{StaticResource MenuFlyoutScrollerMargin}"
+                                        KeyboardNavigation.DirectionalNavigation="Cycle"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </ScrollViewer>
+                                <Border
+                                    x:Name="ContextMenuBorder"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                            </Grid>
+                        </Border>
+                    </ui:ThemeShadowChrome>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="DefaultContextMenuStyle" TargetType="ContextMenu" BasedOn="{StaticResource ContextMenuStyleBase}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+    </Style>
+
+    <Style TargetType="ContextMenu" BasedOn="{StaticResource DefaultContextMenuStyle}" />
+
 </ResourceDictionary>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 894a185b7..9b2e53e8a 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -168,6 +168,7 @@
     <Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color>
     <Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color>
     <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumLowColor2">#45FFFFFF</Color>
     <Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color>
     <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
     <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@@ -208,7 +209,7 @@
     <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
-    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 7069f35da..b5b6796c9 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -159,6 +159,8 @@
     <Color x:Key="SystemBaseMediumColor">#99000000</Color>
     <Color x:Key="SystemBaseMediumHighColor">#CC000000</Color>
     <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
+    <!--  Context Menu Disabled  -->
+    <Color x:Key="SystemBaseMediumLowColor2">#3E000000</Color>
     <Color x:Key="SystemChromeAltLowColor">#FF171717</Color>
     <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
     <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@@ -199,7 +201,7 @@
     <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
-    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
     <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b6c9d250e..8ac680e64 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2354,7 +2354,7 @@
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="2"
-                                            Margin="0,0,18,0"
+                                            Margin="0,0,30,0"
                                             VerticalAlignment="Center"
                                             Orientation="Horizontal">
                                             <TextBlock Margin="0,0,12,0">
@@ -2379,7 +2379,10 @@
                                         <StackPanel Style="{StaticResource TextPanel}">
                                             <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
                                         </StackPanel>
-                                        <TextBlock VerticalAlignment="Center" Style="{StaticResource SideTextAbout}">
+                                        <TextBlock
+                                            Margin="0,0,-12,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SideTextAbout}">
                                             <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                                 <Run Text="{DynamicResource releaseNotes}" />
                                             </Hyperlink>
@@ -2397,7 +2400,7 @@
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="2"
-                                            Margin="0,0,18,0"
+                                            Margin="0,0,30,0"
                                             VerticalAlignment="Center"
                                             Orientation="Horizontal">
                                             <TextBlock Margin="0,0,12,0">

From 1d6e18f2fdf38812a31743da7cf2c73cdc6e500c Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 26 Nov 2021 01:34:50 +0900
Subject: [PATCH 088/107] Add Context Menu Style & Template for darkmode

---
 Flow.Launcher/MainWindow.xaml                 | 322 ++++++++++++------
 .../Resources/CustomControlTemplate.xaml      | 123 ++++---
 Flow.Launcher/Resources/Dark.xaml             |   7 +
 Flow.Launcher/Resources/Light.xaml            |   7 +
 4 files changed, 299 insertions(+), 160 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index daea406db..5e09db7fd 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -1,105 +1,193 @@
-<Window x:Class="Flow.Launcher.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:converters="clr-namespace:Flow.Launcher.Converters"
-        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
-        mc:Ignorable="d"
-        Title="Flow Launcher"
-        Topmost="True"
-        SizeToContent="Height"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        WindowStartupLocation="Manual"
-        AllowDrop="True"
-        ShowInTaskbar="False"
-        Style="{DynamicResource WindowStyle}"
-        Icon="Images/app.png"
-        AllowsTransparency="True"
-        Background="Transparent"
-        Loaded="OnLoaded"
-        Initialized="OnInitialized"
-        Closing="OnClosing"
-        LocationChanged="OnLocationChanged"
-        Deactivated="OnDeactivated"
-        PreviewKeyDown="OnKeyDown"
-        MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
-        MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
-        Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-        d:DataContext="{d:DesignInstance vm:MainViewModel}">
+<Window
+    x:Class="Flow.Launcher.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Flow.Launcher.Converters"
+    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:vm="clr-namespace:Flow.Launcher.ViewModel"
+    Title="Flow Launcher"
+    MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    d:DataContext="{d:DesignInstance vm:MainViewModel}"
+    AllowDrop="True"
+    AllowsTransparency="True"
+    Background="Transparent"
+    Closing="OnClosing"
+    Deactivated="OnDeactivated"
+    Icon="Images/app.png"
+    Initialized="OnInitialized"
+    Loaded="OnLoaded"
+    LocationChanged="OnLocationChanged"
+    PreviewKeyDown="OnKeyDown"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    SizeToContent="Height"
+    Style="{DynamicResource WindowStyle}"
+    Topmost="True"
+    Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+    WindowStartupLocation="Manual"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Resources>
-        <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter"/>
-        <converters:BorderClipConverter x:Key="BorderClipConverter"/>
+        <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
+        <converters:BorderClipConverter x:Key="BorderClipConverter" />
     </Window.Resources>
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
-        <KeyBinding Key="F1" Command="{Binding StartHelpCommand}"></KeyBinding>
-        <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}"></KeyBinding>
-        <KeyBinding Key="Tab" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="Tab" Modifiers="Shift" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="N" Modifiers="Ctrl" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="J" Modifiers="Ctrl" Command="{Binding SelectNextItemCommand}"></KeyBinding>
-        <KeyBinding Key="D" Modifiers="Ctrl" Command="{Binding SelectNextPageCommand}"></KeyBinding>
-        <KeyBinding Key="P" Modifiers="Ctrl" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="K" Modifiers="Ctrl" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
-        <KeyBinding Key="U" Modifiers="Ctrl" Command="{Binding SelectPrevPageCommand}"></KeyBinding>
-        <KeyBinding Key="Home" Modifiers="Alt" Command="{Binding SelectFirstResultCommand}"></KeyBinding>
-        <KeyBinding Key="O" Modifiers="Ctrl" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Left" Command="{Binding EscCommand}"></KeyBinding>
-        <KeyBinding Key="H" Modifiers="Ctrl" Command="{Binding LoadHistoryCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Ctrl+Shift" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Shift" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Ctrl" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="Enter" Modifiers="Alt" Command="{Binding OpenResultCommand}"></KeyBinding>
-        <KeyBinding Key="D1" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="0"></KeyBinding>
-        <KeyBinding Key="D2" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="1"></KeyBinding>
-        <KeyBinding Key="D3" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="2"></KeyBinding>
-        <KeyBinding Key="D4" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="3"></KeyBinding>
-        <KeyBinding Key="D5" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="4"></KeyBinding>
-        <KeyBinding Key="D6" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="5"></KeyBinding>
-        <KeyBinding Key="D7" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="6"></KeyBinding>
-        <KeyBinding Key="D8" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="7"></KeyBinding>
-        <KeyBinding Key="D9" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="8"></KeyBinding>
+        <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
+        <KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
+        <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
+        <KeyBinding Key="Tab" Command="{Binding SelectNextItemCommand}" />
+        <KeyBinding
+            Key="Tab"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Shift" />
+        <KeyBinding
+            Key="N"
+            Command="{Binding SelectNextItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="J"
+            Command="{Binding SelectNextItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="D"
+            Command="{Binding SelectNextPageCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="P"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="K"
+            Command="{Binding SelectPrevItemCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="U"
+            Command="{Binding SelectPrevPageCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Home"
+            Command="{Binding SelectFirstResultCommand}"
+            Modifiers="Alt" />
+        <KeyBinding
+            Key="O"
+            Command="{Binding LoadContextMenuCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
+        <KeyBinding Key="Left" Command="{Binding EscCommand}" />
+        <KeyBinding
+            Key="H"
+            Command="{Binding LoadHistoryCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Ctrl+Shift" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding LoadContextMenuCommand}"
+            Modifiers="Shift" />
+        <KeyBinding Key="Enter" Command="{Binding OpenResultCommand}" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Ctrl" />
+        <KeyBinding
+            Key="Enter"
+            Command="{Binding OpenResultCommand}"
+            Modifiers="Alt" />
+        <KeyBinding
+            Key="D1"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="0"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D2"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="1"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D3"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="2"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D4"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="3"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D5"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="4"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D6"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="5"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D7"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="6"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D8"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="7"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D9"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="8"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
     </Window.InputBindings>
     <Grid>
-        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
+        <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
             <StackPanel Orientation="Vertical">
                 <Grid>
-                    <TextBox x:Name="QueryTextSuggestionBox"
-                         Style="{DynamicResource QuerySuggestionBoxStyle}"
-                         IsEnabled="False">
+                    <TextBox
+                        x:Name="QueryTextSuggestionBox"
+                        IsEnabled="False"
+                        Style="{DynamicResource QuerySuggestionBoxStyle}">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
-                                <Binding ElementName="QueryTextBox" Path="Text"/>
-                                <Binding ElementName="ResultListBox" Path="SelectedItem"/>
+                                <Binding ElementName="QueryTextBox" Path="Text" />
+                                <Binding ElementName="ResultListBox" Path="SelectedItem" />
                             </MultiBinding>
                         </TextBox.Text>
                     </TextBox>
-                    <TextBox x:Name="QueryTextBox"
-                    Style="{DynamicResource QueryBoxStyle}"
-                     Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     PreviewDragOver="OnPreviewDragOver"
-                     AllowDrop="True"
-                     Visibility="Visible"
-                    Background="Transparent">
+                    <TextBox
+                        x:Name="QueryTextBox"
+                        AllowDrop="True"
+                        Background="Transparent"
+                        PreviewDragOver="OnPreviewDragOver"
+                        Style="{DynamicResource QueryBoxStyle}"
+                        Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="Visible">
                         <TextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Command="ApplicationCommands.Cut"/>
-                                <MenuItem Command="ApplicationCommands.Copy"/>
-                                <MenuItem Command="ApplicationCommands.Paste"/>
-                                <Separator />
-                                <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
-                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}"/>
+                                <MenuItem Command="ApplicationCommands.Cut" />
+                                <MenuItem Command="ApplicationCommands.Copy" />
+                                <MenuItem Command="ApplicationCommands.Paste" />
+                                <Separator
+                                    Margin="0"
+                                    Padding="0,4,0,4"
+                                    Background="{DynamicResource ContextSeparator}" />
+                                <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}" />
+                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}" />
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
                     <Canvas Style="{DynamicResource SearchIconPosition}">
-                        <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                        <Path
+                            Margin="0"
+                            Data="{DynamicResource SearchIconImg}"
+                            Stretch="Fill"
+                            Style="{DynamicResource SearchIconStyle}" />
                     </Canvas>
                 </Grid>
 
@@ -121,49 +209,69 @@
                                 </Style.Triggers>
                             </Style>
                         </ContentControl.Style>
-                        <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}"/>
+                        <Rectangle
+                            Width="Auto"
+                            HorizontalAlignment="Stretch"
+                            Style="{DynamicResource SeparatorStyle}" />
                     </ContentControl>
-                    <Line x:Name="ProgressBar" HorizontalAlignment="Right"
-                  Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                  Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
-                    </Line>
+                    <Line
+                        x:Name="ProgressBar"
+                        Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
+                        Height="2"
+                        HorizontalAlignment="Right"
+                        StrokeThickness="1"
+                        Style="{DynamicResource PendingLineStyle}"
+                        Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        X1="-150"
+                        X2="-50"
+                        Y1="0"
+                        Y2="0" />
                 </Grid>
 
                 <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}"/>
+                            <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="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
+                        <flowlauncher:ResultListBox
+                            x:Name="ResultListBox"
+                            DataContext="{Binding Results}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
                     </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}"/>
+                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
                         </MultiBinding>
                     </Border.Clip>
-                     <ContentControl>
-                        <flowlauncher:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="ContextMenu"/>
-                      </ContentControl>
+                    <ContentControl>
+                        <flowlauncher:ResultListBox
+                            x:Name="ContextMenu"
+                            DataContext="{Binding ContextMenu}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                    </ContentControl>
                 </Border>
                 <Border Style="{DynamicResource WindowRadius}">
-                <Border.Clip>
+                    <Border.Clip>
                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
-                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
-                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}"/>
+                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
                         </MultiBinding>
-                </Border.Clip>
-                        <ContentControl>
-                        <flowlauncher:ResultListBox DataContext="{Binding History}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="History"/>
-                         </ContentControl>
+                    </Border.Clip>
+                    <ContentControl>
+                        <flowlauncher:ResultListBox
+                            x:Name="History"
+                            DataContext="{Binding History}"
+                            PreviewMouseDown="OnPreviewMouseButtonDown" />
+                    </ContentControl>
                 </Border>
             </StackPanel>
         </Border>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index f4ef3b1a9..1a48c5965 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2693,67 +2693,84 @@
     </Style>
     <!--#endregion-->
 
-    <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
-
-    <Style x:Key="ContextMenuStyleBase" TargetType="ContextMenu">
-        <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontStyle" Value="Normal" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Grid.IsSharedSizeScope" Value="true" />
-        <Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
-        <!--<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />-->
-        <!--<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />-->
-        <!--<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />-->
+    <Style TargetType="{x:Type MenuItem}">
+        <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="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="ContextMenu">
-                    <ui:ThemeShadowChrome
-                        x:Name="Shdw"
-                        IsShadowEnabled="{TemplateBinding HasDropShadow}"
-                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
-                        SnapsToDevicePixels="True">
-                        <Border
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
-                            <Grid>
-                                <ScrollViewer
-                                    x:Name="ContextMenuScrollViewer"
-                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
-                                                                                  TypeInTargetAssembly={x:Type FrameworkElement}}}"
-                                    Margin="{TemplateBinding Padding}"
-                                    MinWidth="{DynamicResource FlyoutThemeMinWidth}">
-                                    <ItemsPresenter
-                                        RenderOptions.ClearTypeHint="Enabled"
-                                        Margin="{StaticResource MenuFlyoutScrollerMargin}"
-                                        KeyboardNavigation.DirectionalNavigation="Cycle"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                </ScrollViewer>
-                                <Border
-                                    x:Name="ContextMenuBorder"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
-                            </Grid>
-                        </Border>
-                    </ui:ThemeShadowChrome>
+                <ControlTemplate TargetType="{x:Type MenuItem}">
+                    <Border
+                        Name="bdr"
+                        Padding="24,6,24,6"
+                        Background="Transparent">
+                        <TextBlock
+                            Name="Menu"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Header}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsVisible" Value="True">
+                            <Setter TargetName="bdr" Property="Background" Value="{DynamicResource CustomContextBackground}" />
+                            <Setter TargetName="Menu" Property="Foreground" Value="{DynamicResource Color05B}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="bdr" Property="Background" Value="{DynamicResource CustomContextHover}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Menu" Property="Foreground" Value="{DynamicResource CustomContextDisabled}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultContextMenuStyle" TargetType="ContextMenu" BasedOn="{StaticResource ContextMenuStyleBase}">
+    <Style TargetType="{x:Type ContextMenu}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContextMenu}">
+                    <Border
+                        x:Name="Border"
+                        Margin="5,4,5,12"
+                        Padding="0,4,0,4"
+                        Background="{DynamicResource CustomContextBackground}"
+                        BorderBrush="{DynamicResource CustomContextBorder}"
+                        BorderThickness="1"
+                        CornerRadius="8">
+                        <Border.Effect>
+                            <DropShadowEffect
+                                BlurRadius="12"
+                                Direction="-90"
+                                Opacity=".2"
+                                ShadowDepth="6"
+                                Color="#8F8F8F" />
+                        </Border.Effect>
+                        <StackPanel
+                            x:Name="Panel"
+                            ClipToBounds="True"
+                            IsItemsHost="True"
+                            Orientation="Vertical" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsVisible" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource CustomContextBackground}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource CustomContextBorder}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource CustomContextBackground}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource CustomContextBorder}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
-
-    <Style TargetType="ContextMenu" BasedOn="{StaticResource DefaultContextMenuStyle}" />
-
 </ResourceDictionary>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 9b2e53e8a..445e07c63 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -62,6 +62,13 @@
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
     <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#2b2b2b" />
     <SolidColorBrush x:Key="PopupButtonAreaBorderColor" Color="#3f3f3f" />
+
+    <SolidColorBrush x:Key="CustomContextBorder" Color="#1b1b1b" />
+    <SolidColorBrush x:Key="CustomContextBackground" Color="#2b2b2b" />
+    <SolidColorBrush x:Key="CustomContextHover" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
+    <SolidColorBrush x:Key="ContextSeparator" Color="#3c3c3c" />
+
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index b5b6796c9..cee8b63cd 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -55,6 +55,13 @@
     <SolidColorBrush x:Key="PopupTextColor" Color="#1b1b1b" />
     <SolidColorBrush x:Key="PopupButtonAreaBGColor" Color="#f3f3f3" />
     <SolidColorBrush x:Key="PopupButtonAreaBorderColor" Color="#e5e5e5" />
+
+    <SolidColorBrush x:Key="CustomContextBorder" Color="#dadada" />
+    <SolidColorBrush x:Key="CustomContextBackground" Color="#f2f2f2" />
+    <SolidColorBrush x:Key="CustomContextHover" Color="#DBDBDB" />
+    <SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
+    <SolidColorBrush x:Key="ContextSeparator" Color="#dadada" />
+
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>

From b6032ea2d996412d902b5bd56dbde8a7af3538fb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 26 Nov 2021 01:40:20 +0900
Subject: [PATCH 089/107] Adjust Shadow Color

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 1a48c5965..053821c86 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2749,9 +2749,9 @@
                             <DropShadowEffect
                                 BlurRadius="12"
                                 Direction="-90"
-                                Opacity=".2"
+                                Opacity=".15"
                                 ShadowDepth="6"
-                                Color="#8F8F8F" />
+                                Color="Black" />
                         </Border.Effect>
                         <StackPanel
                             x:Name="Panel"

From 16c30e9803004038316e0e373465829da1e6d98c Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Thu, 25 Nov 2021 15:47:11 -0600
Subject: [PATCH 090/107] Refactor Shell Command

---
 .../SharedCommands/ShellCommand.cs            | 13 ---
 Plugins/Flow.Launcher.Plugin.Shell/Main.cs    | 90 +++++++++++--------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
index c5d43a3d9..8a8c5793d 100644
--- a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
+++ b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
@@ -59,18 +59,5 @@ namespace Flow.Launcher.Plugin.SharedCommands
             GetWindowText(hwnd, sb, sb.Capacity);
             return sb.ToString();
         }
-
-        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "")
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = fileName,
-                WorkingDirectory = workingDirectory,
-                Arguments = arguments,
-                Verb = verb
-            };
-
-            return info;
-        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index f9fc239a5..9af5bfec8 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -193,51 +193,63 @@ namespace Flow.Launcher.Plugin.Shell
             var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             var runAsAdministratorArg = !runAsAdministrator && !_settings.RunAsAdministrator ? "" : "runas";
 
-            ProcessStartInfo info;
-            if (_settings.Shell == Shell.Cmd)
+            ProcessStartInfo info = new()
             {
-                var arguments = _settings.LeaveShellOpen ? $"/k \"{command}\"" : $"/c \"{command}\" & pause";
-
-                info = ShellCommand.SetProcessStartInfo("cmd.exe", workingDirectory, arguments, runAsAdministratorArg);
-            }
-            else if (_settings.Shell == Shell.Powershell)
+                Verb = runAsAdministratorArg,
+                WorkingDirectory = workingDirectory,
+            };
+            switch (_settings.Shell)
             {
-                string arguments;
-                if (_settings.LeaveShellOpen)
-                {
-                    arguments = $"-NoExit \"{command}\"";
-                }
-                else
-                {
-                    arguments = $"\"{command} ; Read-Host -Prompt \\\"Press Enter to continue\\\"\"";
-                }
-
-                info = ShellCommand.SetProcessStartInfo("powershell.exe", workingDirectory, arguments, runAsAdministratorArg);
-            }
-            else if (_settings.Shell == Shell.RunCommand)
-            {
-                var parts = command.Split(new[] { ' ' }, 2);
-                if (parts.Length == 2)
-                {
-                    var filename = parts[0];
-                    if (ExistInPath(filename))
+                case Shell.Cmd:
                     {
-                        var arguments = parts[1];
-                        info = ShellCommand.SetProcessStartInfo(filename, workingDirectory, arguments, runAsAdministratorArg);
+                        info.FileName = "cmd.exe";
+                        info.ArgumentList.Add(_settings.LeaveShellOpen ? "/k" : "/c");
+                        info.ArgumentList.Add(command);
+                        break;
                     }
-                    else
+
+                case Shell.Powershell:
                     {
-                        info = ShellCommand.SetProcessStartInfo(command, verb: runAsAdministratorArg);
+                        info.FileName = "powershell.exe";
+                        if (_settings.LeaveShellOpen)
+                        {
+                            info.ArgumentList.Add("-NoExit");
+                            info.ArgumentList.Add(command);
+                        }
+                        else
+                        {
+                            info.ArgumentList.Add("-Command");
+                            info.ArgumentList.Add(command);
+                        }
+                        break;
                     }
-                }
-                else
-                {
-                    info = ShellCommand.SetProcessStartInfo(command, verb: runAsAdministratorArg);
-                }
-            }
-            else
-            {
-                throw new NotImplementedException();
+
+                case Shell.RunCommand:
+                    {
+                        var parts = command.Split(new[] { ' ' }, 2);
+                        if (parts.Length == 2)
+                        {
+                            var filename = parts[0];
+                            if (ExistInPath(filename))
+                            {
+                                var arguments = parts[1];
+                                info.FileName = filename;
+                                info.ArgumentList.Add(arguments);
+                            }
+                            else
+                            {
+                                info.FileName = command;
+                            }
+                        }
+                        else
+                        {
+                            info.FileName = command;
+                        }
+
+                        break;
+                    }
+                default:
+                    throw new NotImplementedException();
             }
 
             info.UseShellExecute = true;

From b4f06caef53a308a3cf5de89fd3f0ab174d6ce86 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Thu, 25 Nov 2021 15:54:00 -0600
Subject: [PATCH 091/107] revert method removal

---
 Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
index 8a8c5793d..c5d43a3d9 100644
--- a/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
+++ b/Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs
@@ -59,5 +59,18 @@ namespace Flow.Launcher.Plugin.SharedCommands
             GetWindowText(hwnd, sb, sb.Capacity);
             return sb.ToString();
         }
+
+        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "")
+        {
+            var info = new ProcessStartInfo
+            {
+                FileName = fileName,
+                WorkingDirectory = workingDirectory,
+                Arguments = arguments,
+                Verb = verb
+            };
+
+            return info;
+        }
     }
 }

From 65fdca589048017723ba3ac8726f8993a73aaf61 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 26 Nov 2021 18:06:05 +0900
Subject: [PATCH 092/107] Fix Priority NumberBox Color

---
 .../Resources/CustomControlTemplate.xaml      | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 053821c86..dd9dba391 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2499,28 +2499,7 @@
                         <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
                     </ControlTemplate.Resources>
 
-                    <Grid ui:ThemeManager.HasThemeResources="True">
-                        <Grid.Resources>
-                            <ui:ResourceDictionaryEx>
-                                <ui:ResourceDictionaryEx.ThemeDictionaries>
-                                    <ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
-                                    </ResourceDictionary>
-
-                                    <ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
-                                    </ResourceDictionary>
-
-                                    <ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
-                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
-                                    </ResourceDictionary>
-                                </ui:ResourceDictionaryEx.ThemeDictionaries>
-                            </ui:ResourceDictionaryEx>
-                        </Grid.Resources>
-
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />

From 49b3a026d1bbef2855b40ee8eae36cc7f753d1f5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 02:17:34 +0900
Subject: [PATCH 093/107] Adjust Animation Time

---
 Flow.Launcher/MainWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index e22be38e3..a69f99435 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -274,14 +274,14 @@ namespace Flow.Launcher
                 {
                     From = 0,
                     To = 1,
-                    Duration = TimeSpan.FromSeconds(0.18),
+                    Duration = TimeSpan.FromSeconds(0.25),
                     FillBehavior = FillBehavior.Stop
                 };
                 var da2 = new DoubleAnimation
                 {
                     From = Top + 10,
                     To = Top,
-                    Duration = TimeSpan.FromSeconds(0.18),
+                    Duration = TimeSpan.FromSeconds(0.25),
                     FillBehavior = FillBehavior.Stop
                 };
                 var da3 = new DoubleAnimation

From c94a04b3e16be42f42738ad0b34c614860e80a7a Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 27 Nov 2021 13:38:47 +1100
Subject: [PATCH 094/107] refinements to delay and show hide toggle

---
 Flow.Launcher/MainWindow.xaml.cs         | 109 ++++++++++++-----------
 Flow.Launcher/PublicAPIInstance.cs       |   2 +-
 Flow.Launcher/ViewModel/MainViewModel.cs |  67 ++++++++++----
 3 files changed, 110 insertions(+), 68 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index a69f99435..5b0a620ae 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
-using System.Windows.Media;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using Flow.Launcher.Core.Plugin;
@@ -78,9 +77,9 @@ namespace Flow.Launcher
             {
                 switch (e.PropertyName)
                 {
-                    case nameof(MainViewModel.WinToggleStatus):
+                    case nameof(MainViewModel.MainWindowVisibilityStatus):
                         {
-                            if (_viewModel.WinToggleStatus == true)
+                            if (_viewModel.MainWindowVisibilityStatus)
                             {
                                 UpdatePosition();
                                 Activate();
@@ -116,7 +115,7 @@ namespace Flow.Launcher
                                     _progressBarStoryboard.Stop(ProgressBar);
                                     isProgressBarStoryboardPaused = true;
                                 }
-                                else if (_viewModel.MainWindowVisibility == Visibility.Visible &&
+                                else if (_viewModel.MainWindowVisibilityStatus &&
                                          isProgressBarStoryboardPaused)
                                 {
                                     _progressBarStoryboard.Begin(ProgressBar, true);
@@ -260,30 +259,30 @@ namespace Flow.Launcher
 
         public void WindowAnimator()
         {
-            if (_settings.UseAnimation)
-            { 
-                if (_animating)
-                    return;
-                _animating = true;
-                UpdatePosition();
-                Storyboard sb = new Storyboard();
-                Storyboard iconsb = new Storyboard();
-                CircleEase easing = new CircleEase();  // or whatever easing class you want
-                easing.EasingMode = EasingMode.EaseInOut;
-                var da = new DoubleAnimation
-                {
-                    From = 0,
-                    To = 1,
-                    Duration = TimeSpan.FromSeconds(0.25),
-                    FillBehavior = FillBehavior.Stop
-                };
-                var da2 = new DoubleAnimation
-                {
-                    From = Top + 10,
-                    To = Top,
-                    Duration = TimeSpan.FromSeconds(0.25),
-                    FillBehavior = FillBehavior.Stop
-                };
+            if (_animating)
+                return;
+
+            _animating = true;
+            UpdatePosition();
+            Storyboard sb = new Storyboard();
+            Storyboard iconsb = new Storyboard();
+            CircleEase easing = new CircleEase();  // or whatever easing class you want
+            easing.EasingMode = EasingMode.EaseInOut;
+            var da = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                Duration = TimeSpan.FromSeconds(0.25),
+                FillBehavior = FillBehavior.Stop
+            };
+
+            var da2 = new DoubleAnimation
+            {
+                From = Top + 10,
+                To = Top,
+                Duration = TimeSpan.FromSeconds(0.25),
+                FillBehavior = FillBehavior.Stop
+            };
                 var da3 = new DoubleAnimation
                 {
                     From = 12,
@@ -292,25 +291,18 @@ namespace Flow.Launcher
                     Duration = TimeSpan.FromSeconds(0.36),
                     FillBehavior = FillBehavior.Stop
                 };
-                Storyboard.SetTarget(da, this);
-                Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
-                Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
-                Storyboard.SetTargetProperty(da3, new PropertyPath(TopProperty));
-                sb.Children.Add(da);
-                sb.Children.Add(da2);
-                iconsb.Children.Add(da3);
-                sb.Completed += (_, _) => _animating = false;
-                _settings.WindowLeft = Left;
-                _settings.WindowTop = Top;
-                iconsb.Begin(SearchIcon);
-                sb.Begin(FlowMainWindow);
-            }
-            if (_settings.UseSound)
-            {
-                MediaPlayer media = new MediaPlayer();
-                media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
-                media.Play();
-            }
+            Storyboard.SetTarget(da, this);
+            Storyboard.SetTargetProperty(da, new PropertyPath(Window.OpacityProperty));
+            Storyboard.SetTargetProperty(da2, new PropertyPath(Window.TopProperty));
+            Storyboard.SetTargetProperty(da3, new PropertyPath(TopProperty));
+            sb.Children.Add(da);
+            sb.Children.Add(da2);
+            iconsb.Children.Add(da3);
+            sb.Completed += (_, _) => _animating = false;
+            _settings.WindowLeft = Left;
+            _settings.WindowTop = Top;
+            iconsb.Begin(SearchIcon);
+            sb.Begin(FlowMainWindow);
         }
 
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
@@ -348,17 +340,30 @@ namespace Flow.Launcher
         private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
             _viewModel.Hide();
-            await Task.Delay(50);
+            
+            if(_settings.UseAnimation)
+                await Task.Delay(100);
+            
             App.API.OpenSettingDialog();
         }
 
 
         private async void OnDeactivated(object sender, EventArgs e)
         {
-            if (_settings.HideWhenDeactive && _viewModel.MainWindowVisibility != Visibility.Collapsed)
+            //This condition stops extra hide call when animator is on, 
+            // which causes the toggling to occasional hide instead of show.
+            if (_viewModel.MainWindowVisibilityStatus)
             {
-                await Task.Delay(50);
-                _viewModel.Hide();
+                // Need time to initialize the main query window animation. 
+                // This also stops the mainwindow from flickering occasionally after Settings window is opened
+                // and always after Settings window is closed.
+                if (_settings.UseAnimation)
+                    await Task.Delay(100);
+                
+                if (_settings.HideWhenDeactive)
+                {
+                    _viewModel.Hide();
+                }
             }
         }
 
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index a5c9f3afe..51484e53e 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -55,7 +55,7 @@ namespace Flow.Launcher
 
         public void RestartApp()
         {
-            _mainVM.MainWindowVisibility = Visibility.Hidden;
+            _mainVM.Hide();
 
             // we must manually save
             // UpdateManager.RestartApp() will call Environment.Exit(0)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index c0074f1a9..4b413da0d 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using System.Windows;
+using System.Windows.Media;
 using System.Windows.Input;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
@@ -20,6 +21,9 @@ using Flow.Launcher.Infrastructure.Logger;
 using Microsoft.VisualStudio.Threading;
 using System.Threading.Channels;
 using ISavable = Flow.Launcher.Plugin.ISavable;
+using System.Windows.Threading;
+using NHotkey;
+using Windows.Web.Syndication;
 
 
 namespace Flow.Launcher.ViewModel
@@ -153,6 +157,26 @@ namespace Flow.Launcher.ViewModel
                 };
             }
         }
+
+        private void UpdateLastQUeryMode()
+        {
+            switch (_settings.LastQueryMode)
+            {
+                case LastQueryMode.Empty:
+                    ChangeQueryText(string.Empty);
+                    break;
+                case LastQueryMode.Preserved:
+                    LastQuerySelected = true;
+                    break;
+                case LastQueryMode.Selected:
+                    LastQuerySelected = false;
+                    break;
+                default:
+                    throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
+
+            }
+        }
+
         private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
@@ -362,7 +386,11 @@ namespace Flow.Launcher.ViewModel
         public Visibility ProgressBarVisibility { get; set; }
         public Visibility MainWindowVisibility { get; set; }
         public double MainWindowOpacity { get; set; } = 1;
-        public bool WinToggleStatus { get; set; } = true;
+
+        // This is to be used for determining the visibility status of the mainwindow instead of MainWindowVisibility
+        // because it is more accurate and reliable representation than using Visibility as a condition check
+        public bool MainWindowVisibilityStatus { get; set; } = true;
+
         public double MainWindowWidth => _settings.WindowSize;
 
         public ICommand EscCommand { get; set; }
@@ -690,7 +718,7 @@ namespace Flow.Launcher.ViewModel
 
         public void ToggleFlowLauncher()
         {
-            if (WinToggleStatus != true)
+            if (!MainWindowVisibilityStatus)
             {
                 Show();
             }
@@ -699,43 +727,52 @@ namespace Flow.Launcher.ViewModel
                 Hide();
             }
         }
+
         public void Show()
         {
-            ((MainWindow)Application.Current.MainWindow).WindowAnimator();
+            if (_settings.UseSound)
+            {
+                MediaPlayer media = new MediaPlayer();
+                media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
+                media.Play();
+            }
+
             MainWindowVisibility = Visibility.Visible;
-            WinToggleStatus = true;
+
+            MainWindowVisibilityStatus = true;
+            
+            if(_settings.UseAnimation)
+                ((MainWindow)Application.Current.MainWindow).WindowAnimator();
+            
             MainWindowOpacity = 1;
         }
 
         public async void Hide()
         {
+            // Trick for no delay
+            MainWindowOpacity = 0;
+
             switch (_settings.LastQueryMode)
             {
                 case LastQueryMode.Empty:
                     ChangeQueryText(string.Empty);
-                    MainWindowOpacity = 0; // Trick for no delay
-                    await Task.Delay(50); //Time for change to opacity
+                    await Task.Delay(100); //Time for change to opacity
                     break;
                 case LastQueryMode.Preserved:
-                    MainWindowOpacity = 0;
                     if (_settings.UseAnimation)
-                    {
-                        await Task.Delay(50);
-                    }
+                        await Task.Delay(100);
                     LastQuerySelected = true;
                     break;
                 case LastQueryMode.Selected:
-                    MainWindowOpacity = 0;
                     if (_settings.UseAnimation)
-                    {
-                        await Task.Delay(50);
-                    }
+                        await Task.Delay(100);
                     LastQuerySelected = false;
                     break;
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
-            WinToggleStatus = false;
+
+            MainWindowVisibilityStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
         }
 

From 091b4afe4e89a76b723ff0e529414296e8fedb5b Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Sat, 27 Nov 2021 13:51:45 +1100
Subject: [PATCH 095/107] switch to use main window's Show method

---
 Flow.Launcher/App.xaml.cs                                    | 2 +-
 Flow.Launcher/CustomQueryHotkeySetting.xaml.cs               | 5 +----
 Flow.Launcher/ViewModel/MainViewModel.cs                     | 4 ----
 .../Search/WindowsIndex/IndexSearch.cs                       | 2 +-
 Plugins/Flow.Launcher.Plugin.Explorer/plugin.json            | 2 +-
 .../Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs    | 2 +-
 Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json      | 2 +-
 Plugins/Flow.Launcher.Plugin.Shell/Main.cs                   | 2 +-
 Plugins/Flow.Launcher.Plugin.Shell/plugin.json               | 2 +-
 9 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index f7729701e..9ee486b3b 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -176,7 +176,7 @@ namespace Flow.Launcher
 
         public void OnSecondAppStarted()
         {
-            Current.MainWindow.Visibility = Visibility.Visible;
+            Current.MainWindow.Show();
         }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index e1f69d117..ab4047cec 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -1,8 +1,6 @@
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
-using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
@@ -91,10 +89,9 @@ namespace Flow.Launcher
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
         {
             App.API.ChangeQuery(tbAction.Text);
-            Application.Current.MainWindow.Visibility = Visibility.Visible;
+            Application.Current.MainWindow.Show();
             Application.Current.MainWindow.Opacity = 1;
             Application.Current.MainWindow.Focus();
-
         }
 
         private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 4b413da0d..8f7ed7692 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Threading.Tasks.Dataflow;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Input;
@@ -21,9 +20,6 @@ using Flow.Launcher.Infrastructure.Logger;
 using Microsoft.VisualStudio.Threading;
 using System.Threading.Channels;
 using ISavable = Flow.Launcher.Plugin.ISavable;
-using System.Windows.Threading;
-using NHotkey;
-using Windows.Web.Syndication;
 
 
 namespace Flow.Launcher.ViewModel
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
index d78d4851a..2e842c843 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
@@ -205,7 +205,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.WindowsIndex
                         }
 
                         var mainWindow = Application.Current.MainWindow;
-                        mainWindow.Visibility = Visibility.Visible;
+                        mainWindow.Show();
                         mainWindow.Focus();
 
                         return false;
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
index 8d5d97af1..07da2ad69 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@@ -10,7 +10,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.10.0",
+  "Version": "1.10.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index cd1ab4571..9df1ca911 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
                                 $"{Context.CurrentPluginMetadata.ActionKeywords.FirstOrDefault()} {Settings.HotkeyUpdate} {plugin.Name}");
 
                     var mainWindow = Application.Current.MainWindow;
-                    mainWindow.Visibility = Visibility.Visible;
+                    mainWindow.Show();
                     mainWindow.Focus();
 
                     shouldHideWindow = false;
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
index 592025103..eb90e7e8e 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
@@ -6,7 +6,7 @@
   "Name": "Plugins Manager",
   "Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
   "Author": "Jeremy Wu",
-  "Version": "1.9.0",
+  "Version": "1.9.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index f9fc239a5..0cc29ccf9 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -329,7 +329,7 @@ namespace Flow.Launcher.Plugin.Shell
 
             // show the main window and set focus to the query box
             Window mainWindow = Application.Current.MainWindow;
-            mainWindow.Visibility = Visibility.Visible;
+            mainWindow.Show();
             mainWindow.Focus();
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
index 6b20eeef9..b71dba2da 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.5",
+  "Version": "1.4.6",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",

From 529246436d82afdb8d97e9ed4b1b3034f110026e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 14:04:39 +0900
Subject: [PATCH 096/107] Merge Dev

---
 Flow.Launcher/SettingWindow.xaml | 148 +++++++++++--------------------
 1 file changed, 54 insertions(+), 94 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9b133b6da..d173f30d7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1862,101 +1862,61 @@
                                         </StackPanel>
                                     </Border>
 
-                            <StackPanel>
-
-                                <Border
-                                    Margin="0,30,0,0"
-                                    Padding="0"
-                                    CornerRadius="5"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <StackPanel Orientation="Vertical">
-                                        <Border
-                                            Margin="0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
-                                                </StackPanel>
-                                                <ui:ToggleSwitch
-                                                    Grid.Row="0"
-                                                    Grid.Column="2"
-                                                    Width="100"
-                                                    Margin="0,0,2,0"
-                                                    IsOn="{Binding UseAnimation, Mode=TwoWay}" />
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    Margin="24,0,16,0"
-                                                    VerticalAlignment="Center"
-                                                    FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20">
-                                                    &#xedb5;
-                                                </TextBlock>
-                                            </ItemsControl>
-                                        </Border>
-                                        <Separator
-                                            Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
-                                        <Border
-                                            Margin="0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
-                                                </StackPanel>
-                                                <ui:ToggleSwitch
-                                                    Grid.Row="0"
-                                                    Grid.Column="2"
-                                                    Width="100"
-                                                    Margin="0,0,2,0"
-                                                    IsOn="{Binding UseSound, Mode=TwoWay}" />
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    Margin="24,0,16,0"
-                                                    VerticalAlignment="Center"
-                                                    FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20">
-                                                    &#xe994;
-                                                </TextBlock>
-                                            </ItemsControl>
-                                        </Border>
-                                    </StackPanel>
-                                </Border>
-
-                                <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
-                                        </StackPanel>
-                                        <Button
-                                            Grid.Column="2"
-                                            Width="180"
-                                            Margin="0,0,18,0"
-                                            HorizontalAlignment="Center"
-                                            Click="OpenPluginFolder"
-                                            Content="{DynamicResource OpenThemeFolder}"
-                                            DockPanel.Dock="Top" />
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20">
-                                            &#xe838;
-                                        </TextBlock>
-                                    </ItemsControl>
-                                </Border>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </Border>
-        </TabItem>
                                     <StackPanel>
+
+                                        <Border
+                                            Margin="0,30,0,0"
+                                            Padding="0"
+                                            CornerRadius="5"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <StackPanel Orientation="Vertical">
+                                                <Border
+                                                    Margin="0"
+                                                    BorderThickness="0"
+                                                    Style="{DynamicResource SettingGroupBox}">
+                                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                                        <StackPanel Style="{StaticResource TextPanel}">
+                                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
+                                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
+                                                        </StackPanel>
+                                                        <ui:ToggleSwitch
+                                                            Grid.Row="0"
+                                                            Grid.Column="2"
+                                                            Width="100"
+                                                            Margin="0,0,2,0"
+                                                            IsOn="{Binding UseAnimation, Mode=TwoWay}" />
+                                                        <TextBlock Style="{StaticResource Glyph}">
+                                                            &#xedb5;
+                                                        </TextBlock>
+                                                    </ItemsControl>
+                                                </Border>
+                                                <Separator
+                                                    Width="Auto"
+                                                    BorderThickness="1"
+                                                    Style="{StaticResource SettingSeparatorStyle}" />
+                                                <Border
+                                                    Margin="0"
+                                                    BorderThickness="0"
+                                                    Style="{DynamicResource SettingGroupBox}">
+                                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                                        <StackPanel Style="{StaticResource TextPanel}">
+                                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
+                                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
+                                                        </StackPanel>
+                                                        <ui:ToggleSwitch
+                                                            Grid.Row="0"
+                                                            Grid.Column="2"
+                                                            Width="100"
+                                                            Margin="0,0,2,0"
+                                                            IsOn="{Binding UseSound, Mode=TwoWay}" />
+                                                        <TextBlock Style="{StaticResource Glyph}">
+                                                            &#xe994;
+                                                        </TextBlock>
+                                                    </ItemsControl>
+                                                </Border>
+                                            </StackPanel>
+                                        </Border>
+
                                         <Border Margin="0,12,0,12" Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">

From 8a02049b56d86a27b42308f1444ab999c1966894 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 14:52:28 +0900
Subject: [PATCH 097/107] Add Open Setting Hotkey (Ctrl+I) Remove Unused Code

---
 Flow.Launcher/MainWindow.xaml            |  4 ++++
 Flow.Launcher/ViewModel/MainViewModel.cs | 22 ++--------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 734b0a331..dd8979650 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -46,6 +46,10 @@
             Key="Tab"
             Command="{Binding SelectPrevItemCommand}"
             Modifiers="Shift" />
+        <KeyBinding
+            Key="I"
+            Command="{Binding OpenSettingCommand}"
+            Modifiers="Ctrl" />
         <KeyBinding
             Key="N"
             Command="{Binding SelectNextItemCommand}"
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 8f7ed7692..1d666426f 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -154,25 +154,6 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        private void UpdateLastQUeryMode()
-        {
-            switch (_settings.LastQueryMode)
-            {
-                case LastQueryMode.Empty:
-                    ChangeQueryText(string.Empty);
-                    break;
-                case LastQueryMode.Preserved:
-                    LastQuerySelected = true;
-                    break;
-                case LastQueryMode.Selected:
-                    LastQuerySelected = false;
-                    break;
-                default:
-                    throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
-
-            }
-        }
-
         private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
@@ -212,7 +193,7 @@ namespace Flow.Launcher.ViewModel
             {
                 SearchWeb.NewTabInBrowser("https://github.com/Flow-Launcher/Flow.Launcher/wiki/Flow-Launcher/");
             });
-
+            OpenSettingCommand = new RelayCommand(_ => { App.API.OpenSettingDialog(); });
             OpenResultCommand = new RelayCommand(index =>
             {
                 var results = SelectedResults;
@@ -399,6 +380,7 @@ namespace Flow.Launcher.ViewModel
         public ICommand LoadContextMenuCommand { get; set; }
         public ICommand LoadHistoryCommand { get; set; }
         public ICommand OpenResultCommand { get; set; }
+        public ICommand OpenSettingCommand { get; set; }
         public ICommand ReloadPluginDataCommand { get; set; }
         public ICommand ClearQueryCommand { get; private set; }
 

From 12cdf66ce907e072d9838601a0b689c5df0c6d22 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 15:44:49 +0900
Subject: [PATCH 098/107] Remove Setting Panel Size Limit

---
 Flow.Launcher/SettingWindow.xaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d173f30d7..f37aba033 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1090,8 +1090,6 @@
                                                         <!--#endregion-->
                                                         <ContentControl
                                                             x:Name="PluginSettingControl"
-                                                            MaxWidth="750"
-                                                            MaxHeight="550"
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"

From 905c15bf79fe4d681d4f93ba62452d3192e05eeb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 15:44:49 +0900
Subject: [PATCH 099/107] Remove Setting Panel Size Limit

---
 Flow.Launcher/SettingWindow.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d173f30d7..27ebb70b0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1090,8 +1090,7 @@
                                                         <!--#endregion-->
                                                         <ContentControl
                                                             x:Name="PluginSettingControl"
-                                                            MaxWidth="750"
-                                                            MaxHeight="550"
+                                                            MaxHeight="600"
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"

From 9297bac72fbe345a61e8f2fea443b9b1fd163e62 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 29 Nov 2021 00:24:56 +0900
Subject: [PATCH 100/107] Adjust Color in SearchSourceSetting/ Remove Comment
 in SelectFileManager

---
 Flow.Launcher/SelectFileManagerWindow.xaml    |   5 -
 .../SearchSourceSetting.xaml                  | 390 +++++++++++++++---
 2 files changed, 340 insertions(+), 55 deletions(-)

diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 2adac5639..6092c1da1 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -18,11 +18,6 @@
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
-    <!--<Border
-        Padding="26,26,26,0"
-        Background="{DynamicResource PopupContentAreaBGColor}"
-        BorderBrush="{DynamicResource PopupContentAreaBorderColor}"
-        BorderThickness="0,0,0,1">-->
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
index fbf12a6b5..12228853d 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
@@ -1,75 +1,365 @@
-<Window x:Class="Flow.Launcher.Plugin.WebSearch.SearchSourceSettingWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
-        mc:Ignorable="d" ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        Title="{DynamicResource flowlauncher_plugin_websearch_window_title}" Height="590" Width="550"
-        d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.Plugin.WebSearch.SearchSourceSettingWindow"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
+    Title="{DynamicResource flowlauncher_plugin_websearch_window_title}"
+    Width="550"
+    d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}"
+    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>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+
+        <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="OnCancelButtonClick"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26,12,26,0">
+                <Grid>
+                    <StackPanel>
+                        <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,0,0"
+                                FontFamily="Segoe UI"
+                                FontSize="20"
+                                FontWeight="SemiBold"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"
+                                TextAlignment="Left" />
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}"
+                                TextAlignment="Left"
+                                TextWrapping="WrapWithOverflow" />
+                            <TextBlock
+                                Margin="0,12,0,12"
+                                FontSize="14"
+                                FontWeight="SemiBold"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_guide_2}"
+                                TextAlignment="Center"
+                                TextWrapping="WrapWithOverflow" />
+                            <TextBlock
+                                Margin="0,0,0,14"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_guide_3}"
+                                TextAlignment="Left"
+                                TextWrapping="WrapWithOverflow" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Width="100"
+                                Margin="10"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
+                            <TextBox
+                                Width="330"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding SearchSource.Title}" />
+
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Grid.Row="4"
+                                Grid.Column="0"
+                                Width="100"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
+                            <Button
+                                Height="35"
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                Click="OnSelectIconClick"
+                                Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
+                            <Image
+                                Name="imgPreviewIcon"
+                                Width="24"
+                                Height="24"
+                                Margin="14,0,0,0"
+                                VerticalAlignment="Center" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Width="100"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
+                            <TextBox
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Width="330"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding SearchSource.Url}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Width="100"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
+                            <TextBox
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Width="330"
+                                Margin="10,0,10,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding SearchSource.ActionKeyword}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Width="100"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
+                            <CheckBox
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                IsChecked="{Binding SearchSource.Enabled}" />
+                        </StackPanel>
+                    </StackPanel>
+                </Grid>
+            </StackPanel>
+        </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="10,0,5,0"
+                    Click="OnCancelButtonClick"
+                    Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
+                <Button
+                    Width="100"
+                    Margin="5,0,10,0"
+                    Click="OnConfirmButtonClick"
+                    Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
+            </StackPanel>
+        </Border>
+    </Grid>
+    <!--
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="80" />
+        </Grid.RowDefinitions>
+        <Border
+            Padding="26,26,26,0"
+            Background="#ffffff"
+            BorderBrush="#e5e5e5"
+            BorderThickness="0,0,0,1">
             <Grid>
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel Orientation="Vertical">
-                        <TextBlock 
-                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
-                        <TextBlock 
-                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_2}" FontWeight="SemiBold" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Center" Margin="0 12 0 12"/>
-                        <TextBlock 
-                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_3}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left" Margin="0 0 0 14"/>
+                        <TextBlock
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
+                        <TextBlock
+                            Margin="0,12,0,12"
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_guide_2}"
+                            TextAlignment="Center"
+                            TextWrapping="WrapWithOverflow" />
+                        <TextBlock
+                            Margin="0,0,0,14"
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_guide_3}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="10" FontSize="14" VerticalAlignment="Center" Width="100"
-                                HorizontalAlignment="Stretch" Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
-                        <TextBox Text="{Binding SearchSource.Title}" Margin="10" Width="330"
-                                VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        
+                        <TextBlock
+                            Width="100"
+                            Margin="10"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
+                        <TextBox
+                            Width="330"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding SearchSource.Title}" />
+
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
-                           HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_icon}" Width="100" />
-                        <Button Click="OnSelectIconClick" Height="35" VerticalAlignment="Center" Margin="10 0 0 0"
-                              Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
-                        <Image Name="imgPreviewIcon" Width="24" Height="24" Margin="14 0 0 0" VerticalAlignment="Center"/>
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Width="100"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
+                        <Button
+                            Height="35"
+                            Margin="10,0,0,0"
+                            VerticalAlignment="Center"
+                            Click="OnSelectIconClick"
+                            Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
+                        <Image
+                            Name="imgPreviewIcon"
+                            Width="24"
+                            Height="24"
+                            Margin="14,0,0,0"
+                            VerticalAlignment="Center" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="10" FontSize="14" VerticalAlignment="Center" Width="100"
-                                HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
-                        <TextBox Text="{Binding SearchSource.Url}" Margin="10" Grid.Row="1" Width="330" Grid.Column="1"
-                                VerticalAlignment="Center" HorizontalAlignment="Left" />
+                        <TextBlock
+                            Width="100"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Width="330"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding SearchSource.Url}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Width="100"
-                                HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
-                        <TextBox Text="{Binding SearchSource.ActionKeyword}" Margin="10 0 10 0" Grid.Row="2" Width="330" Grid.Column="1"
-                                VerticalAlignment="Center" HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Width="100"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
+                        <TextBox
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Width="330"
+                            Margin="10,0,10,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding SearchSource.ActionKeyword}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Width="100"
-                           HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
-                        <CheckBox IsChecked="{Binding SearchSource.Enabled}" Margin="10" Grid.Row="3" Grid.Column="1"
-                             VerticalAlignment="Center" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Width="100"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
+                        <CheckBox
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="10"
+                            VerticalAlignment="Center"
+                            IsChecked="{Binding SearchSource.Enabled}" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
         </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button Click="OnCancelButtonClick"
-                    Margin="10 0 5 0" Width="100" Height="35"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
-            <Button Click="OnConfirmButtonClick"
-                    Margin="5 0 10 0" Width="100" Height="35"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                Width="100"
+                Margin="10,0,5,0"
+                Click="OnCancelButtonClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
+            <Button
+                Width="100"
+                Margin="5,0,10,0"
+                Click="OnConfirmButtonClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
         </StackPanel>
     </Grid>
+    -->
 </Window>
\ No newline at end of file

From ea179e54552f0d1c0881f99aa10522c47bf67b18 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 29 Nov 2021 06:06:08 +1100
Subject: [PATCH 101/107] shorten version compare logic

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 60059c7e9..8db54de35 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -555,8 +555,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             var newMetadata = JsonSerializer.Deserialize<PluginMetadata>(File.ReadAllText(metadataPath));
             return Context.API.GetAllPlugins()
                                 .Any(x => x.Metadata.ID == newMetadata.ID 
-                                    && (x.Metadata.Version == newMetadata.Version 
-                                        || newMetadata.Version.CompareTo(x.Metadata.Version) < 0));
+                                    && newMetadata.Version.CompareTo(x.Metadata.Version) <= 0);
         }
     }
 }

From 056bffeda9df79b7eb14b57a68b4d0c4fcae643b Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 29 Nov 2021 06:34:58 +1100
Subject: [PATCH 102/107] Shell version bump

---
 Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
index 6b20eeef9..b71dba2da 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.5",
+  "Version": "1.4.6",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",

From 83feb096c80ab8076d5d83987860ac5b5bcfbdbe Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 29 Nov 2021 08:07:08 +1100
Subject: [PATCH 103/107] update to constants and change method name to
 OpenThemeFolder

---
 Flow.Launcher.Infrastructure/Constant.cs          |  4 ++++
 Flow.Launcher/MainWindow.xaml.cs                  |  7 +++----
 Flow.Launcher/SettingWindow.xaml                  |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs               | 10 +++++-----
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs |  3 ---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 081dd9909..cd49217a4 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -35,6 +35,10 @@ namespace Flow.Launcher.Infrastructure
 
         public const string DefaultTheme = "Win11Light";
 
+        public const string Light = "Light";
+        public const string Dark = "Dark";
+        public const string System = "System";
+
         public const string Themes = "Themes";
         public const string Settings = "Settings";
         public const string Logs = "Logs";
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 718606ff7..ef0c8f932 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -16,6 +16,7 @@ using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
 using DragEventArgs = System.Windows.DragEventArgs;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using NotifyIcon = System.Windows.Forms.NotifyIcon;
+using Flow.Launcher.Infrastructure;
 
 namespace Flow.Launcher
 {
@@ -480,16 +481,14 @@ namespace Flow.Launcher
 
         public void InitializeDarkMode()
         {
-            if (_settings.DarkMode == "Light")
+            if (_settings.DarkMode == Constant.Light)
             {
                 ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Light;
             }
-            else if (_settings.DarkMode == "Dark")
+            else if (_settings.DarkMode == Constant.Dark)
             {
                 ModernWpf.ThemeManager.Current.ApplicationTheme = ModernWpf.ApplicationTheme.Dark;
             }
-            else
-            { }
         }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9278b5680..e5fbd53c8 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1949,7 +1949,7 @@
                                                     Width="180"
                                                     Margin="0,0,18,0"
                                                     HorizontalAlignment="Center"
-                                                    Click="OpenPluginFolder"
+                                                    Click="OpenThemeFolder"
                                                     Content="{DynamicResource OpenThemeFolder}"
                                                     DockPanel.Dock="Top" />
                                                 <TextBlock Style="{StaticResource Glyph}">
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index d8bc4da6a..3505269f2 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -265,7 +265,7 @@ namespace Flow.Launcher
             Close();
         }
 
-        private void OpenPluginFolder(object sender, RoutedEventArgs e)
+        private void OpenThemeFolder(object sender, RoutedEventArgs e)
         {
             PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
         }
@@ -277,7 +277,7 @@ namespace Flow.Launcher
 
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {
-            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs));
+            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
         }
 
         private void OnPluginStoreRefreshClick(object sender, RoutedEventArgs e)
@@ -308,9 +308,9 @@ namespace Flow.Launcher
 
         private void DarkModeSelectedIndexChanged(object sender, EventArgs e) => ThemeManager.Current.ApplicationTheme = settings.DarkMode switch
         {
-            "Light" => ApplicationTheme.Light,
-            "Dark" => ApplicationTheme.Dark,
-            "System" => null,
+            Constant.Light => ApplicationTheme.Light,
+            Constant.Dark => ApplicationTheme.Dark,
+            Constant.System => null,
             _ => ThemeManager.Current.ApplicationTheme
         };
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 5a0d816b9..96c14ebe0 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -15,12 +15,10 @@ using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-using ApplicationTheme = ModernWpf.ApplicationTheme;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -387,7 +385,6 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-
         public ResultsViewModel PreviewResults
         {
             get

From 489e739a508ad6ecee8f881ecae01c823dade348 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 29 Nov 2021 12:22:23 +0900
Subject: [PATCH 104/107] Add Korean String / Change some hardcoded text to
 string / Remove Darkmode Tip

---
 Flow.Launcher/Languages/en.xaml  |  11 ++--
 Flow.Launcher/Languages/ko.xaml  | 104 +++++++++++++++++++++----------
 Flow.Launcher/SettingWindow.xaml |   5 +-
 3 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9b2827d5e..e7803ae9b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -55,15 +55,17 @@
     <system:String x:Key="disable">Off</system:String>
     <system:String x:Key="actionKeywordsTitle">Action keyword Setting</system:String>
     <system:String x:Key="actionKeywords">Action keyword</system:String>
-    <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
-    <system:String x:Key="newActionKeyword">New action keyword:</system:String>
-    <system:String x:Key="currentPriority">Current Priority:</system:String>
-    <system:String x:Key="newPriority">New Priority:</system:String>
+    <system:String x:Key="currentActionKeywords">Current action keyword</system:String>
+    <system:String x:Key="newActionKeyword">New action keyword</system:String>
+    <system:String x:Key="currentPriority">Current Priority</system:String>
+    <system:String x:Key="newPriority">New Priority</system:String>
     <system:String x:Key="priority">Priority</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
     <system:String x:Key="author">Author:</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
     <system:String x:Key="plugin_query_time">Query time:</system:String>
+    <system:String x:Key="plugin_query_version">| Version</system:String>
+    <system:String x:Key="plugin_query_web">Website</system:String>
 
 
     <!--  Setting Plugin Store  -->
@@ -85,7 +87,6 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="DarkMode">Dark Mode</system:String>
-    <system:String x:Key="DarkModeTip">System settings will take effect from the next run</system:String>
     <system:String x:Key="DarkModeSystem">System Default</system:String>
     <system:String x:Key="DarkModeLight">Light</system:String>
     <system:String x:Key="DarkModeDark">Dark</system:String>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 649895cea..2c3e733ed 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <!--MainWindow-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">핫키 등록 실패: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">{0}을 실행할 수 없습니다.</system:String>
     <system:String x:Key="invalidFlowLauncherPluginFileFormat">Flow Launcher 플러그인 파일 형식이 유효하지 않습니다.</system:String>
@@ -14,8 +15,9 @@
     <system:String x:Key="iconTrayAbout">정보</system:String>
     <system:String x:Key="iconTrayExit">종료</system:String>
     <system:String x:Key="closeWindow">닫기</system:String>
+    <system:String x:Key="GameMode">게임 모드</system:String>
 
-    <!--Setting General-->
+    <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
     <system:String x:Key="general">일반</system:String>
     <system:String x:Key="portableMode">포터블 모드</system:String>
@@ -33,41 +35,48 @@
     <system:String x:Key="maxShowResults">표시할 결과 수</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">전체화면 모드에서는 핫키 무시</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
+    <system:String x:Key="defaultFileManager">기본 파일관리자</system:String>
+    <system:String x:Key="defaultFileManagerToolTip">폴더를 열 때 사용할 파일관리자를 선택하세요.</system:String>
     <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
     <system:String x:Key="autoUpdates">자동 업데이트</system:String>
     <system:String x:Key="selectPythonDirectory">선택</system:String>
     <system:String x:Key="hideOnStartup">시작 시 Flow Launcher 숨김</system:String>
     <system:String x:Key="hideNotifyIcon">트레이 아이콘 숨기기</system:String>
-    <system:String x:Key="querySearchPrecision">쿼리 검색 정확도</system:String>
-    <system:String x:Key="querySearchPrecisionToolTip">검색 결과가 좀 더 정확해집니다.</system:String>
+    <system:String x:Key="querySearchPrecision">쿼리 검색 정밀도</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">검색 결과에 필요한 최소 매치 점수를 변경합니다.</system:String>
     <system:String x:Key="ShouldUsePinyin">항상 Pinyin 사용</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Pinyin을 사용하여 검색할 수 있습니다. Pinyin(병음)은 로마자 중국어 입력 방식입니다.</system:String>
     <system:String x:Key="shadowEffectNotAllowed">반투명 흐림 효과를 사용하는 경우, 그림자 효과를 쓸 수 없습니다.</system:String>
 
-    <!--Setting Plugin-->
+    <!--  Setting Plugin  -->
     <system:String x:Key="plugin">플러그인</system:String>
     <system:String x:Key="browserMorePlugins">플러그인 더 찾아보기</system:String>
-    <system:String x:Key="enable">On</system:String>
-    <system:String x:Key="disable">Off</system:String>
+    <system:String x:Key="enable">켬</system:String>
+    <system:String x:Key="disable">끔</system:String>
     <system:String x:Key="actionKeywords">액션 키워드</system:String>
+    <system:String x:Key="currentActionKeywords">현재 액션 키워드</system:String>
+    <system:String x:Key="newActionKeyword">새 액션 키워드</system:String>
     <system:String x:Key="currentPriority">현재 중요도:</system:String>
     <system:String x:Key="newPriority">새 중요도:</system:String>
     <system:String x:Key="priority">중요도</system:String>
-    <system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
-    <system:String x:Key="author">저자</system:String>
+    <system:String x:Key="pluginDirectory">플러그인 폴더</system:String>
+    <system:String x:Key="author">제작자</system:String>
     <system:String x:Key="plugin_init_time">초기화 시간:</system:String>
     <system:String x:Key="plugin_query_time">쿼리 시간:</system:String>
-    
-    
-    <!--Setting Plugin Store-->
+    <system:String x:Key="plugin_query_version">| 버전</system:String>
+    <system:String x:Key="plugin_query_web">웹사이트</system:String>
+
+
+    <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">플러그인 스토어</system:String>
     <system:String x:Key="refresh">새로고침</system:String>
     <system:String x:Key="install">설치</system:String>
 
 
-    <!--Setting Theme-->
+    <!--  Setting Theme  -->
     <system:String x:Key="theme">테마</system:String>
-    <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
+    <system:String x:Key="browserMoreThemes">테마 갤러리</system:String>
+    <system:String x:Key="howToCreateTheme">테마 제작 안내</system:String>
     <system:String x:Key="hiThere">Hi There</system:String>
     <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
     <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
@@ -77,8 +86,17 @@
     <system:String x:Key="theme_load_failure_parse_error">{0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다.</system:String>
     <system:String x:Key="ThemeFolder">테마 폴더</system:String>
     <system:String x:Key="OpenThemeFolder">테마 폴더 열기</system:String>
+    <system:String x:Key="DarkMode">다크 모드</system:String>
+    <system:String x:Key="DarkModeTip">System settings will take effect from the next run</system:String>
+    <system:String x:Key="DarkModeSystem">시스템 기본</system:String>
+    <system:String x:Key="DarkModeLight">밝게</system:String>
+    <system:String x:Key="DarkModeDark">어둡게</system:String>
+    <system:String x:Key="SoundEffect">소리 효과</system:String>
+    <system:String x:Key="SoundEffectTip">검색창을 열 때 작은 소리를 재생합니다.</system:String>
+    <system:String x:Key="Animation">애니메이션</system:String>
+    <system:String x:Key="AnimationTip">일부 UI에 애니메이션을 사용합니다.</system:String>
 
-    <!--Setting Hotkey-->
+    <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">핫키</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher 핫키</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Flow Launcher를 열 때 사용할 단축키를 입력합니다.</system:String>
@@ -87,7 +105,7 @@
     <system:String x:Key="showOpenResultHotkey">단축키 표시</system:String>
     <system:String x:Key="showOpenResultHotkeyToolTip">결과창에서 결과 선택 단축키를 표시합니다.</system:String>
     <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
-    <system:String x:Key="customQuery">Query</system:String>
+    <system:String x:Key="customQuery">쿼리</system:String>
     <system:String x:Key="delete">삭제</system:String>
     <system:String x:Key="edit">편집</system:String>
     <system:String x:Key="add">추가</system:String>
@@ -95,10 +113,11 @@
     <system:String x:Key="deleteCustomHotkeyWarning">{0} 플러그인 핫키를 삭제하시겠습니까?</system:String>
     <system:String x:Key="queryWindowShadowEffect">그림자 효과</system:String>
     <system:String x:Key="shadowEffectCPUUsage">그림자 효과는 GPU를 사용합니다. 컴퓨터 퍼포먼스가 제한적인 경우 사용을 추천하지 않습니다.</system:String>
+    <system:String x:Key="windowWidthSize">창 넓이</system:String>
     <system:String x:Key="useGlyphUI">플루언트 아이콘 사용</system:String>
     <system:String x:Key="useGlyphUIEffect">결과 및 일부 메뉴에서 플루언트 아이콘을 사용합니다.</system:String>
 
-    <!--Setting Proxy-->
+    <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP 프록시</system:String>
     <system:String x:Key="enableProxy">HTTP 프록시 켜기</system:String>
     <system:String x:Key="server">HTTP 서버</system:String>
@@ -114,26 +133,41 @@
     <system:String x:Key="proxyIsCorrect">프록시 설정 정상</system:String>
     <system:String x:Key="proxyConnectFailed">프록시 연결 실패</system:String>
 
-    <!--Setting About-->
+    <!--  Setting About  -->
     <system:String x:Key="about">정보</system:String>
     <system:String x:Key="website">웹사이트</system:String>
+    <system:String x:Key="github">Github</system:String>
+    <system:String x:Key="docs">문서</system:String>
     <system:String x:Key="version">버전</system:String>
     <system:String x:Key="about_activate_times">Flow Launcher를 {0}번 실행했습니다.</system:String>
     <system:String x:Key="checkUpdates">업데이트 확인</system:String>
     <system:String x:Key="newVersionTips">새 버전({0})이 있습니다. Flow Launcher를 재시작하세요.</system:String>
     <system:String x:Key="checkUpdatesFailed">업데이트 확인을 실패했습니다. api.github.com로의 연결 또는 프록시 설정을 확인해주세요.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
-        업데이트 다운로드에 실패했습니다. github-cloud.s3.amazonaws.com의 연결 또는 프록시 설정을 확인해주세요. 
+        업데이트 다운로드에 실패했습니다. github-cloud.s3.amazonaws.com의 연결 또는 프록시 설정을 확인해주세요.
         수동 다운로드를 하려면 https://github.com/Flow-Launcher/Flow.Launcher/releases 으로 방문하세요.
     </system:String>
-    <system:String x:Key="releaseNotes">릴리즈 노트:</system:String>
-    <system:String x:Key="documentation">사용 팁:</system:String>
+    <system:String x:Key="releaseNotes">릴리즈 노트</system:String>
+    <system:String x:Key="documentation">사용 팁</system:String>
+    <system:String x:Key="devtool">개발자도구</system:String>
+    <system:String x:Key="settingfolder">설정 폴더</system:String>
+    <system:String x:Key="logfolder">로그 폴더</system:String>
 
-    <!--Priority Setting Dialog-->
+    <!--  FileManager Setting Dialog  -->
+    <system:String x:Key="fileManagerWindow">파일관리자 선택</system:String>
+    <system:String x:Key="fileManager_tips">사용하려는 파일관리자를 선택하고 필요한 경우 인수를 추가하세요. 기본 인수는 &quot;%d&quot; 이며 해당 위치에 경로가 입력됩니다. 예를들어 &quot;totalcmd.exe /A c:\windows&quot;와 같은 명령이 필요한 경우, 인수는 /A &quot;%d&quot; 입니다.</system:String>
+    <system:String x:Key="fileManager_tips2">&quot;%f&quot;는 특정 파일의 경로를 나타냅니다. 파일관리자에서 선택한 파일/폴더의 위치를 강조하는 기능에서 사용됩니다. 이 인수는 &quot;파일경로 인수&quot; 항목에서만 사용할 수 있습니다. 파일관리자에 해당 기능이 없거나 잘 모를 경우 &quot;%d&quot; 인수를 사용할 수 있습니다.</system:String>
+    <system:String x:Key="fileManager_name">파일관리자</system:String>
+    <system:String x:Key="fileManager_profile_name">프로필 이름</system:String>
+    <system:String x:Key="fileManager_path">파일관리자 경로</system:String>
+    <system:String x:Key="fileManager_directory_arg">폴더경로 인수</system:String>
+    <system:String x:Key="fileManager_file_arg">파일경로 인수</system:String>
+
+    <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">중요도 변경</system:String>
     <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮추고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
     <system:String x:Key="invalidPriority">중요도에 올바른 정수를 입력하세요.</system:String>
-    <!--Action Keyword Setting Dialog-->
+    <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
     <system:String x:Key="newActionKeywords">새 액션 키워드</system:String>
     <system:String x:Key="cancel">취소</system:String>
@@ -145,17 +179,17 @@
     <system:String x:Key="completedSuccessfully">성공적으로 완료했습니다.</system:String>
     <system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
 
-    <!--Custom Query Hotkey Dialog-->
+    <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">커스텀 플러그인 핫키</system:String>
     <system:String x:Key="preview">미리보기</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
     <system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
     <system:String x:Key="update">업데이트</system:String>
 
-    <!--Hotkey Control-->
+    <!--  Hotkey Control  -->
     <system:String x:Key="hotkeyUnavailable">핫키를 사용할 수 없습니다.</system:String>
 
-    <!--Crash Reporter-->
+    <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">버전</system:String>
     <system:String x:Key="reportWindow_time">시간</system:String>
     <system:String x:Key="reportWindow_reproduce">수정을 위해 애플리케이션이 어떻게 충돌했는지 알려주세요.</system:String>
@@ -170,17 +204,19 @@
     <system:String x:Key="reportWindow_report_succeed">보고서를 정상적으로 보냈습니다.</system:String>
     <system:String x:Key="reportWindow_report_failed">보고서를 보내지 못했습니다.</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher에 문제가 발생했습니다.</system:String>
-    
-    <!--General Notice-->
+
+    <!--  General Notice  -->
     <system:String x:Key="pleaseWait">잠시 기다려주세요...</system:String>
-    <!--update-->
+    <!--  update  -->
     <system:String x:Key="update_flowlauncher_update_check">새 업데이트 확인 중</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">새 Flow Launcher 버전({0})을 사용할 수 있습니다.</system:String>
     <system:String x:Key="update_flowlauncher_already_on_latest">이미 가장 최신 버전의 Flow Launcher를 사용중입니다.</system:String>
     <system:String x:Key="update_flowlauncher_update_found">업데이트 발견</system:String>
     <system:String x:Key="update_flowlauncher_updating">업데이트 중...</system:String>
-    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher가 유저 정보 데이터를 새버전으로 옮길 수 없습니다.
-        프로필 데이터 폴더를 수동으로 {0} 에서 {1}로 옮겨주세요. </system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
+        Flow Launcher가 유저 정보 데이터를 새버전으로 옮길 수 없습니다.
+        프로필 데이터 폴더를 수동으로 {0} 에서 {1}로 옮겨주세요.
+    </system:String>
     <system:String x:Key="update_flowlauncher_new_update">새 업데이트</system:String>
     <system:String x:Key="update_flowlauncher_update_error">소프트웨어 업데이트를 설치하는 중에 오류가 발생했습니다.</system:String>
     <system:String x:Key="update_flowlauncher_update">업데이트</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e5fbd53c8..e3fc1b334 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1169,7 +1169,7 @@
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
-                                                                        Text="| version" />
+                                                                        Text="{DynamicResource plugin_query_version}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
@@ -1189,7 +1189,7 @@
                                                                             Foreground="{DynamicResource PluginInfoColor}"
                                                                             NavigateUri="{Binding PluginPair.Metadata.Website}"
                                                                             RequestNavigate="OnRequestNavigate">
-                                                                            <Run Text="Website" />
+                                                                            <Run Text="{DynamicResource plugin_query_web}" />
                                                                         </Hyperlink>
                                                                     </TextBlock>
 
@@ -1920,7 +1920,6 @@
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">
                                                     <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource DarkMode}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource DarkModeTip}" />
                                                 </StackPanel>
                                                 <ComboBox
                                                     x:Name="DarkModeComboBox"

From eb48e121e74e06831baa2e0b4a112500999cafbb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 29 Nov 2021 12:38:01 +0900
Subject: [PATCH 105/107] Add Korean String / Adjust button size and color  /
 Change Action Keyword Height to responsive

---
 Flow.Launcher/ActionKeywords.xaml          | 11 ++++++-----
 Flow.Launcher/Languages/ko.xaml            |  5 +++--
 Flow.Launcher/PriorityChangeWindow.xaml    |  7 ++++---
 Flow.Launcher/SelectFileManagerWindow.xaml |  8 +++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 3d0e00459..e94aac9f6 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -4,12 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="{DynamicResource actionKeywordsTitle}"
     Width="450"
-    Height="345"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     Loaded="ActionKeyword_OnLoaded"
     ResizeMode="NoResize"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
@@ -91,7 +91,7 @@
                             FontWeight="SemiBold"
                             Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal">
+                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="1"
@@ -117,17 +117,18 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
+                    Width="145"
                     Height="30"
                     Margin="10,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
-                    Width="100"
+                    Width="145"
                     Height="30"
                     Margin="5,0,10,0"
-                    Click="btnDone_OnClick">
+                    Click="btnDone_OnClick"
+                    Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
                 </Button>
             </StackPanel>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 2c3e733ed..4df5d67de 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -165,7 +165,7 @@
 
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">중요도 변경</system:String>
-    <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮추고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
+    <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮춰 표시하고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
     <system:String x:Key="invalidPriority">중요도에 올바른 정수를 입력하세요.</system:String>
     <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
@@ -177,10 +177,11 @@
     <system:String x:Key="newActionKeywordsHasBeenAssigned">새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요.</system:String>
     <system:String x:Key="success">성공</system:String>
     <system:String x:Key="completedSuccessfully">성공적으로 완료했습니다.</system:String>
-    <system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
+    <system:String x:Key="actionkeyword_tips">플러그인을 시작하는데 필요한 액션 키워드를 입력하세요. 액션 키워드를 지정하지 않으려면 *를 사용하세요. 이 경우 키워드를 입력하지 않아도 동작합니다.</system:String>
 
     <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">커스텀 플러그인 핫키</system:String>
+    <system:String x:Key="customeQueryHotkeyTips">단축키를 지정하여 특정 쿼리를 자동으로 입력할 수 있습니다. 사용하고 싶은 단축키를 눌러 지정한 후, 사용할 쿼리를 입력하세요.</system:String>
     <system:String x:Key="preview">미리보기</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
     <system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index d8fda81e3..8fb27c470 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -104,17 +104,18 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
+                    Width="145"
                     Height="30"
                     Margin="0,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
-                    Width="100"
+                    Width="145"
                     Height="30"
                     Margin="5,0,0,0"
-                    Click="btnDone_OnClick">
+                    Click="btnDone_OnClick"
+                    Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
                 </Button>
             </StackPanel>
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 6092c1da1..7380baa6a 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -239,21 +239,19 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
-                    Height="30"
+                    Width="145"
                     Margin="0,0,5,0"
                     Click="btnCancel_Click"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
-                    Width="100"
-                    Height="30"
+                    Width="145"
                     Margin="5,0,0,0"
                     Click="btnDone_Click"
                     Content="{DynamicResource done}"
                     ForceCursor="True">
                     <Button.Style>
-                        <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}">
+                        <Style BasedOn="{StaticResource AccentButtonStyle}" TargetType="{x:Type Button}">
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Text.Length, ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
                                     <Setter Property="IsEnabled" Value="False" />

From 8d2186823cb9c6480c73528dab296de824444196 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 29 Nov 2021 12:50:40 +0900
Subject: [PATCH 106/107] Add Game Mode Tooltip in tray.

---
 Flow.Launcher/Languages/en.xaml  | 1 +
 Flow.Launcher/Languages/ko.xaml  | 1 +
 Flow.Launcher/MainWindow.xaml.cs | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index e7803ae9b..c0458b06b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -16,6 +16,7 @@
     <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
     <system:String x:Key="GameMode">Game Mode</system:String>
+    <system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
 
     <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 4df5d67de..adcb8fd3d 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -16,6 +16,7 @@
     <system:String x:Key="iconTrayExit">종료</system:String>
     <system:String x:Key="closeWindow">닫기</system:String>
     <system:String x:Key="GameMode">게임 모드</system:String>
+    <system:String x:Key="GameModeToolTip">핫키 사용을 일시중단합니다.</system:String>
 
     <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index ef0c8f932..8afc07439 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -211,6 +211,7 @@ namespace Flow.Launcher
             exit.Click += (o, e) => Close();
             contextMenu.Items.Add(header);
             contextMenu.Items.Add(open);
+            gamemode.ToolTip = InternationalizationManager.Instance.GetTranslation("GameModeToolTip");
             contextMenu.Items.Add(gamemode);
             contextMenu.Items.Add(settings);
             contextMenu.Items.Add(exit);

From 093a191bbcca3ab8cd85c055e113c16f9e2187d5 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Mon, 29 Nov 2021 01:08:55 -0600
Subject: [PATCH 107/107] Change Icon back to field to maintain backward
 compatibility

---
 Flow.Launcher.Plugin/Result.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 171b30c26..833ada9cd 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -50,7 +50,7 @@ namespace Flow.Launcher.Plugin
         /// <summary>
         /// Delegate to Get Image Source
         /// </summary>
-        public IconDelegate Icon { get; set; }
+        public IconDelegate Icon;
 
         /// <summary>
         /// Information for Glyph Icon