From 8c5e0c948f6e1cc799b912207e8bbeb92967c776 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 6 Jun 2025 17:05:12 +0900
Subject: [PATCH 01/10] Change Tabcontrol to Expander

---
 .../Views/ExplorerSettings.xaml               | 1366 ++++++++---------
 .../Views/ExplorerSettings.xaml.cs            |   49 +-
 2 files changed, 696 insertions(+), 719 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 4302e721a51..eff1b475179 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -10,97 +10,13 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
     xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
+    Margin="-72 0 -19 -14"
     d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
-            <Setter Property="MinWidth" Value="120" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Border
-                            x:Name="LayoutRoot"
-                            Margin="0"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="True">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Border
-                                    x:Name="TabSeparator"
-                                    Width="0"
-                                    Margin="0"
-                                    HorizontalAlignment="Right"
-                                    BorderBrush="{DynamicResource TabViewItemSeparator}"
-                                    BorderThickness="1" />
-
-                                <Border
-                                    x:Name="TabContainer"
-                                    Grid.Column="1"
-                                    Padding="10 5"
-                                    Background="{DynamicResource Color06B}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}">
-                                    <ContentPresenter
-                                        x:Name="ContentPresenter"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        ContentSource="Header"
-                                        Focusable="False"
-                                        RecognizesAccessKey="True"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                        TextElement.FontSize="{TemplateBinding FontSize}"
-                                        TextElement.FontWeight="{TemplateBinding FontWeight}"
-                                        TextElement.Foreground="{DynamicResource Color08B}" />
-                                </Border>
-                            </Grid>
-                        </Border>
-
-                        <ControlTemplate.Triggers>
-                            <!--  Default  -->
-                            <Trigger Property="IsMouseOver" Value="False">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color08B}" />
-                            </Trigger>
-                            <!--  PointerOver  -->
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
-                            </Trigger>
-                            <!--  Selected  -->
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
-                                <Setter Property="Panel.ZIndex" Value="1" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
-                            </Trigger>
-                            <!--  PointerOverSelected  -->
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsMouseOver" Value="True" />
-                                    <Condition Property="IsSelected" Value="True" />
-                                </MultiTrigger.Conditions>
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
-                                <Setter Property="Panel.ZIndex" Value="1" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
-                            </MultiTrigger>
-                            <!--  Disabled  -->
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundDisabled}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
@@ -163,653 +79,685 @@
 
         <core:TranslationConverter x:Key="TranslationConverter" />
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
+
+        <Style x:Key="CustomExpanderStyle" TargetType="Expander">
+            <Setter Property="Margin" Value="0 0 0 5" />
+            <Setter Property="HeaderTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock
+                            Margin="10 2 2 5"
+                            FontSize="14"
+                            Text="{Binding}" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
+            <Setter Property="BorderThickness" Value="0 0 0 1" />
+            <Setter Property="Background" Value="{DynamicResource Color00B}" />
+            <Setter Property="Padding" Value="20 5 20 10" />
+            <!--  Adjusted padding for content  -->
+        </Style>
     </UserControl.Resources>
 
     <Grid Margin="{StaticResource SettingPanelMargin}">
-        <!--  Here Margin="-25 0" for TabControl and Margin="25 0" for content in TabItem are trick to force left alignment  -->
-        <!--  Since head items in TabControl have additional left-right spacing  -->
-        <TabControl
-            x:Name="TabView"
-            MinHeight="0"
-            Margin="-25 -10 0 0"
-            Background="{DynamicResource Color00B}"
-            BorderThickness="0"
-            SelectedIndex="0"
-            TabStripPlacement="Top">
-            <TabControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </TabControl.ItemsPanel>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_generalsetting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <CheckBox
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                        IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-
-                    <CheckBox
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                        IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_file_editor_path}" />
-                    <StackPanel
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        Orientation="Horizontal">
-                        <TextBox
-                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+        <ScrollViewer Margin="0 -10 0 0" VerticalScrollBarVisibility="Auto">
+            <StackPanel x:Name="ExpanderContainer">
+                <!--  General Settings Expander  -->
+                <Expander
+                    x:Name="GeneralSettingsExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_generalsetting_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <CheckBox
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+
+                        <CheckBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Text="{Binding FileEditorPath}"
-                            TextWrapping="NoWrap" />
-                        <Button
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_file_editor_path}" />
+                        <StackPanel
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            Orientation="Horizontal">
+                            <TextBox
+                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding FileEditorPath}"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Command="{Binding OpenFileEditorPathCommand}"
+                                Content="{DynamicResource select}" />
+                        </StackPanel>
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenFileEditorPathCommand}"
-                            Content="{DynamicResource select}" />
-                    </StackPanel>
-
-                    <TextBlock
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_folder_editor_path}" />
-                    <StackPanel
-                        Grid.Row="3"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        Orientation="Horizontal">
-                        <TextBox
-                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_folder_editor_path}" />
+                        <StackPanel
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            Orientation="Horizontal">
+                            <TextBox
+                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding FolderEditorPath}"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Command="{Binding OpenFolderEditorPathCommand}"
+                                Content="{DynamicResource select}" />
+                        </StackPanel>
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Text="{Binding FolderEditorPath}"
-                            TextWrapping="NoWrap" />
-                        <Button
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_shell_path}" />
+                        <StackPanel
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            Orientation="Horizontal">
+                            <TextBox
+                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding ShellPath}"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Command="{Binding OpenShellPathCommand}"
+                                Content="{DynamicResource select}" />
+                        </StackPanel>
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
+                        <ComboBox
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            DisplayMemberPath="Description"
+                            ItemsSource="{Binding IndexSearchEngines}"
+                            SelectedItem="{Binding SelectedIndexSearchEngine}" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
+                        <ComboBox
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenFolderEditorPathCommand}"
-                            Content="{DynamicResource select}" />
-                    </StackPanel>
-
-                    <TextBlock
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_shell_path}" />
-                    <StackPanel
-                        Grid.Row="4"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        Orientation="Horizontal">
+                            DisplayMemberPath="Description"
+                            ItemsSource="{Binding ContentIndexSearchEngines}"
+                            SelectedItem="{Binding SelectedContentSearchEngine}" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
+                        <ComboBox
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            DisplayMemberPath="Description"
+                            ItemsSource="{Binding PathEnumerationEngines}"
+                            SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
                         <TextBox
