diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index 13e98833a..e44b23232 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -54,6 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Scripts\post_build.ps1 = Scripts\post_build.ps1
 		README.md = README.md
 		SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
+		Settings.XamlStyler = Settings.XamlStyler
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Shell", "Plugins\Flow.Launcher.Plugin.Shell\Flow.Launcher.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"
diff --git a/Flow.Launcher/Resources/Controls/ExCard.xaml b/Flow.Launcher/Resources/Controls/ExCard.xaml
index 8f0eb3cb4..a70c0f4ea 100644
--- a/Flow.Launcher/Resources/Controls/ExCard.xaml
+++ b/Flow.Launcher/Resources/Controls/ExCard.xaml
@@ -14,7 +14,6 @@
                 x:Name="expanderHeader"
                 Padding="0"
                 BorderThickness="1"
-                IsExpanded="{Binding Mode=TwoWay, Path=IsExpanded}"
                 SnapsToDevicePixels="False">
                 <Expander.Style>
                     <Style TargetType="{x:Type Expander}">
@@ -54,7 +53,7 @@
                                                 FontStyle="{TemplateBinding FontStyle}"
                                                 FontWeight="{TemplateBinding FontWeight}"
                                                 Foreground="{TemplateBinding Foreground}"
-                                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=Expander}}">
                                                 <ToggleButton.Style>
                                                     <Style TargetType="{x:Type ToggleButton}">
                                                         <Setter Property="Template">
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
index 675cef7de..40d76a471 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
@@ -6,17 +6,20 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
+    xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
     Title="PluginStore"
-    FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
-    KeyDown="SettingsPanePlugins_OnKeyDown"
     d:DataContext="{d:DesignInstance viewModels:SettingsPanePluginStoreViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
+    KeyDown="SettingsPanePlugins_OnKeyDown"
     mc:Ignorable="d">
     <ui:Page.Resources>
-        <CollectionViewSource x:Key="PluginStoreCollectionView" Source="{Binding ExternalPlugins}" Filter="PluginStoreCollectionView_OnFilter">
+        <CollectionViewSource
+            x:Key="PluginStoreCollectionView"
+            Filter="PluginStoreCollectionView_OnFilter"
+            Source="{Binding ExternalPlugins}">
             <CollectionViewSource.GroupDescriptions>
                 <PropertyGroupDescription PropertyName="Category" />
             </CollectionViewSource.GroupDescriptions>
@@ -34,9 +37,9 @@
         <Border
             Grid.Row="0"
             Grid.Column="0"
-            Padding="5 18 0 0">
+            Padding="5,18,0,0">
             <TextBlock
-                Margin="0 5"
+                Margin="0,5"
                 FontSize="30"
                 Style="{StaticResource PageTitle}"
                 Text="{DynamicResource pluginStore}"
@@ -46,13 +49,13 @@
         <DockPanel
             Grid.Row="0"
             Grid.Column="1"
-            Margin="5 24 0 0">
+            Margin="5,24,0,0">
 
             <TextBox
                 Name="PluginStoreFilterTextbox"
                 Width="150"
                 Height="34"
-                Margin="0 0 26 0"
+                Margin="0,0,26,0"
                 HorizontalAlignment="Right"
                 ContextMenu="{StaticResource TextBoxContextMenu}"
                 DockPanel.Dock="Right"
@@ -72,7 +75,7 @@
                                 Stretch="None">
                                 <VisualBrush.Visual>
                                     <Label
-                                        Padding="10 0 0 0"
+                                        Padding="10,0,0,0"
                                         Content="{DynamicResource searchplugin}"
                                         Foreground="{DynamicResource CustomContextDisabled}" />
                                 </VisualBrush.Visual>
@@ -94,8 +97,8 @@
             </TextBox>
             <Button
                 Height="34"
-                Margin="0 5 10 5"
-                Padding="12 4"
+                Margin="0,5,10,5"
+                Padding="12,4"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 Command="{Binding RefreshExternalPluginsCommand}"
@@ -108,8 +111,8 @@
             Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Margin="4 0 0 0"
