From 318ec131ee372768bc8deb566342858d2fbcc01b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 7 Nov 2022 17:48:58 +0900
Subject: [PATCH] - Changed Expander to Tabcontrol / Add Strings - Adjust
 Tabcontrol templates (releated settingwindow)

---
 Flow.Launcher/SettingWindow.xaml              |  19 +-
 .../Languages/en.xaml                         |  23 +-
 .../Views/ExplorerSettings.xaml               | 673 ++++++++++++------
 3 files changed, 468 insertions(+), 247 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 808531765..61815fce6 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -181,7 +181,7 @@
             </Setter>
             <!--#endregion-->
         </Style>
-        <Style TargetType="{x:Type TabItem}">
+        <Style x:Key="NavTabItem" TargetType="{x:Type TabItem}">
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TabItem}">
@@ -437,7 +437,7 @@
             </Style.Triggers>
         </Style>
         <!--  For Tab Header responsive Width  -->
-        <Style TargetType="{x:Type TabControl}">
+        <Style x:Key="NavTabControl" TargetType="{x:Type TabControl}">
             <Setter Property="FontSize" Value="14" />
             <Setter Property="Template">
                 <Setter.Value>
@@ -588,6 +588,7 @@
                 Grid.ColumnSpan="5"
                 Height="auto"
                 SelectedIndex="1"
+                Style="{DynamicResource NavTabControl}"
                 TabStripPlacement="Left">
                 <TabItem Style="{DynamicResource logo}">
                     <TabItem.Header>
@@ -611,7 +612,7 @@
                         </Grid>
                     </TabItem.Header>
                 </TabItem>
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <!--  LEFT TAB WIDTH  -->
                     <TabItem.Header>
                         <Grid>
@@ -943,7 +944,7 @@
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem KeyDown="OnPluginSettingKeydown">
+                <TabItem KeyDown="OnPluginSettingKeydown" Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1363,7 +1364,7 @@
                 </TabItem>
 
                 <!--#region Plugin Store-->
-                <TabItem KeyDown="PluginStore_OnKeyDown">
+                <TabItem KeyDown="PluginStore_OnKeyDown" Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1742,7 +1743,7 @@
                 </TabItem>
                 <!--#endregion-->
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2319,7 +2320,7 @@
                 </TabItem>
 
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2506,7 +2507,7 @@
                 </TabItem>
 
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2677,7 +2678,7 @@
                         </Border>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index a380aafe2..cd147a3a2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -1,8 +1,9 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <!--Dialogues-->
+    <!--  Dialogues  -->
     <system:String x:Key="plugin_explorer_make_selection_warning">Please make a selection first</system:String>
     <system:String x:Key="plugin_explorer_select_folder_link_warning">Please select a folder link</system:String>
     <system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
@@ -17,7 +18,7 @@
     <system:String x:Key="plugin_explorer_alternative_title">Explorer Alternative</system:String>
     <system:String x:Key="plugin_explorer_directoryinfosearch_error">Error occurred during search: {0}</system:String>
 
-    <!--Controls-->
+    <!--  Controls  -->
     <system:String x:Key="plugin_explorer_delete">Delete</system:String>
     <system:String x:Key="plugin_explorer_edit">Edit</system:String>
     <system:String x:Key="plugin_explorer_add">Add</system:String>
@@ -47,13 +48,17 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
-    
-    
-    <!--Plugin Infos-->
+
+    <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
+    <system:String x:Key="plugin_explorer_Path_Enumeration_Engine">Path Enumeration Engine</system:String>
+    <system:String x:Key="plugin_explorer_Index_Search_Engine">Index Search Engine</system:String>
+    <system:String x:Key="plugin_explorer_Open_Window_Index_Option">Open Window Index Option</system:String>
+
+    <!--  Plugin Infos  -->
     <system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>
     <system:String x:Key="plugin_explorer_plugin_description">Search and manage files and folders. Explorer utilises Windows Index Search</system:String>
 
-    <!--Context menu items-->
+    <!--  Context menu items  -->
     <system:String x:Key="plugin_explorer_copypath">Copy path</system:String>
     <system:String x:Key="plugin_explorer_copyfilefolder">Copy</system:String>
     <system:String x:Key="plugin_explorer_deletefilefolder">Delete</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 43391df0b..5a3f73b0a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -1,60 +1,142 @@