-                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                             HorizontalAlignment="Left"
+                            Text="{Binding ExcludedFileTypes}"
+                            ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+
+                        <TextBlock
+                            Grid.Row="9"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             VerticalAlignment="Center"
-                            Text="{Binding ShellPath}"
-                            TextWrapping="NoWrap" />
-                        <Button
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_Maximum_Results}" />
+                        <TextBox
+                            Grid.Row="9"
+                            Grid.Column="1"
+                            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
-                            Command="{Binding OpenShellPathCommand}"
-                            Content="{DynamicResource select}" />
-                    </StackPanel>
-
-                    <TextBlock
-                        Grid.Row="5"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
-                    <ComboBox
-                        Grid.Row="5"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        DisplayMemberPath="Description"
-                        ItemsSource="{Binding IndexSearchEngines}"
-                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
-
-                    <TextBlock
-                        Grid.Row="6"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
-                    <ComboBox
-                        Grid.Row="6"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        DisplayMemberPath="Description"
-                        ItemsSource="{Binding ContentIndexSearchEngines}"
-                        SelectedItem="{Binding SelectedContentSearchEngine}" />
-
-                    <TextBlock
-                        Grid.Row="7"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
-                    <ComboBox
-                        Grid.Row="7"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        DisplayMemberPath="Description"
-                        ItemsSource="{Binding PathEnumerationEngines}"
-                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-
-                    <TextBlock
-                        Grid.Row="8"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
-                    <TextBox
-                        Grid.Row="8"
-                        Grid.Column="1"
-                        MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Text="{Binding ExcludedFileTypes}"
-                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-
-                    <TextBlock
-                        Grid.Row="9"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_Maximum_Results}" />
-                    <TextBox
-                        Grid.Row="9"
-                        Grid.Column="1"
-                        MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        MaxLength="6"
-                        PreviewTextInput="AllowOnlyNumericInput"
-                        Text="{Binding MaxResult}"
-                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-
-                    <Button
-                        Grid.Row="10"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        Click="btnOpenIndexingOptions_Click"
-                        Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                </Grid>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_native_context_menu_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <CheckBox
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
-                        IsChecked="{Binding ShowWindowsContextMenu}" />
-
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
-                        TextWrapping="Wrap" />
-
-                    <TextBox
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Stretch"
-                        AcceptsReturn="True"
-                        Text="{Binding WindowsContextMenuIncludedItems}"
-                        TextWrapping="Wrap" />
-
-                    <TextBlock
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
-                        TextWrapping="Wrap" />
-
-                    <TextBox
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Stretch"
-                        AcceptsReturn="True"
-                        Text="{Binding WindowsContextMenuExcludedItems}"
-                        TextWrapping="Wrap" />
-                </Grid>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <DockPanel
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        HorizontalAlignment="Stretch"
-                        LastChildFill="True">
+                            MaxLength="6"
+                            PreviewTextInput="AllowOnlyNumericInput"
+                            Text="{Binding MaxResult}"
+                            ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+
+                        <Button
+                            Grid.Row="10"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            Click="btnOpenIndexingOptions_Click"
+                            Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                    </Grid>
+                </Expander>
+
+                <!--  Native Context Menu Expander  -->
+                <Expander
+                    x:Name="ContextMenuExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_native_context_menu_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <CheckBox
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
+                            IsChecked="{Binding ShowWindowsContextMenu}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Stretch"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuIncludedItems}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Stretch"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuExcludedItems}"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </Expander>
+
+                <!--  Preview Panel Settings Expander  -->
+                <Expander
+                    x:Name="PreviewPanelExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <DockPanel
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            HorizontalAlignment="Stretch"
+                            LastChildFill="True">
+                            <TextBlock
+                                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
+                            <WrapPanel
+                                Width="Auto"
+                                HorizontalAlignment="Right"
+                                DockPanel.Dock="Right">
+                                <CheckBox
+                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
+                                    IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
+                                <CheckBox
+                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
+                                    IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
+                                <CheckBox
+                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
+                                    IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+                                <CheckBox
+                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_age_checkbox}"
+                                    IsChecked="{Binding ShowFileAgeInPreviewPanel}" />
+                            </WrapPanel>
+                        </DockPanel>
+
+                        <DockPanel
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            HorizontalAlignment="Stretch"
+                            LastChildFill="True">
+                            <TextBlock
+                                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                                Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
+                                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
+                            <WrapPanel
+                                Width="Auto"
+                                HorizontalAlignment="Right"
+                                DockPanel.Dock="Right"
+                                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
+                                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                                    <ComboBox
+                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                        ItemsSource="{Binding DateFormatList}"
+                                        SelectedItem="{Binding PreviewPanelDateFormat}" />
+                                    <TextBlock
+                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                        VerticalAlignment="Center"
+                                        Foreground="{DynamicResource Color05B}"
+                                        Text="{Binding PreviewPanelDateFormatDemo}" />
+                                </StackPanel>
+                                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                                    <ComboBox
+                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                        ItemsSource="{Binding TimeFormatList}"
+                                        SelectedItem="{Binding PreviewPanelTimeFormat}" />
+                                    <TextBlock
+                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                        VerticalAlignment="Center"
+                                        Foreground="{DynamicResource Color05B}"
+                                        Text="{Binding PreviewPanelTimeFormatDemo}" />
+                                </StackPanel>
+                            </WrapPanel>
+                        </DockPanel>
+                    </Grid>
+                </Expander>
+
+                <!--  Everything Settings Expander  -->
+                <Expander
+                    x:Name="EverythingExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_everything_setting_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <CheckBox
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
+                            IsChecked="{Binding Settings.EverythingSearchFullPath}" />
+
+                        <CheckBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
+                            IsChecked="{Binding Settings.EverythingEnableRunCount}" />
+
                         <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
                             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             VerticalAlignment="Center"
                             Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
-                        <WrapPanel
-                            Width="Auto"
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Right">
-                            <CheckBox
-                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
-                                IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
-                            <CheckBox
-                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
-                                IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
-                            <CheckBox
-                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
-                                IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
-                            
-                            <CheckBox
-                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_age_checkbox}"
-                                IsChecked="{Binding ShowFileAgeInPreviewPanel}" />
-                        </WrapPanel>
-                    </DockPanel>
-
-                    <DockPanel
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        HorizontalAlignment="Stretch"
-                        LastChildFill="True">
+                            Text="{DynamicResource plugin_explorer_everything_sort_option}" />
+                        <ComboBox
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
+                            SelectedItem="{Binding Settings.SortOption}"
+                            SelectionChanged="EverythingSortOptionChanged">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid>
+                                        <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
+                                    </Grid>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
                         <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
                             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             VerticalAlignment="Center"
                             Foreground="{DynamicResource Color05B}"