-            Padding="0 0 18 0"
+            Margin="4,0,0,0"
+            Padding="0,0,18,0"
             FontSize="14"
             ItemContainerStyle="{StaticResource StoreList}"
             ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
@@ -124,7 +127,7 @@
                 <ItemsPanelTemplate>
                     <wpftk:VirtualizingWrapPanel
                         x:Name="ItemWrapPanel"
-                        Margin="0 0 0 10"
+                        Margin="0,0,0,10"
                         ItemSize="216,184"
                         MouseWheelDelta="48"
                         Orientation="Vertical"
@@ -143,7 +146,7 @@
                                         <Grid>
                                             <StackPanel Orientation="Vertical">
                                                 <TextBlock
-                                                    Margin="2 0 0 10"
+                                                    Margin="2,0,0,10"
                                                     VerticalAlignment="Top"
                                                     FontSize="16"
                                                     FontWeight="Bold"
@@ -159,7 +162,7 @@
                     </GroupStyle.ContainerStyle>
                     <GroupStyle.Panel>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel Orientation="{Binding Orientation, Mode=OneWay}" />
+                            <VirtualizingStackPanel />
                         </ItemsPanelTemplate>
                     </GroupStyle.Panel>
                 </GroupStyle>
@@ -231,10 +234,10 @@
                                     <VirtualizingStackPanel
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="5 0 0 0"
+                                        Margin="5,0,0,0"
                                         Orientation="Horizontal">
                                         <TextBlock
-                                            Margin="0 0 5 0"
+                                            Margin="0,0,5,0"
                                             VerticalAlignment="Center"
                                             FontSize="14"
                                             FontWeight="Bold"
@@ -253,9 +256,12 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="5 4 0 0"
+                                        Margin="5,4,0,0"
                                         TextWrapping="Wrap">
-                                        <Hyperlink Foreground="{DynamicResource Color04B}" NavigateUri="{Binding Website}" RequestNavigate="Hyperlink_OnRequestNavigate">
+                                        <Hyperlink
+                                            Foreground="{DynamicResource Color04B}"
+                                            NavigateUri="{Binding Website}"
+                                            RequestNavigate="Hyperlink_OnRequestNavigate">
                                             <Run FontSize="12" Text="{Binding Author, Mode=OneWay}" />
                                         </Hyperlink>
                                     </TextBlock>
@@ -264,40 +270,40 @@
                                         Grid.Row="0"
                                         Grid.RowSpan="2"
                                         Grid.Column="1"
-                                        Margin="20 0 0 0"
+                                        Margin="20,0,0,0"
                                         HorizontalAlignment="Right"
                                         Orientation="Horizontal">
                                         <Button
                                             MinHeight="42"
-                                            Margin="5 0"
-                                            Padding="15 5"
+                                            Margin="5,0"
+                                            Padding="15,5"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Center"
+                                            Command="{Binding ShowCommandQueryCommand}"
+                                            CommandParameter="install"
                                             Content="{DynamicResource installbtn}"
-                                            Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}"
-                                            Command="{Binding ShowCommandQueryCommand}"
-                                            CommandParameter="install" />
+                                            Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
                                         <Button
                                             MinHeight="42"
-                                            Margin="5 0"
-                                            Padding="15 5"
+                                            Margin="5,0"
+                                            Padding="15,5"
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Center"
+                                            Command="{Binding ShowCommandQueryCommand}"
+                                            CommandParameter="uninstall"
                                             Content="{DynamicResource uninstallbtn}"
-                                            Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding ShowCommandQueryCommand}"
-                                            CommandParameter="uninstall" />
+                                            Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                         <Button
                                             MinHeight="42"
-                                            Margin="5 0"
-                                            Padding="15 5"
+                                            Margin="5,0"
+                                            Padding="15,5"
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Center"
+                                            Command="{Binding ShowCommandQueryCommand}"
+                                            CommandParameter="update"
                                             Content="{DynamicResource updatebtn}"
                                             Style="{DynamicResource AccentButtonStyle}"