-<UserControl x:Class="Flow.Launcher.Plugin.Explorer.Views.ExplorerSettings"
+<UserControl
+    x:Class="Flow.Launcher.Plugin.Explorer.Views.ExplorerSettings"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Flow.Launcher.Plugin.Explorer.Views.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:qa="clr-namespace:Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
     xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
-    xmlns:converters="clr-namespace:Flow.Launcher.Plugin.Explorer.Views.Converters"
     d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <UserControl.Resources>
-        <DataTemplate x:Key="ListViewTemplateAccessLinks"
-            DataType="qa:AccessLink">
-            <TextBlock Margin="0,5,0,5"
-                Text="{Binding Path, Mode=OneTime}" />
+        <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TabItem}">
+
+                        <Border
+                            x:Name="LayoutRoot"
+                            Margin="0,0,0,0"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
+                            <Grid>
+                                <Border
+                                    x:Name="TabSeparator"
+                                    Width="0"
+                                    Margin="{DynamicResource TabViewItemSeparatorMargin}"
+                                    HorizontalAlignment="Right"
+                                    BorderBrush="{DynamicResource TabViewItemSeparator}"
+                                    BorderThickness="1" />
+                                <Border
+                                    x:Name="TabContainer"
+                                    Grid.Column="1"
+                                    Padding="{DynamicResource TabViewItemHeaderPadding}"
+                                    Background="{DynamicResource TabViewItemHeaderBackground}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter
+                                            x:Name="ContentPresenter"
+                                            Grid.Column="1"
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            ContentSource="Header"
+                                            Focusable="False"
+                                            RecognizesAccessKey="True"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            TextElement.FontSize="{DynamicResource TabViewItemHeaderFontSize}"
+                                            TextElement.FontWeight="{TemplateBinding FontWeight}"
+                                            TextElement.Foreground="{DynamicResource Color05B}" />
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                        <ControlTemplate.Triggers>
+                            <!--  PointerOver  -->
+                            <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>
-        <DataTemplate x:Key="ListViewActionKeywords"
-            DataType="{x:Type views:ActionKeywordModel}">
+        <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
-                <TextBlock Margin="0,5,0,0"
+                <TextBlock
+                    Margin="0,5,0,0"
                     IsEnabled="{Binding Enabled}"
                     Text="{Binding Description, Mode=OneTime}">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
-                                <Trigger Property="IsEnabled"
-                                    Value="True">
-                                    <Setter Property="Foreground"
-                                        Value="{DynamicResource Color05B}" />
+                                <Trigger Property="IsEnabled" Value="True">
+                                    <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
                                 </Trigger>
-                                <Trigger Property="IsEnabled"
-                                    Value="False">
-                                    <Setter Property="Foreground"
-                                        Value="{DynamicResource Color18B}" />
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Foreground" Value="{DynamicResource Color18B}" />
                                 </Trigger>
                             </Style.Triggers>
                         </Style>
                     </TextBlock.Style>
                 </TextBlock>
-                <TextBlock Margin="250,5,0,0"
+                <TextBlock
+                    Margin="250,5,0,0"
                     IsEnabled="{Binding Enabled}"
                     Text="{Binding Keyword}">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
-                                <Trigger Property="IsEnabled"
-                                    Value="True">
-                                    <Setter Property="Foreground"
-                                        Value="{DynamicResource Color05B}" />
+                                <Trigger Property="IsEnabled" Value="True">
+                                    <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
                                 </Trigger>
-                                <Trigger Property="IsEnabled"
-                                    Value="False">
-                                    <Setter Property="Foreground"
-                                        Value="{DynamicResource Color18B}" />
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Foreground" Value="{DynamicResource Color18B}" />
                                 </Trigger>
                             </Style.Triggers>
                         </Style>