-                            IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                            Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
-                            Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
-                        <WrapPanel
-                            Width="Auto"
+                            Text="{DynamicResource plugin_explorer_everything_installed_path}" />
+                        <TextBox
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            HorizontalAlignment="Left"
+                            Text="{Binding EverythingInstalledPath}" />
+
+                        <TextBlock
+                            Name="tbFastSortWarning"
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="Orange"
+                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+                            TextAlignment="Left"
+                            TextWrapping="Wrap"
+                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+                    </Grid>
+                </Expander>
+
+                <!--  Manage Action Keywords Expander  -->
+                <Expander
+                    x:Name="ActionKeywordsExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Stretch"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1">
+                            <ListView
+                                ItemTemplate="{StaticResource ListViewActionKeywords}"
+                                ItemsSource="{Binding ActionKeywordsModels}"
+                                SelectedItem="{Binding SelectedActionKeyword}" />
+                        </Border>
+
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                             HorizontalAlignment="Right"
-                            DockPanel.Dock="Right"
-                            IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                            Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
-                            <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                                <ComboBox
-                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                    ItemsSource="{Binding DateFormatList}"
-                                    SelectedItem="{Binding PreviewPanelDateFormat}" />
-                                <TextBlock
-                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                    VerticalAlignment="Center"
-                                    Foreground="{DynamicResource Color05B}"
-                                    Text="{Binding PreviewPanelDateFormatDemo}" />
-                            </StackPanel>
-                            <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                                <ComboBox
-                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                    ItemsSource="{Binding TimeFormatList}"
-                                    SelectedItem="{Binding PreviewPanelTimeFormat}" />
-                                <TextBlock
-                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                    VerticalAlignment="Center"
-                                    Foreground="{DynamicResource Color05B}"
-                                    Text="{Binding PreviewPanelTimeFormatDemo}" />
-                            </StackPanel>
-                        </WrapPanel>
-                    </DockPanel>
-                </Grid>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_everything_setting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <CheckBox
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
-                        IsChecked="{Binding Settings.EverythingSearchFullPath}" />
-
-                    <CheckBox
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
-                        IsChecked="{Binding Settings.EverythingEnableRunCount}" />
-
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_everything_sort_option}" />
-                    <ComboBox
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
-                        SelectedItem="{Binding Settings.SortOption}"
-                        SelectionChanged="EverythingSortOptionChanged">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <Grid>
-                                    <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-
-                    <TextBlock
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{DynamicResource plugin_explorer_everything_installed_path}" />
-                    <TextBox
-                        Grid.Row="3"
-                        Grid.Column="1"
-                        Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                        HorizontalAlignment="Left"
-                        Text="{Binding EverythingInstalledPath}" />
-
-                    <TextBlock
-                        Name="tbFastSortWarning"
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        VerticalAlignment="Center"
-                        Foreground="Orange"
-                        Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-                        TextAlignment="Left"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-                </Grid>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <Border
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Stretch"
-                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1">
-                        <ListView
-                            ItemTemplate="{StaticResource ListViewActionKeywords}"
-                            ItemsSource="{Binding ActionKeywordsModels}"
-                            SelectedItem="{Binding SelectedActionKeyword}" />
-                    </Border>
-
-                    <StackPanel
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            MinWidth="100"
-                            Command="{Binding EditActionKeywordCommand}"
-                            Content="{DynamicResource plugin_explorer_edit}" />
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-            <TabItem
-                Name="expAccessLinks"
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <Border
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Stretch"
-                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1">
-                        <ListView
-                            x:Name="lbxAccessLinks"
-                            Height="200"
-                            AllowDrop="True"
-                            BorderThickness="1"
-                            DragEnter="lbxAccessLinks_DragEnter"
-                            Drop="LbxAccessLinks_OnDrop"
-                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                            ItemsSource="{Binding Settings.QuickAccessLinks}"
-                            SelectedItem="{Binding SelectedQuickAccessLink}" />
-                    </Border>
-
-                    <StackPanel
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            MinWidth="100"
-                            Command="{Binding RemoveLinkCommand}"
-                            CommandParameter="QuickAccessLink"
-                            Content="{DynamicResource plugin_explorer_delete}" />
-                        <Button
-                            MinWidth="100"
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
-                            Command="{Binding EditLinkCommand}"
-                            CommandParameter="QuickAccessLink"
-                            Content="{DynamicResource plugin_explorer_edit}" />
-                        <Button
-                            MinWidth="100"
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
-                            Command="{Binding AddLinkCommand}"
-                            CommandParameter="QuickAccessLink"
-                            Content="{DynamicResource plugin_explorer_add}" />
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <Grid Margin="25 0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <Border
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Stretch"
-                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1">
-                        <ListView
-                            Name="lbxExcludedPaths"
-                            Height="200"
-                            AllowDrop="True"
-                            DragEnter="lbxAccessLinks_DragEnter"
-                            Drop="LbxExcludedPaths_OnDrop"
-                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                            ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                            SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                    </Border>
-
-                    <StackPanel
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            MinWidth="100"
-                            Command="{Binding RemoveLinkCommand}"
-                            CommandParameter="IndexSearchExcludedPaths"
-                            Content="{DynamicResource plugin_explorer_delete}" />
-                        <Button
-                            MinWidth="100"
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
-                            Command="{Binding EditLinkCommand}"
-                            CommandParameter="IndexSearchExcludedPaths"
-                            Content="{DynamicResource plugin_explorer_edit}" />
-                        <Button
-                            MinWidth="100"
-                            Margin="{StaticResource SettingPanelItemLeftMargin}"
-                            Command="{Binding AddLinkCommand}"
-                            CommandParameter="IndexSearchExcludedPaths"
-                            Content="{DynamicResource plugin_explorer_add}" />
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-        </TabControl>
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Command="{Binding EditActionKeywordCommand}"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                        </StackPanel>
+                    </Grid>
+                </Expander>
+
+                <!--  Quick Access Links Expander  -->
+                <Expander
+                    x:Name="QuickAccessExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
+                    IsExpanded="False"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Stretch"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1">
+                            <ListView
+                                x:Name="lbxAccessLinks"
+                                Height="200"
+                                AllowDrop="True"
+                                BorderThickness="1"
+                                DragEnter="lbxAccessLinks_DragEnter"
+                                Drop="LbxAccessLinks_OnDrop"
+                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                                ItemsSource="{Binding Settings.QuickAccessLinks}"
+                                SelectedItem="{Binding SelectedQuickAccessLink}" />
+                        </Border>
+
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </Grid>
+                </Expander>
+
+                <!--  Index Search Excluded Paths Expander  -->
+                <Expander
+                    x:Name="ExcludedPathsExpander"
+                    Expanded="Expander_Expanded"
+                    Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
+                    IsExpanded="False" BorderThickness="0 0 0 0" Margin="0"
+                    Style="{StaticResource CustomExpanderStyle}">
+                    <Grid Margin="20 5 0 5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Stretch"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1">
+                            <ListView
+                                Name="lbxExcludedPaths"
+                                Height="200"
+                                AllowDrop="True"
+                                DragEnter="lbxAccessLinks_DragEnter"
+                                Drop="LbxExcludedPaths_OnDrop"
+                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+                        </Border>
+
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </Grid>
+                </Expander>
+            </StackPanel>
+        </ScrollViewer>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 9203ece9ae5..0191e8a53ce 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -11,28 +12,39 @@
 
 namespace Flow.Launcher.Plugin.Explorer.Views
 {
-    /// <summary>
-    /// Interaction logic for ExplorerSettings.xaml
-    /// </summary>
     public partial class ExplorerSettings
     {
         private readonly SettingsViewModel viewModel;
+        private List<Expander> _expanders;
 
         public ExplorerSettings(SettingsViewModel viewModel)
         {
             DataContext = viewModel;
-
             InitializeComponent();
-
             this.viewModel = viewModel;
-
-            DataContext = viewModel;
+            // DataContext = viewModel; // Removed duplicate
 
             ActionKeywordModel.Init(viewModel.Settings);
 
-            lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
+            // Ensure lbxAccessLinks and lbxExcludedPaths are initialized before accessing Items
+            // This might require Loaded event if they are not immediately available
+            // For now, assuming they are available after InitializeComponent()
+            if (lbxAccessLinks != null)
+                lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
+            
+            if (lbxExcludedPaths != null)
+                lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
 
-            lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
+            _expanders = new List<Expander>
+            {
+                GeneralSettingsExpander,
+                ContextMenuExpander,
+                PreviewPanelExpander,
+                EverythingExpander,
+                ActionKeywordsExpander,
+                QuickAccessExpander,
+                ExcludedPathsExpander
+            };
         }
 
         private void AccessLinkDragDrop(string containerName, DragEventArgs e)
@@ -93,5 +105,22 @@ private void AllowOnlyNumericInput(object sender, System.Windows.Input.TextCompo
         {
             e.Handled = e.Text.ToCharArray().Any(c => !char.IsDigit(c));
         }
+
+        private void Expander_Expanded(object sender, RoutedEventArgs e)
+        {
+            if (sender is Expander expandedExpander)
+            {
+                // Ensure _expanders is not null and contains items
+                if (_expanders == null || !_expanders.Any()) return;
+
+                foreach (var expander in _expanders)
+                {
+                    if (expander != null && expander != expandedExpander && expander.IsExpanded)
+                    {
+                        expander.IsExpanded = false;
+                    }
+                }
+            }
+        }
     }
 }

From 6cd830c5b5088f30364607a1b6489ea468e9570e Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 6 Jun 2025 17:07:57 +0900
Subject: [PATCH 02/10] Fix Font Color

---
 .../Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index eff1b475179..ca395fc5ec5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -88,6 +88,7 @@
                         <TextBlock
                             Margin="10 2 2 5"
                             FontSize="14"
+                            Foreground="{DynamicResource Color05B}"
                             Text="{Binding}" />
                     </DataTemplate>
                 </Setter.Value>

From c2eca7dc39407212d1fbd1de03a11f475ffc0a59 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 16:15:26 +0800
Subject: [PATCH 03/10] Improve code quality

---
 .../Views/ExplorerSettings.xaml.cs               | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 0191e8a53ce..bb52612e41a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -14,15 +14,17 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 {
     public partial class ExplorerSettings
     {
-        private readonly SettingsViewModel viewModel;
-        private List<Expander> _expanders;
+        private readonly SettingsViewModel _viewModel;
+        private readonly List<Expander> _expanders;
 
         public ExplorerSettings(SettingsViewModel viewModel)
         {
+            _viewModel = viewModel;
             DataContext = viewModel;
+
             InitializeComponent();
-            this.viewModel = viewModel;
-            // DataContext = viewModel; // Removed duplicate
+
+            DataContext = viewModel;
 
             ActionKeywordModel.Init(viewModel.Settings);
 
@@ -63,7 +65,7 @@ private void AccessLinkDragDrop(string containerName, DragEventArgs e)
                     {
                         Path = s
                     };
-                    viewModel.AppendLink(containerName, newFolderLink);
+                    _viewModel.AppendLink(containerName, newFolderLink);
                 }
             }
         }
@@ -88,8 +90,8 @@ private void EverythingSortOptionChanged(object sender, SelectionChangedEventArg
         {
             if (tbFastSortWarning is not null)
             {
-                tbFastSortWarning.Visibility = viewModel.FastSortWarningVisibility;
-                tbFastSortWarning.Text = viewModel.SortOptionWarningMessage;
+                tbFastSortWarning.Visibility = _viewModel.FastSortWarningVisibility;
+                tbFastSortWarning.Text = _viewModel.SortOptionWarningMessage;
             }
         }
         private void LbxAccessLinks_OnDrop(object sender, DragEventArgs e)

From 05cd01d1d61c2cb9b8ddcbb35a3590f584a02d4e Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 16:20:43 +0800
Subject: [PATCH 04/10] Use loaded event to ensure accessability

---
 .../Views/ExplorerSettings.xaml               |  7 ++-
 .../Views/ExplorerSettings.xaml.cs            | 47 ++++++++++---------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index ca395fc5ec5..451d7afb25b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -110,6 +110,7 @@
                     Expanded="Expander_Expanded"
                     Header="{DynamicResource plugin_explorer_generalsetting_header}"
                     IsExpanded="False"
+                    Loaded="GeneralSettingsExpander_Loaded"
                     Style="{StaticResource CustomExpanderStyle}">
 
                     <Grid Margin="20 5 0 5">
@@ -664,6 +665,7 @@
                                 Drop="LbxAccessLinks_OnDrop"
                                 ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
                                 ItemsSource="{Binding Settings.QuickAccessLinks}"
+                                Loaded="lbxAccessLinks_Loaded"
                                 SelectedItem="{Binding SelectedQuickAccessLink}" />
                         </Border>
 
@@ -698,9 +700,11 @@
                 <!--  Index Search Excluded Paths Expander  -->
                 <Expander
                     x:Name="ExcludedPathsExpander"
+                    Margin="0"
+                    BorderThickness="0 0 0 0"
                     Expanded="Expander_Expanded"
                     Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
-                    IsExpanded="False" BorderThickness="0 0 0 0" Margin="0"
+                    IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
                     <Grid Margin="20 5 0 5">
                         <Grid.RowDefinitions>
@@ -728,6 +732,7 @@
                                 Drop="LbxExcludedPaths_OnDrop"
                                 ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
                                 ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                                Loaded="lbxExcludedPaths_Loaded"
                                 SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
                         </Border>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index bb52612e41a..e82c10ae220 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -15,7 +15,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
     public partial class ExplorerSettings
     {
         private readonly SettingsViewModel _viewModel;
-        private readonly List<Expander> _expanders;
+        private readonly List<Expander> _expanders = new();
 
         public ExplorerSettings(SettingsViewModel viewModel)
         {
@@ -27,26 +27,6 @@ public ExplorerSettings(SettingsViewModel viewModel)
             DataContext = viewModel;
 
             ActionKeywordModel.Init(viewModel.Settings);
-
-            // Ensure lbxAccessLinks and lbxExcludedPaths are initialized before accessing Items
-            // This might require Loaded event if they are not immediately available
-            // For now, assuming they are available after InitializeComponent()
-            if (lbxAccessLinks != null)
-                lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
-            
-            if (lbxExcludedPaths != null)
-                lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
-
-            _expanders = new List<Expander>
-            {
-                GeneralSettingsExpander,
-                ContextMenuExpander,
-                PreviewPanelExpander,
-                EverythingExpander,
-                ActionKeywordsExpander,
-                QuickAccessExpander,
-                ExcludedPathsExpander
-            };
         }
 
         private void AccessLinkDragDrop(string containerName, DragEventArgs e)
@@ -124,5 +104,30 @@ private void Expander_Expanded(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        private void lbxAccessLinks_Loaded(object sender, RoutedEventArgs e)
+        {
+            lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
+        }
+
+        private void lbxExcludedPaths_Loaded(object sender, RoutedEventArgs e)
+        {
+            lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
+        }
+
+        private void GeneralSettingsExpander_Loaded(object sender, RoutedEventArgs e)
+        {
+            var expanders = new List<Expander>
+            {
+                GeneralSettingsExpander,
+                ContextMenuExpander,
+                PreviewPanelExpander,
+                EverythingExpander,
+                ActionKeywordsExpander,
+                QuickAccessExpander,
+                ExcludedPathsExpander
+            };
+            _expanders.AddRange(expanders);
+        }
     }
 }

From b29bc75dcb8e4e50de3b48a7aff9716f5ca7f6b6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 16:53:31 +0800
Subject: [PATCH 05/10] Improve setting panel design

---
 .../Views/ExplorerSettings.xaml               | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 451d7afb25b..83ef42688a8 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -10,7 +10,6 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
     xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
-    Margin="-72 0 -19 -14"
     d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -86,7 +85,7 @@
                 <Setter.Value>
                     <DataTemplate>
                         <TextBlock
-                            Margin="10 2 2 5"
+                            Margin="8 5 0 5"
                             FontSize="14"
                             Foreground="{DynamicResource Color05B}"
                             Text="{Binding}" />
@@ -101,8 +100,9 @@
         </Style>
     </UserControl.Resources>
 
-    <Grid Margin="{StaticResource SettingPanelMargin}">
-        <ScrollViewer Margin="0 -10 0 0" VerticalScrollBarVisibility="Auto">
+    <!--  Margin="-2 0 -2 0" is to make sure separator between expanders are expanded to left & right boarder  -->
+    <Grid Margin="-2 0 -2 0">
+        <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel x:Name="ExpanderContainer">
                 <!--  General Settings Expander  -->
                 <Expander
@@ -113,7 +113,8 @@
                     Loaded="GeneralSettingsExpander_Loaded"
                     Style="{StaticResource CustomExpanderStyle}">
 
-                    <Grid Margin="20 5 0 5">
+                    <!--  Margin="32 -10 0 5" is to make sure elements is left aligned to the text in the expander text  -->
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -333,7 +334,7 @@
                     Header="{DynamicResource plugin_explorer_native_context_menu_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -403,7 +404,7 @@
                     Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -500,7 +501,7 @@
                     Header="{DynamicResource plugin_explorer_everything_setting_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -592,7 +593,7 @@
                     Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -638,7 +639,7 @@
                     Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -706,7 +707,7 @@
                     Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
                     IsExpanded="False"
                     Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="20 5 0 5">
+                    <Grid Margin="32 -10 0 5">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />

From 569cb8bd44b743c104ec82dc6598ec8bbad42051 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 16:57:48 +0800
Subject: [PATCH 06/10] Remove grid & scroll viewer & Remove bottom margin

---
 .../Views/ExplorerSettings.xaml               | 1286 ++++++++---------
 1 file changed, 641 insertions(+), 645 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 83ef42688a8..070820a0d12 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -101,670 +101,666 @@
     </UserControl.Resources>
 
     <!--  Margin="-2 0 -2 0" is to make sure separator between expanders are expanded to left & right boarder  -->
-    <Grid Margin="-2 0 -2 0">
-        <ScrollViewer VerticalScrollBarVisibility="Auto">
-            <StackPanel x:Name="ExpanderContainer">
-                <!--  General Settings Expander  -->
-                <Expander
-                    x:Name="GeneralSettingsExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_generalsetting_header}"
-                    IsExpanded="False"
-                    Loaded="GeneralSettingsExpander_Loaded"
-                    Style="{StaticResource CustomExpanderStyle}">
-
-                    <!--  Margin="32 -10 0 5" is to make sure elements is left aligned to the text in the expander text  -->
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <CheckBox
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+    <StackPanel x:Name="ExpanderContainer" Margin="-2 0 -2 0">
+        <!--  General Settings Expander  -->
+        <Expander
+            x:Name="GeneralSettingsExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_generalsetting_header}"
+            IsExpanded="False"
+            Loaded="GeneralSettingsExpander_Loaded"
+            Style="{StaticResource CustomExpanderStyle}">
+
+            <!--  Margin="32 -10 0 0" is to make sure elements is left aligned to the text in the expander text  -->
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <CheckBox
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                    IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+
+                <CheckBox
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                    IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
 
-                        <CheckBox
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_file_editor_path}" />
+                <StackPanel
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{Binding FileEditorPath}"
+                        TextWrapping="NoWrap" />
+                    <Button
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Command="{Binding OpenFileEditorPathCommand}"
+                        Content="{DynamicResource select}" />
+                </StackPanel>
 
-                        <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_file_editor_path}" />
-                        <StackPanel
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            Orientation="Horizontal">
-                            <TextBox
-                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding FileEditorPath}"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Command="{Binding OpenFileEditorPathCommand}"
-                                Content="{DynamicResource select}" />
-                        </StackPanel>
+                <TextBlock
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_folder_editor_path}" />
+                <StackPanel
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{Binding FolderEditorPath}"
+                        TextWrapping="NoWrap" />
+                    <Button
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Command="{Binding OpenFolderEditorPathCommand}"
+                        Content="{DynamicResource select}" />
+                </StackPanel>
 