-                                            Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Command="{Binding ShowCommandQueryCommand}"
-                                            CommandParameter="update" />
+                                            Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     </VirtualizingStackPanel>
                                 </Grid>
                             </ui:Flyout>
@@ -308,15 +314,15 @@
                                     <Image
                                         Width="32"
                                         Height="32"
-                                        Margin="18 24 0 0"
+                                        Margin="18,24,0,0"
                                         HorizontalAlignment="Left"
                                         RenderOptions.BitmapScalingMode="Fant"
                                         Source="{Binding IcoPath, IsAsync=True}" />
                                     <Border
                                         x:Name="LabelUpdate"
                                         Height="12"
-                                        Margin="10 24 0 0"
-                                        Padding="6 2"
+                                        Margin="10,24,0,0"
+                                        Padding="6,2"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Top"
                                         Background="#45BD59"
@@ -325,7 +331,7 @@
                                         Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                 </StackPanel>
                                 <TextBlock
-                                    Margin="18 10 18 0"
+                                    Margin="18,10,18,0"
                                     FontWeight="SemiBold"
                                     Foreground="{DynamicResource Color05B}"
                                     Text="{Binding Name}"
@@ -333,8 +339,8 @@
                                     ToolTip="{Binding Version}" />
                                 <TextBlock
                                     Height="60"
-                                    Margin="18 6 18 0"
-                                    Padding="0 0 0 10"
+                                    Margin="18,6,18,0"
+                                    Padding="0,0,0,10"
                                     FontSize="12"
                                     Foreground="{DynamicResource Color04B}"
                                     Text="{Binding Description, Mode=OneWay}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index c864d5e7d..0dca6b11a 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -14,7 +14,6 @@
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneThemeViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    Style="{DynamicResource SettingPageBasic}"
     mc:Ignorable="d">
     <ui:Page.Resources>
         <ResourceDictionary>
@@ -112,10 +111,12 @@
                                     Visibility="Visible" />
 
                                 <flowlauncher:ResultListBox
+                                    x:Name="ResultListBox"
                                     Grid.Row="2"
                                     DataContext="{Binding PreviewResults, Mode=OneTime}"
                                     Visibility="Visible" />
-
+                                <Border x:Name="ContextMenu" Visibility="Collapsed" />
+                                <Border x:Name="History" Visibility="Collapsed" />
                             </Grid>
                         </Border>
                     </Border>
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
new file mode 100644
index 000000000..7ea0744f1
--- /dev/null
+++ b/Settings.XamlStyler
@@ -0,0 +1,42 @@
+{
+    "AttributesTolerance": 2,
+    "KeepFirstAttributeOnSameLine": false,
+    "MaxAttributeCharactersPerLine": 0,
+    "MaxAttributesPerLine": 1,
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+    "SeparateByGroups": false,
+    "AttributeIndentation": 0,
+    "AttributeIndentationStyle": 1,
+    "RemoveDesignTimeReferences":  false,
+    "IgnoreDesignTimeReferencePrefix": false,
+    "EnableAttributeReordering": true,
+    "AttributeOrderingRuleGroups": [
+        "x:Class",
+        "xmlns, xmlns:x",
+        "xmlns:*",
+        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+        "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+        "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+        "*:*, *",
+        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+        "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+        "Storyboard.*, From, To, Duration"
+    ],
+    "FirstLineAttributes": "",
+    "OrderAttributesByName": true,
+    "PutEndingBracketOnNewLine": false,
+    "RemoveEndingTagOfEmptyElement": true,
+    "SpaceBeforeClosingSlash": true,
+    "RootElementLineBreakRule": 0,
+    "ReorderVSM": 2,
+    "ReorderGridChildren": false,
+    "ReorderCanvasChildren": false,
+    "ReorderSetters": 0,
+    "FormatMarkupExtension": true,
+    "NoNewLineMarkupExtensions": "x:Bind, Binding",
+    "ThicknessSeparator": 1,
+    "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin, CornerRadius",
+    "FormatOnSave": true,
+    "CommentPadding": 2,
+}