@@ -64,127 +146,215 @@
         </DataTemplate>
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
     </UserControl.Resources>
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="100" />
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0"
-            Margin="20,35,0,0">
-            <StackPanel>
-                <Expander Margin="15"
-                    Header="{DynamicResource plugin_explorer_generalsetting_header}"
-                    Expanded="SettingExpander_OnExpanded"
-                    Collapsed="SettingExpander_OnCollapsed">
-                    <StackPanel Orientation="Vertical">
-                        <StackPanel.Resources>
-                            <DataTemplate x:Key="EnumBindingModelItemTemplate">
-                                <TextBlock Text="{Binding Description}" />
-                            </DataTemplate>
-                        </StackPanel.Resources>
-                        <CheckBox Margin="12,10,0,0"
-                            Content="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch}"
-                            IsChecked="{Binding UseWindowsIndexForDirectorySearch}"
-                            ToolTip="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch_tooltip}" />
-                        <CheckBox Margin="12,10,0,0"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-                        <CheckBox Margin="12,10,0,0"
-                            HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_launch_hidden}"
-                            IsChecked="{Binding Settings.LaunchHidden}" />
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="10,6,6,6"
+    <Grid Margin="0">
+        <TabControl
+            x:Name="TabView"
+            MinHeight="0"
+            Background="{DynamicResource Color00B}"
+            BorderThickness="0"
+            SelectedIndex="0"
+            TabStripPlacement="Top">
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_generalsetting_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Grid.Row="0" Margin="30,10,0,0">
+                    <StackPanel>
+                        <StackPanel Orientation="Vertical">
+                            <StackPanel.Resources>
+                                <DataTemplate x:Key="EnumBindingModelItemTemplate">
+                                    <TextBlock Text="{Binding Description}" />
+                                </DataTemplate>
+                            </StackPanel.Resources>
+                            <CheckBox
+                                Margin="0,10,0,0"
+                                Content="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch}"
+                                IsChecked="{Binding UseWindowsIndexForDirectorySearch}"
+                                ToolTip="{DynamicResource plugin_explorer_usewindowsindexfordirectorysearch_tooltip}" />
+                            <CheckBox
+                                Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_editor_path}" />
-                            <TextBox Margin="15"
+                                Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                                IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+                            <CheckBox
+                                Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                TextWrapping="NoWrap"
-                                MaxWidth="250"
-                                Text="{Binding EditorPath}" />
-                            <Button MinWidth="50"
-                                HorizontalAlignment="Left"
-                                Margin="15"
-                                Command="{Binding OpenEditorPath}"
-                                Content="..." />
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Margin="10,6,6,6"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_shell_path}" />
-                            <TextBox Margin="15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                TextWrapping="NoWrap"
-                                MaxWidth="250"
-                                Text="{Binding ShellPath}" />
-                            <Button MinWidth="50"
-                                HorizontalAlignment="Left"
-                                Margin="15"
-                                Command="{Binding OpenShellPath}"
-                                Content="..." />
+                                Content="{DynamicResource plugin_explorer_launch_hidden}"
+                                IsChecked="{Binding Settings.LaunchHidden}" />
+                            <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
+                                        <ColumnDefinition Width="*" SharedSizeGroup="B" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Margin="0,6,16,6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_editor_path}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <StackPanel
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="0,6,6,6"
+                                        Orientation="Horizontal">
+                                        <TextBox
+                                            Width="250"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding EditorPath}"
+                                            TextWrapping="NoWrap" />
+                                        <Button
+                                            MinWidth="50"
+                                            Margin="5,0,0,0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenEditorPath}"
+                                            Content="..." />
+                                    </StackPanel>
+
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="0,16,6,6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_shell_path}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <StackPanel
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Orientation="Horizontal">
+                                        <TextBox
+                                            Width="250"
+                                            Margin="0,10,0,0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding ShellPath}"
+                                            TextWrapping="NoWrap" />
+                                        <Button
+                                            MinWidth="50"
+                                            Margin="5,10,0,0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenShellPath}"
+                                            Content="..." />
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel Margin="0,0,0,5" Orientation="Horizontal">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
+                                        <ColumnDefinition Width="*" SharedSizeGroup="D" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Margin="0,0,10,0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10,15,10,10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        ItemTemplate="{StaticResource EnumBindingModelItemTemplate}"
+                                        ItemsSource="{Binding IndexSearchEngines}"
+                                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="0,0,10,0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        ItemTemplate="{StaticResource EnumBindingModelItemTemplate}"
+                                        ItemsSource="{Binding ContentIndexSearchEngines}"
+                                        SelectedItem="{Binding SelectedContentSearchEngine}" />
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Margin="0,0,10,0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Path_Enumeration_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        ItemTemplate="{StaticResource EnumBindingModelItemTemplate}"
+                                        ItemsSource="{Binding PathEnumerationEngines}"
+                                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+                                </Grid>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <Button
+                                    Margin="0,10,10,20"
+                                    Padding="20,10,20,10"
+                                    Click="btnOpenIndexingOptions_Click"
+                                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                            </StackPanel>
                         </StackPanel>
 
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Index Search Engine"
-                                VerticalAlignment="Center" />
-                            <ComboBox Margin="15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Width="250"
-                                ItemsSource="{Binding IndexSearchEngines }"
-                                SelectedItem="{Binding SelectedIndexSearchEngine}"
-                                ItemTemplate="{StaticResource EnumBindingModelItemTemplate}">
-                            </ComboBox>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Content Search Engine"
-                                VerticalAlignment="Center" />
-                            <ComboBox Margin="15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Width="250"
-                                ItemsSource="{Binding ContentIndexSearchEngines }"
-                                SelectedItem="{Binding SelectedContentSearchEngine}"
-                                ItemTemplate="{StaticResource EnumBindingModelItemTemplate}">
-                            </ComboBox>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Path Enumeration Engine"
-                                VerticalAlignment="Center" />
-                            <ComboBox Margin="15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Width="250"
-                                ItemsSource="{Binding PathEnumerationEngines }"
-                                SelectedItem="{Binding SelectedPathEnumerationEngine}"
-                                ItemTemplate="{StaticResource EnumBindingModelItemTemplate}">
-                            </ComboBox>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <Button Margin="15"
-                                Content="Open Window Index Option"
-                                Click="btnOpenIndexingOptions_Click" />
-                        </StackPanel>
+
                     </StackPanel>