-                        <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_folder_editor_path}" />
-                        <StackPanel
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            Orientation="Horizontal">
-                            <TextBox
-                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding FolderEditorPath}"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Command="{Binding OpenFolderEditorPathCommand}"
-                                Content="{DynamicResource select}" />
-                        </StackPanel>
+                <TextBlock
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_shell_path}" />
+                <StackPanel
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Text="{Binding ShellPath}"
+                        TextWrapping="NoWrap" />
+                    <Button
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Command="{Binding OpenShellPathCommand}"
+                        Content="{DynamicResource select}" />
+                </StackPanel>
 
-                        <TextBlock
-                            Grid.Row="4"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_shell_path}" />
-                        <StackPanel
-                            Grid.Row="4"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            Orientation="Horizontal">
-                            <TextBox
-                                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding ShellPath}"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Command="{Binding OpenShellPathCommand}"
-                                Content="{DynamicResource select}" />
-                        </StackPanel>
+                <TextBlock
+                    Grid.Row="5"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
+                <ComboBox
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    DisplayMemberPath="Description"
+                    ItemsSource="{Binding IndexSearchEngines}"
+                    SelectedItem="{Binding SelectedIndexSearchEngine}" />
 
-                        <TextBlock
-                            Grid.Row="5"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
-                        <ComboBox
-                            Grid.Row="5"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            DisplayMemberPath="Description"
-                            ItemsSource="{Binding IndexSearchEngines}"
-                            SelectedItem="{Binding SelectedIndexSearchEngine}" />
+                <TextBlock
+                    Grid.Row="6"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
+                <ComboBox
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    DisplayMemberPath="Description"
+                    ItemsSource="{Binding ContentIndexSearchEngines}"
+                    SelectedItem="{Binding SelectedContentSearchEngine}" />
 