-                </Expander>
-                <Expander Margin="15"
-                    Header="{DynamicResource plugin_explorer_everything_setting_header}"
-                    Expanded="SettingExpander_OnExpanded"
-                    Collapsed="SettingExpander_OnCollapsed">
-                    <StackPanel Orientation="Vertical"
-                        Margin="10">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{DynamicResource plugin_explorer_everything_sort_option}"
-                                Margin="15" />
-                            <ComboBox DockPanel.Dock="Left"
+                </StackPanel>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_everything_setting_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Margin="10" Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal">
+                        <Grid Margin="20,10,0,10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="F" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="0,0,20,0"
+                                VerticalAlignment="Center"
+                                Text="{DynamicResource plugin_explorer_everything_sort_option}"
+                                TextBlock.Foreground="{DynamicResource Color05B}" />
+                            <ComboBox
+                                Grid.Row="1"
+                                Grid.Column="1"
                                 Width="200"
                                 VerticalAlignment="Center"
-                                Margin="10"
                                 ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
                                 SelectedItem="{Binding Settings.SortOption}"
                                 SelectionChanged="EverythingSortOptionChanged">
@@ -196,115 +366,160 @@
                                     </DataTemplate>
                                 </ComboBox.ItemTemplate>
                             </ComboBox>
-                            <TextBlock Name="tbFastSortWarning"
-                                DockPanel.Dock="Right"
-                                Margin="10"
+
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="0,15,20,0"
                                 VerticalAlignment="Center"
-                                Foreground="Orange"
-                                Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-                                TextAlignment="Left"
-                                TextWrapping="Wrap"
-                                Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{DynamicResource plugin_explorer_everything_installed_path}"
-                                Margin="10" />
-                            <TextBox Text="{Binding EverythingInstalledPath}"
-                                Margin="10" />
-                        </StackPanel>
+                                Text="{DynamicResource plugin_explorer_everything_installed_path}"
+                                TextBlock.Foreground="{DynamicResource Color05B}" />
+                            <TextBox
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Width="250"
+                                Margin="0,15,0,0"
+                                Text="{Binding EverythingInstalledPath}" />
+                        </Grid>
                     </StackPanel>
-                </Expander>
-                <Expander Margin="15"
-                    Height="auto"
-                    Expanded="SettingExpander_OnExpanded"
-                    Collapsed="SettingExpander_OnCollapsed"
-                    Header="{DynamicResource plugin_explorer_manageactionkeywords_header}">
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <ListView DockPanel.Dock="Top"
+                    <StackPanel>
+                        <TextBlock
+                            Name="tbFastSortWarning"
+                            Margin="20,10,10,10"
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            Foreground="Orange"
+                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+                            TextAlignment="Left"
+                            TextWrapping="Wrap"
+                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+                    </StackPanel>
+                </StackPanel>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10,10,10,5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
                             ItemTemplate="{StaticResource ListViewActionKeywords}"
                             ItemsSource="{Binding ActionKeywordsModels}"
                             SelectedItem="{Binding SelectedActionKeyword}" />