-                        <TextBlock
-                            Grid.Row="6"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
-                        <ComboBox
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            DisplayMemberPath="Description"
-                            ItemsSource="{Binding ContentIndexSearchEngines}"
-                            SelectedItem="{Binding SelectedContentSearchEngine}" />
+                <TextBlock
+                    Grid.Row="7"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
+                <ComboBox
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    DisplayMemberPath="Description"
+                    ItemsSource="{Binding PathEnumerationEngines}"
+                    SelectedItem="{Binding SelectedPathEnumerationEngine}" />
 
-                        <TextBlock
-                            Grid.Row="7"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
-                        <ComboBox
-                            Grid.Row="7"
-                            Grid.Column="1"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            DisplayMemberPath="Description"
-                            ItemsSource="{Binding PathEnumerationEngines}"
-                            SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+                <TextBlock
+                    Grid.Row="8"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
+                <TextBox
+                    Grid.Row="8"
+                    Grid.Column="1"
+                    MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Text="{Binding ExcludedFileTypes}"
+                    ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
 
-                        <TextBlock
-                            Grid.Row="8"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
-                        <TextBox
-                            Grid.Row="8"
-                            Grid.Column="1"
-                            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Text="{Binding ExcludedFileTypes}"
-                            ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+                <TextBlock
+                    Grid.Row="9"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_Maximum_Results}" />
+                <TextBox
+                    Grid.Row="9"
+                    Grid.Column="1"
+                    MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    MaxLength="6"
+                    PreviewTextInput="AllowOnlyNumericInput"
+                    Text="{Binding MaxResult}"
+                    ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+
+                <Button
+                    Grid.Row="10"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    Click="btnOpenIndexingOptions_Click"
+                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+            </Grid>
+        </Expander>
+
+        <!--  Native Context Menu Expander  -->
+        <Expander
+            x:Name="ContextMenuExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_native_context_menu_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <CheckBox
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
+                    IsChecked="{Binding ShowWindowsContextMenu}" />
 
-                        <TextBlock
-                            Grid.Row="9"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_Maximum_Results}" />
-                        <TextBox
-                            Grid.Row="9"
-                            Grid.Column="1"
-                            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            MaxLength="6"
-                            PreviewTextInput="AllowOnlyNumericInput"
-                            Text="{Binding MaxResult}"
-                            ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-
-                        <Button
-                            Grid.Row="10"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            Click="btnOpenIndexingOptions_Click"
-                            Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                    </Grid>
-                </Expander>
-
-                <!--  Native Context Menu Expander  -->
-                <Expander
-                    x:Name="ContextMenuExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_native_context_menu_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+                    TextWrapping="Wrap" />
+
+                <TextBox
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Stretch"
+                    AcceptsReturn="True"
+                    Text="{Binding WindowsContextMenuIncludedItems}"
+                    TextWrapping="Wrap" />
 
+                <TextBlock
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+                    TextWrapping="Wrap" />
+
+                <TextBox
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Stretch"
+                    AcceptsReturn="True"
+                    Text="{Binding WindowsContextMenuExcludedItems}"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Expander>
+
+        <!--  Preview Panel Settings Expander  -->
+        <Expander
+            x:Name="PreviewPanelExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <DockPanel
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    LastChildFill="True">
+                    <TextBlock
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
+                    <WrapPanel
+                        Width="Auto"
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Right">
                         <CheckBox
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
-                            IsChecked="{Binding ShowWindowsContextMenu}" />
-
-                        <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
-                            TextWrapping="Wrap" />
-
-                        <TextBox
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Stretch"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuIncludedItems}"
-                            TextWrapping="Wrap" />
-
-                        <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
-                            TextWrapping="Wrap" />
-
-                        <TextBox
-                            Grid.Row="4"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Stretch"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuExcludedItems}"
-                            TextWrapping="Wrap" />
-                    </Grid>
-                </Expander>
-
-                <!--  Preview Panel Settings Expander  -->
-                <Expander
-                    x:Name="PreviewPanelExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <DockPanel
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            HorizontalAlignment="Stretch"
-                            LastChildFill="True">
-                            <TextBlock
-                                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
-                            <WrapPanel
-                                Width="Auto"
-                                HorizontalAlignment="Right"
-                                DockPanel.Dock="Right">
-                                <CheckBox
-                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
-                                    IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
-                                <CheckBox
-                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
-                                    IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
-                                <CheckBox
-                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
-                                    IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
-                                <CheckBox
-                                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_age_checkbox}"
-                                    IsChecked="{Binding ShowFileAgeInPreviewPanel}" />
-                            </WrapPanel>
-                        </DockPanel>
-
-                        <DockPanel
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            HorizontalAlignment="Stretch"
-                            LastChildFill="True">
-                            <TextBlock
-                                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                                Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
-                                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
-                            <WrapPanel
-                                Width="Auto"
-                                HorizontalAlignment="Right"
-                                DockPanel.Dock="Right"
-                                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
-                                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                                    <ComboBox
-                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                        ItemsSource="{Binding DateFormatList}"
-                                        SelectedItem="{Binding PreviewPanelDateFormat}" />
-                                    <TextBlock
-                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                        VerticalAlignment="Center"
-                                        Foreground="{DynamicResource Color05B}"
-                                        Text="{Binding PreviewPanelDateFormatDemo}" />
-                                </StackPanel>
-                                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                                    <ComboBox
-                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                        ItemsSource="{Binding TimeFormatList}"
-                                        SelectedItem="{Binding PreviewPanelTimeFormat}" />
-                                    <TextBlock
-                                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                        VerticalAlignment="Center"
-                                        Foreground="{DynamicResource Color05B}"
-                                        Text="{Binding PreviewPanelTimeFormatDemo}" />
-                                </StackPanel>
-                            </WrapPanel>
-                        </DockPanel>
-                    </Grid>
-                </Expander>
-
-                <!--  Everything Settings Expander  -->
-                <Expander
-                    x:Name="EverythingExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_everything_setting_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
+                            IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
                         <CheckBox
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
-                            IsChecked="{Binding Settings.EverythingSearchFullPath}" />
-
+                            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                            Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
+                            IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
                         <CheckBox
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
-                            IsChecked="{Binding Settings.EverythingEnableRunCount}" />
-
-                        <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_everything_sort_option}" />
-                        <ComboBox
-                            Grid.Row="2"
-                            Grid.Column="1"
                             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
-                            SelectedItem="{Binding Settings.SortOption}"
-                            SelectionChanged="EverythingSortOptionChanged">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <Grid>
-                                        <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
-                                    </Grid>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-
-                        <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_everything_installed_path}" />
-                        <TextBox
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
+                            IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+                        <CheckBox
                             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                            HorizontalAlignment="Left"
-                            Text="{Binding EverythingInstalledPath}" />
-
-                        <TextBlock
-                            Name="tbFastSortWarning"
-                            Grid.Row="4"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            VerticalAlignment="Center"
-                            Foreground="Orange"
-                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-                            TextAlignment="Left"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-                    </Grid>
-                </Expander>
-
-                <!--  Manage Action Keywords Expander  -->
-                <Expander
-                    x:Name="ActionKeywordsExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Stretch"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1">
-                            <ListView
-                                ItemTemplate="{StaticResource ListViewActionKeywords}"
-                                ItemsSource="{Binding ActionKeywordsModels}"
-                                SelectedItem="{Binding SelectedActionKeyword}" />
-                        </Border>
-
-                        <StackPanel
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Command="{Binding EditActionKeywordCommand}"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                        </StackPanel>
-                    </Grid>
-                </Expander>
-
-                <!--  Quick Access Links Expander  -->
-                <Expander
-                    x:Name="QuickAccessExpander"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Stretch"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1">
-                            <ListView
-                                x:Name="lbxAccessLinks"
-                                Height="200"
-                                AllowDrop="True"
-                                BorderThickness="1"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxAccessLinks_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.QuickAccessLinks}"
-                                Loaded="lbxAccessLinks_Loaded"
-                                SelectedItem="{Binding SelectedQuickAccessLink}" />
-                        </Border>
-
-                        <StackPanel
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
+                            Content="{DynamicResource plugin_explorer_previewpanel_display_file_age_checkbox}"
+                            IsChecked="{Binding ShowFileAgeInPreviewPanel}" />
+                    </WrapPanel>
+                </DockPanel>
+
+                <DockPanel
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    LastChildFill="True">
+                    <TextBlock
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                        Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
+                        Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
+                    <WrapPanel
+                        Width="Auto"
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Right"
+                        IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                        Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
+                        <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                            <ComboBox
                                 Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