-                        <Button MinWidth="100"
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
                             Margin="10"
                             Command="{Binding EditActionKeywordCommand}"
                             Content="{DynamicResource plugin_explorer_edit}" />
-                    </DockPanel>
-                </Expander>
-                <Expander Margin="15"
-                    Expanded="SettingExpander_OnExpanded"
-                    Collapsed="SettingExpander_OnCollapsed"
-                    Name="expAccessLinks"
-                    Header="{DynamicResource plugin_explorer_quickaccesslinks_header}">
-                    <ScrollViewer>
-                        <DockPanel HorizontalAlignment="Stretch">
-                            <ListView x:Name="lbxAccessLinks"
+                    </StackPanel>
+                </DockPanel>
+            </TabItem>
+            <TabItem
+                Name="expAccessLinks"
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <ScrollViewer>
+                    <DockPanel HorizontalAlignment="Stretch">
+                        <Border
+                            Margin="10,10,10,5"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1"
+                            DockPanel.Dock="Top">
+                            <ListView
+                                x:Name="lbxAccessLinks"
                                 Height="200"
                                 AllowDrop="True"
+                                BorderThickness="1"
                                 DragEnter="lbxAccessLinks_DragEnter"
                                 Drop="LbxAccessLinks_OnDrop"
-                                DockPanel.Dock="Top"
                                 ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
                                 ItemsSource="{Binding Settings.QuickAccessLinks}"
                                 SelectedItem="{Binding SelectedQuickAccessLink}" />
-                            <StackPanel HorizontalAlignment="Right"
-                                DockPanel.Dock="Bottom"
-                                Orientation="Horizontal">
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding RemoveLinkCommand}"
-                                    CommandParameter="QuickAccessLink"
-                                    Content="{DynamicResource plugin_explorer_delete}" />
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding EditLinkCommand}"
-                                    CommandParameter="QuickAccessLink"
-                                    Content="{DynamicResource plugin_explorer_edit}" />
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding AddLinkCommand}"
-                                    CommandParameter="QuickAccessLink"
-                                    Content="{DynamicResource plugin_explorer_add}" />
-                            </StackPanel>
-                        </DockPanel>
-                    </ScrollViewer>
-                </Expander>
-                <Expander Margin="15"
-                    Expanded="SettingExpander_OnExpanded"
-                    Collapsed="SettingExpander_OnCollapsed"
-                    Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}">
-                    <ScrollViewer>
-                        <DockPanel HorizontalAlignment="Stretch">
-                            <ListView Name="lbxExcludedPaths"
+                        </Border>
+                        <StackPanel
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Bottom"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </DockPanel>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <ScrollViewer>
+                    <DockPanel HorizontalAlignment="Stretch">
+                        <Border
+                            Margin="10,10,10,5"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1"
+                            DockPanel.Dock="Top">
+                            <ListView
+                                Name="lbxExcludedPaths"
+                                Height="200"
                                 AllowDrop="True"
-                                DockPanel.Dock="Top"
                                 DragEnter="lbxAccessLinks_DragEnter"
                                 Drop="LbxExcludedPaths_OnDrop"
                                 ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
                                 ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
                                 SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                            <StackPanel HorizontalAlignment="Right"
-                                DockPanel.Dock="Bottom"
-                                Orientation="Horizontal">
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding RemoveLinkCommand}"
-                                    CommandParameter="IndexSearchExcludedPaths"
-                                    Content="{DynamicResource plugin_explorer_delete}" />
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding EditLinkCommand}"
-                                    CommandParameter="IndexSearchExcludedPaths"
-                                    Content="{DynamicResource plugin_explorer_edit}" />
-                                <Button MinWidth="100"
-                                    Margin="10"
-                                    Command="{Binding AddLinkCommand}"
-                                    CommandParameter="IndexSearchExcludedPaths"
-                                    Content="{DynamicResource plugin_explorer_add}" />
-                            </StackPanel>
-                        </DockPanel>
-                    </ScrollViewer>
-                </Expander>
-            </StackPanel>
-        </StackPanel>
+                        </Border>
+                        <StackPanel
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Bottom"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </DockPanel>
+                </ScrollViewer>
+            </TabItem>
+        </TabControl>
+
     </Grid>
 </UserControl>
\ No newline at end of file