+                                ItemsSource="{Binding DateFormatList}"
+                                SelectedItem="{Binding PreviewPanelDateFormat}" />
+                            <TextBlock
                                 Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_add}" />
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                Text="{Binding PreviewPanelDateFormatDemo}" />
                         </StackPanel>
-                    </Grid>
-                </Expander>
-
-                <!--  Index Search Excluded Paths Expander  -->
-                <Expander
-                    x:Name="ExcludedPathsExpander"
-                    Margin="0"
-                    BorderThickness="0 0 0 0"
-                    Expanded="Expander_Expanded"
-                    Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
-                    IsExpanded="False"
-                    Style="{StaticResource CustomExpanderStyle}">
-                    <Grid Margin="32 -10 0 5">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Stretch"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1">
-                            <ListView
-                                Name="lbxExcludedPaths"
-                                Height="200"
-                                AllowDrop="True"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxExcludedPaths_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                                Loaded="lbxExcludedPaths_Loaded"
-                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                        </Border>
-
-                        <StackPanel
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
+                        <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                            <ComboBox
                                 Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
+                                ItemsSource="{Binding TimeFormatList}"
+                                SelectedItem="{Binding PreviewPanelTimeFormat}" />
+                            <TextBlock
                                 Margin="{StaticResource SettingPanelItemLeftMargin}"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_add}" />
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                Text="{Binding PreviewPanelTimeFormatDemo}" />
                         </StackPanel>
-                    </Grid>
-                </Expander>
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
+                    </WrapPanel>
+                </DockPanel>
+            </Grid>
+        </Expander>
+
+        <!--  Everything Settings Expander  -->
+        <Expander
+            x:Name="EverythingExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_everything_setting_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <CheckBox
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
+                    IsChecked="{Binding Settings.EverythingSearchFullPath}" />
+
+                <CheckBox
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
+                    IsChecked="{Binding Settings.EverythingEnableRunCount}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_everything_sort_option}" />
+                <ComboBox
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
+                    SelectedItem="{Binding Settings.SortOption}"
+                    SelectionChanged="EverythingSortOptionChanged">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <TextBlock
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource Color05B}"
+                    Text="{DynamicResource plugin_explorer_everything_installed_path}" />
+                <TextBox
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Text="{Binding EverythingInstalledPath}" />
+
+                <TextBlock
+                    Name="tbFastSortWarning"
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    VerticalAlignment="Center"
+                    Foreground="Orange"
+                    Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+                    TextAlignment="Left"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+            </Grid>
+        </Expander>
+
+        <!--  Manage Action Keywords Expander  -->
+        <Expander
+            x:Name="ActionKeywordsExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Border
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                    BorderThickness="1">
+                    <ListView
+                        ItemTemplate="{StaticResource ListViewActionKeywords}"
+                        ItemsSource="{Binding ActionKeywordsModels}"
+                        SelectedItem="{Binding SelectedActionKeyword}" />
+                </Border>
+
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <Button
+                        MinWidth="100"
+                        Command="{Binding EditActionKeywordCommand}"
+                        Content="{DynamicResource plugin_explorer_edit}" />
+                </StackPanel>
+            </Grid>
+        </Expander>
+
+        <!--  Quick Access Links Expander  -->
+        <Expander
+            x:Name="QuickAccessExpander"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Border
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                    BorderThickness="1">
+                    <ListView
+                        x:Name="lbxAccessLinks"
+                        Height="200"
+                        AllowDrop="True"
+                        BorderThickness="1"
+                        DragEnter="lbxAccessLinks_DragEnter"
+                        Drop="LbxAccessLinks_OnDrop"
+                        ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                        ItemsSource="{Binding Settings.QuickAccessLinks}"
+                        Loaded="lbxAccessLinks_Loaded"
+                        SelectedItem="{Binding SelectedQuickAccessLink}" />
+                </Border>
+
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <Button
+                        MinWidth="100"
+                        Command="{Binding RemoveLinkCommand}"
+                        CommandParameter="QuickAccessLink"
+                        Content="{DynamicResource plugin_explorer_delete}" />
+                    <Button
+                        MinWidth="100"
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        Command="{Binding EditLinkCommand}"
+                        CommandParameter="QuickAccessLink"
+                        Content="{DynamicResource plugin_explorer_edit}" />
+                    <Button
+                        MinWidth="100"
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        Command="{Binding AddLinkCommand}"
+                        CommandParameter="QuickAccessLink"
+                        Content="{DynamicResource plugin_explorer_add}" />
+                </StackPanel>
+            </Grid>
+        </Expander>
+
+        <!--  Index Search Excluded Paths Expander  -->
+        <Expander
+            x:Name="ExcludedPathsExpander"
+            Margin="0"
+            BorderThickness="0 0 0 0"
+            Expanded="Expander_Expanded"
+            Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
+            IsExpanded="False"
+            Style="{StaticResource CustomExpanderStyle}">
+            <Grid Margin="32 -10 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Border
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                    BorderThickness="1">
+                    <ListView
+                        Name="lbxExcludedPaths"
+                        Height="200"
+                        AllowDrop="True"
+                        DragEnter="lbxAccessLinks_DragEnter"
+                        Drop="LbxExcludedPaths_OnDrop"
+                        ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                        ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                        Loaded="lbxExcludedPaths_Loaded"
+                        SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+                </Border>
+
+                <StackPanel
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <Button
+                        MinWidth="100"
+                        Command="{Binding RemoveLinkCommand}"
+                        CommandParameter="IndexSearchExcludedPaths"
+                        Content="{DynamicResource plugin_explorer_delete}" />
+                    <Button
+                        MinWidth="100"
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        Command="{Binding EditLinkCommand}"
+                        CommandParameter="IndexSearchExcludedPaths"
+                        Content="{DynamicResource plugin_explorer_edit}" />
+                    <Button
+                        MinWidth="100"
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        Command="{Binding AddLinkCommand}"
+                        CommandParameter="IndexSearchExcludedPaths"
+                        Content="{DynamicResource plugin_explorer_add}" />
+                </StackPanel>
+            </Grid>
+        </Expander>
+    </StackPanel>
 </UserControl>
\ No newline at end of file

From 6614771c3dfafd8a32d4573303f8ff479eea9477 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 6 Jun 2025 17:03:20 +0800
Subject: [PATCH 07/10] Move initialization to constructor

---
 .../Views/ExplorerSettings.xaml               |  1 -
 .../Views/ExplorerSettings.xaml.cs            | 28 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 070820a0d12..b81c3cac3ee 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -108,7 +108,6 @@
             Expanded="Expander_Expanded"
             Header="{DynamicResource plugin_explorer_generalsetting_header}"
             IsExpanded="False"
-            Loaded="GeneralSettingsExpander_Loaded"
             Style="{StaticResource CustomExpanderStyle}">
 
             <!--  Margin="32 -10 0 0" is to make sure elements is left aligned to the text in the expander text  -->
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index e82c10ae220..2c50f1c6f21 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -15,7 +15,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
     public partial class ExplorerSettings
     {
         private readonly SettingsViewModel _viewModel;
-        private readonly List<Expander> _expanders = new();
+        private readonly List<Expander> _expanders;
 
         public ExplorerSettings(SettingsViewModel viewModel)
         {
@@ -27,6 +27,17 @@ public ExplorerSettings(SettingsViewModel viewModel)
             DataContext = viewModel;
 
             ActionKeywordModel.Init(viewModel.Settings);
+
+            _expanders = new List<Expander>
+            {
+                GeneralSettingsExpander,
+                ContextMenuExpander,
+                PreviewPanelExpander,
+                EverythingExpander,
+                ActionKeywordsExpander,
+                QuickAccessExpander,
+                ExcludedPathsExpander
+            };
         }
 
         private void AccessLinkDragDrop(string containerName, DragEventArgs e)
@@ -114,20 +125,5 @@ private void lbxExcludedPaths_Loaded(object sender, RoutedEventArgs e)
         {
             lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
         }
-
-        private void GeneralSettingsExpander_Loaded(object sender, RoutedEventArgs e)
-        {
-            var expanders = new List<Expander>
-            {
-                GeneralSettingsExpander,
-                ContextMenuExpander,
-                PreviewPanelExpander,
-                EverythingExpander,
-                ActionKeywordsExpander,
-                QuickAccessExpander,
-                ExcludedPathsExpander
-            };
-            _expanders.AddRange(expanders);
-        }
     }
 }

From 0c474a979ff48988b7624035c5b97047201e0312 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 6 Jun 2025 20:36:30 +0900
Subject: [PATCH 08/10] Add Hover Style / Adjust Arrow / Adjust Padding

---
 .../Resources/CustomControlTemplate.xaml      |  73 +++++++++++++
 .../Views/ExplorerSettings.xaml               | 101 +++++++++++++++---
 2 files changed, 160 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 08b239c4159..cdaadd45a7b 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2407,6 +2407,79 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- Explorer Plugin Expander -->
+    <Style x:Key="ExpanderHeaderRightArrowStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="RootBorder" Background="Transparent" Padding="16,15,16,15">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentPresenter
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Left"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="True"
+                            Content="{TemplateBinding Content}"
+                            Margin="8 0 0 0"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                            <Grid Grid.Column="1"
+                              Width="20" Height="20"
+                              Margin="8 0 4 0"
+                              VerticalAlignment="Center"
+                              HorizontalAlignment="Right"
+                              Background="Transparent"
+                              RenderTransformOrigin="0.5,0.5"
+                              x:Name="ChevronGrid">
+                                <Grid.RenderTransform>
+                                    <RotateTransform Angle="0"/>
+                                </Grid.RenderTransform>
+                                <Ellipse
+                                x:Name="circle"
+                                Width="19"
+                                Height="19"
+                                Stroke="Transparent"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"/>
+                                <Path
+                                x:Name="arrow"
+                                Data="M 1,1.5 L 4.5,5 L 8,1.5"
+                                Stroke="#666"
+                                StrokeThickness="1"
+                                SnapsToDevicePixels="False"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="RootBorder" Property="Background" Value="{DynamicResource CustomExpanderHover}" />
+                            <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
+                            <Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color05B}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
+                            <Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
+                            <Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color17B}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="ExpanderStyle1" TargetType="{x:Type Expander}">
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="Background" Value="Transparent" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index b81c3cac3ee..0d4710e24fb 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -80,23 +80,96 @@
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
 
         <Style x:Key="CustomExpanderStyle" TargetType="Expander">
-            <Setter Property="Margin" Value="0 0 0 5" />
-            <Setter Property="HeaderTemplate">
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Stretch" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
+            <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Padding" Value="-8 18 24 14" />
+            <Setter Property="Template">
                 <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock
-                            Margin="8 5 0 5"
-                            FontSize="14"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{Binding}" />
-                    </DataTemplate>
+                    <ControlTemplate TargetType="Expander">
+                        <Border
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    SnapsToDevicePixels="true">
+                            <DockPanel>
+                                <ToggleButton
+                            x:Name="HeaderSite"
+                            MinWidth="0"
+                            MinHeight="0"
+                            Margin="0"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                            DockPanel.Dock="Top"
+                            FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontStretch="{TemplateBinding FontStretch}"
+                            FontStyle="{TemplateBinding FontStyle}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}"
+                            IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource ExpanderHeaderRightArrowStyle}" />
+                                <Border x:Name="ContentPresenterBorder"   BorderThickness="0,1,0,0"
+        BorderBrush="{DynamicResource Color03B}">
+                                    <ContentPresenter
+                                x:Name="ExpandSite"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                DockPanel.Dock="Bottom"
+                                Focusable="false" />
+                                    <Border.LayoutTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </Border.LayoutTransform>
+                                </Border>
+                            </DockPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsExpanded" Value="true">
+                                <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
+                                <Setter TargetName="ContentPresenterBorder" Property="BorderThickness" Value="0 1 0 0" />
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
+                                        From="0.0" To="1.0" Duration="0:0:0" />
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.Opacity)"
+                                        From="0.0" To="1.0" Duration="0:0:0" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
+                                        From="1.0" To="0.0" Duration="0:0:0" />
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.Opacity)"
+                                        From="1.0" To="0.0" Duration="0:0:0" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
                 </Setter.Value>
             </Setter>
-            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-            <Setter Property="BorderThickness" Value="0 0 0 1" />
-            <Setter Property="Background" Value="{DynamicResource Color00B}" />
-            <Setter Property="Padding" Value="20 5 20 10" />
-            <!--  Adjusted padding for content  -->
         </Style>
     </UserControl.Resources>
 

From dc3fada88f642800dee716e223a61c1df4cd3eaf Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 6 Jun 2025 20:38:07 +0900
Subject: [PATCH 09/10] Fix Border

---
 .../Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 0d4710e24fb..05135e0d2f5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -86,7 +86,7 @@
             <Setter Property="VerticalContentAlignment" Value="Stretch" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderThickness" Value="0 1 0 0" />
             <Setter Property="Padding" Value="-8 18 24 14" />
             <Setter Property="Template">
                 <Setter.Value>

From 600137c91196c39b96c4881880aef744c3011e5a Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 6 Jun 2025 20:38:37 +0900
Subject: [PATCH 10/10] Fix Border

---
 .../Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 05135e0d2f5..47d53d46360 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -86,7 +86,7 @@
             <Setter Property="VerticalContentAlignment" Value="Stretch" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-            <Setter Property="BorderThickness" Value="0 1 0 0" />
+            <Setter Property="BorderThickness" Value="0 0 0 1" />
             <Setter Property="Padding" Value="-8 18 24 14" />
             <Setter Property="Template">
                 <Setter.Value>