diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 740b0d402..887b13126 100644
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@@ -53,11 +53,11 @@
                         </Button>
                     </Grid>
                 </StackPanel>
-                <StackPanel Margin="26,12,26,0">
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                <StackPanel Margin="26 12 26 0">
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
                         <TextBlock
                             Grid.Column="0"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource actionKeywordsTitle}"
@@ -71,7 +71,7 @@
                             TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 18 0 0" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="1"
@@ -83,14 +83,14 @@
                             x:Name="tbOldActionKeyword"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Margin="14,10,10,10"
+                            Margin="14 10 10 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             FontWeight="SemiBold"
                             Foreground="{DynamicResource Color05B}" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                    <StackPanel Margin="0 0 0 10" Orientation="Horizontal">
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="1"
@@ -101,7 +101,7 @@
                         <TextBox
                             x:Name="tbAction"
                             Width="105"
-                            Margin="10,10,15,10"
+                            Margin="10 10 15 10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center" />
                     </StackPanel>
@@ -112,20 +112,20 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
                     Height="30"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
                     Height="30"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="btnDone_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 02c625da5..8e15816cf 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -7,15 +7,15 @@
     mc:Ignorable="d">
     <Button
         Width="Auto"
+        Click="GetNewHotkey"
         FontSize="13"
         FontWeight="Bold"
-        Foreground="{DynamicResource Color01B}"
-        Click="GetNewHotkey">
+        Foreground="{DynamicResource Color01B}">
         <Button.Template>
             <ControlTemplate TargetType="Button">
                 <Border
                     x:Name="ButtonBorder"
-                    Padding="5,0,5,0"
+                    Padding="5 0 5 0"
                     Background="{DynamicResource ButtonBackgroundColor}"
                     BorderBrush="{DynamicResource ButtonInsideBorder}"
                     BorderThickness="1"
@@ -28,26 +28,21 @@
                             <Condition Property="IsMouseOver" Value="True" />
                             <Condition Property="IsPressed" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMousePressed}" />
-                        <Setter TargetName="ButtonBorder" Property="BorderBrush"
-                                Value="{DynamicResource ButtonMousePressedInsideBorder}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
+                        <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource ButtonMousePressedInsideBorder}" />
                     </MultiTrigger>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
                             <Condition Property="IsMouseOver" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMouseOver}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
                     </MultiTrigger>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
                             <Condition Property="IsPressed" Value="True" />
                         </MultiTrigger.Conditions>
-                        <Setter TargetName="ButtonBorder" Property="Background"
-                                Value="{DynamicResource ButtonMousePressed}" />
-                        <Setter TargetName="ButtonBorder" Property="BorderBrush"
-                                Value="{DynamicResource CustomContextHover}" />
+                        <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
+                        <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource CustomContextHover}" />
                     </MultiTrigger>
                 </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -62,8 +57,8 @@
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Border
-                            Margin="2,5,2,5"
-                            Padding="10,5,10,5"
+                            Margin="2 5 2 5"
+                            Padding="10 5 10 5"
                             Background="{DynamicResource AccentButtonBackground}"
                             BorderThickness="1"
                             CornerRadius="5">
diff --git a/Flow.Launcher/HotkeyControlDialog.xaml b/Flow.Launcher/HotkeyControlDialog.xaml
index 9a5872f4d..1edce6d06 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml
+++ b/Flow.Launcher/HotkeyControlDialog.xaml
@@ -5,7 +5,7 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Background="{DynamicResource PopuBGColor}"
     BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-    BorderThickness="0,1,0,0"
+    BorderThickness="0 1 0 0"
     CornerRadius="8"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
@@ -24,14 +24,14 @@
         </Grid.RowDefinitions>
 
         <!--  Window title and the keys in the hotkey  -->
-        <Grid Grid.Row="0" Margin="26,12,26,0">
+        <Grid Grid.Row="0" Margin="26 12 26 0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <StackPanel>
                 <TextBlock
-                    Margin="0,0,0,0"
+                    Margin="0 0 0 0"
                     FontSize="20"
                     FontWeight="SemiBold"
                     Text="{Binding WindowTitle}"
@@ -42,8 +42,8 @@
                 Grid.Row="1"
                 Width="450"
                 Height="100"
-                Margin="0,100,0,0"
-                Padding="26,12,26,0">
+                Margin="0 100 0 0"
+                Padding="26 12 26 0">
                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                     <ItemsControl ItemsSource="{Binding KeysToDisplay}">
                         <ItemsControl.ItemsPanel>
@@ -56,12 +56,12 @@
                                 <Border
                                     MinWidth="50"
                                     MinHeight="50"
-                                    Margin="5,0,5,0"
+                                    Margin="5 0 5 0"
                                     Padding="8"
                                     Background="{DynamicResource AccentButtonBackground}"
                                     CornerRadius="6">
                                     <TextBlock
-                                        Margin="5,0,5,0"
+                                        Margin="5 0 5 0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         FontSize="18"
@@ -82,9 +82,9 @@
             <Border
                 x:Name="Alert"
                 Width="420"
-                Padding="0, 10"
-                VerticalAlignment="Center"
+                Padding="0 10"
                 HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 Background="{DynamicResource InfoBarWarningBG}"
                 BorderBrush="{DynamicResource InfoBarBD}"
                 BorderThickness="1"
@@ -97,21 +97,21 @@
                     </Grid.ColumnDefinitions>
                     <ui:FontIcon
                         Grid.Column="0"
-                        Margin="20,0,14,0"
+                        Margin="20 0 14 0"
                         VerticalAlignment="Center"
                         FontSize="15"
                         Foreground="{DynamicResource InfoBarWarningIcon}"
                         Glyph="&#xf167;" />
                     <TextBlock
-                        Grid.Column="1"
                         x:Name="tbMsg"
-                        Margin="0,0,0,2"
-                        Padding="0,0,8,0"
+                        Grid.Column="1"
+                        Margin="0 0 0 2"
+                        Padding="0 0 8 0"
                         HorizontalAlignment="Left"
                         FontSize="13"
                         FontWeight="SemiBold"
-                        TextWrapping="Wrap"
-                        Foreground="{DynamicResource Color05B}" />
+                        Foreground="{DynamicResource Color05B}"
+                        TextWrapping="Wrap" />
                 </Grid>
             </Border>
 
@@ -122,7 +122,7 @@
             Grid.Row="2"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0"
+            BorderThickness="0 1 0 0"
             CornerRadius="0 0 8 8">
             <StackPanel
                 Margin="10"
@@ -132,35 +132,35 @@
                     x:Name="OverwriteBtn"
                     Height="30"
                     MinWidth="100"
-                    Margin="0,0,4,0"
+                    Margin="0 0 4 0"
                     Click="Overwrite"
                     Content="{DynamicResource commonOverwrite}"
-                    Visibility="Collapsed"
-                    Style="{StaticResource AccentButtonStyle}" />
+                    Style="{StaticResource AccentButtonStyle}"
+                    Visibility="Collapsed" />
                 <Button
                     x:Name="SaveBtn"
                     Height="30"
                     MinWidth="100"
-                    Margin="0,0,4,0"
+                    Margin="0 0 4 0"
                     Click="Save"
                     Content="{DynamicResource commonSave}"
                     Style="{StaticResource AccentButtonStyle}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,4,0"
+                    Margin="4 0 4 0"
                     Click="Reset"
                     Content="{DynamicResource commonReset}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,4,0"
+                    Margin="4 0 4 0"
                     Click="Delete"
                     Content="{DynamicResource commonDelete}" />
                 <Button
                     Height="30"
                     MinWidth="100"
-                    Margin="4,0,0,0"
+                    Margin="4 0 0 0"
                     Click="Cancel"
                     Content="{DynamicResource commonCancel}" />
             </StackPanel>
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
index 448efb9cf..961f727ae 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
@@ -23,12 +23,12 @@
                         <Border.Style>
                             <Style TargetType="{x:Type Border}">
                                 <Setter Property="Background" Value="{DynamicResource Color12B}" />
-                                <Setter Property="Padding" Value="5,0,5,0" />
+                                <Setter Property="Padding" Value="5 0 5 0" />
                                 <Setter Property="BorderThickness" Value="1" />
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
                                         <Setter Property="Background" Value="Transparent" />
-                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="Padding" Value="0 0 0 0" />
                                         <Setter Property="BorderThickness" Value="0" />
                                     </DataTrigger>
                                 </Style.Triggers>
@@ -51,14 +51,14 @@
                                 <Border.Style>
                                     <Style TargetType="{x:Type Border}">
                                         <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
-                                        <Setter Property="Padding" Value="10,5,10,5" />
-                                        <Setter Property="Margin" Value="2,5,2,5" />
+                                        <Setter Property="Padding" Value="10 5 10 5" />
+                                        <Setter Property="Margin" Value="2 5 2 5" />
                                         <Setter Property="BorderThickness" Value="1" />
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
                                                 <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-                                                <Setter Property="Padding" Value="10,5,10,5" />
-                                                <Setter Property="Margin" Value="2,0,2,0" />
+                                                <Setter Property="Padding" Value="10 5 10 5" />
+                                                <Setter Property="Margin" Value="2 0 2 0" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
index 32fdb62fc..b6a99d9e9 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -127,7 +127,7 @@
                             Style="{DynamicResource StyleImageFadeIn}" />
                         <TextBlock
                             Canvas.Left="205"
-                            Margin="12,0,0,0"
+                            Margin="12 0 0 0"
                             VerticalAlignment="Center"
                             FontSize="30"
                             Foreground="White"
@@ -151,30 +151,30 @@
                     Style="{DynamicResource WizardMove}" />
 
 
-                <StackPanel Width="550" Margin="24,20,24,20">
-                    <StackPanel Margin="0,0,24,0">
+                <StackPanel Width="550" Margin="24 20 24 20">
+                    <StackPanel Margin="0 0 24 0">
                         <TextBlock
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource Welcome_Page1_Title}" />
                         <TextBlock
-                            Margin="0,10,24,0"
+                            Margin="0 10 24 0"
                             FontSize="14"
                             Text="{DynamicResource Welcome_Page1_Text01}"
                             TextWrapping="WrapWithOverflow" />
                         <TextBlock
-                            Margin="0,10,24,0"
+                            Margin="0 10 24 0"
                             FontSize="14"
                             Text="{DynamicResource Welcome_Page1_Text02}"
                             TextWrapping="WrapWithOverflow" />
                         <TextBlock
-                            Margin="0,30,0,0"
+                            Margin="0 30 0 0"
                             FontSize="14"
                             FontWeight="SemiBold"
                             Text="{DynamicResource language}" />
                         <ComboBox
                             Width="200"
-                            Margin="0,10,0,0"
+                            Margin="0 10 0 0"
                             DisplayMemberPath="Display"
                             ItemsSource="{Binding Languages}"
                             SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index f62cec3bf..ca00091f5 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -56,7 +56,7 @@
                     Margin="0"
                     Background="{Binding PreviewBackground}">
                     <StackPanel
-                        Margin="0,80,0,0"
+                        Margin="0 80 0 0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Orientation="Horizontal">
@@ -89,29 +89,29 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page2_Title}" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page2_Text01}"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page2_Text02}"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,30,0,0"
+                        Margin="0 30 0 0"
                         FontSize="14"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncherHotkey}" />
                     <flowlauncher:HotkeyControl
-                        Margin="0,8,0,0"
+                        Margin="0 8 0 0"
                         ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
                         DefaultHotkey="Alt+Space"
                         Type="Hotkey"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index a9e3fa696..0c1dcfea0 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -13,15 +13,15 @@
     <Page.Resources>
         <Style x:Key="KbdLine" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Margin" Value="0,3,0,3" />
+            <Setter Property="Margin" Value="0 3 0 3" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="Kbd" TargetType="Border">
             <Setter Property="CornerRadius" Value="4" />
-            <Setter Property="Padding" Value="12,4,12,4" />
+            <Setter Property="Padding" Value="12 4 12 4" />
             <Setter Property="Background" Value="{DynamicResource Color00B}" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color18B}" />
-            <Setter Property="BorderThickness" Value="1,1,1,2" />
+            <Setter Property="BorderThickness" Value="1 1 1 2" />
         </Style>
         <Style x:Key="KbdText" TargetType="TextBlock">
             <Setter Property="TextAlignment" Value="Center" />
@@ -36,17 +36,17 @@
         </Grid.RowDefinitions>
         <TextBlock
             Grid.Row="0"
-            Margin="24,20,24,14"
+            Margin="24 20 24 14"
             FontSize="20"
             FontWeight="SemiBold"
             Text="{DynamicResource Welcome_Page3_Title}" />
         <ScrollViewer
             Grid.Row="1"
             Height="478"
-            Margin="0,0,0,0"
+            Margin="0 0 0 0"
             HorizontalAlignment="Stretch"
             FontSize="13">
-            <StackPanel Margin="24,0,24,0">
+            <StackPanel Margin="24 0 24 0">
                 <Border
                     BorderBrush="{DynamicResource Color03B}"
                     BorderThickness="0"
@@ -54,7 +54,7 @@
                     <StackPanel>
                         <cc:Card
                             Title="{DynamicResource HotkeyUpDownDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="←+→" Type="Small" />
@@ -62,7 +62,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyLeftRightDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="↑+↓" Type="Small" />
@@ -70,7 +70,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyESCDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="ESC" Type="Small" />
@@ -78,13 +78,13 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyRunDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <cc:HotkeyDisplay Keys="ENTER" Type="Small" />
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyShiftEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="SHIFT+ENTER" Type="Small" />
@@ -92,7 +92,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyCtrlEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="CTRL+ENTER" Type="Small" />
@@ -100,7 +100,7 @@
                         </cc:Card>
                         <cc:Card
                             Title="{DynamicResource HotkeyCtrlShiftEnterDesc}"
-                            BorderThickness="0,0,0,0"
+                            BorderThickness="0 0 0 0"
                             Type="Inside">
                             <StackPanel Orientation="Horizontal">
                                 <cc:HotkeyDisplay Keys="CTRL+SHIFT+ENTER" Type="Small" />
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
index 13f003086..e57718775 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage4"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -36,8 +36,8 @@
         </Style>
         <Style x:Key="RecommendQuery" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Padding" Value="20,7,12,7" />
-            <Setter Property="Margin" Value="4,4,4,4" />
+            <Setter Property="Padding" Value="20 7 12 7" />
+            <Setter Property="Margin" Value="4 4 4 4" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="QueryText" TargetType="TextBlock">
@@ -50,7 +50,7 @@
             <Setter Property="TextAlignment" Value="Left" />
             <Setter Property="TextAlignment" Value="Left" />
             <Setter Property="FontSize" Value="13" />
-            <Setter Property="Margin" Value="0,4,0,0" />
+            <Setter Property="Margin" Value="0 4 0 0" />
             <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
         </Style>
     </Page.Resources>
@@ -81,26 +81,26 @@
                             Canvas.Left="0"
                             Width="450"
                             Height="280"
-                            Margin="0,0,0,0"
+                            Margin="0 0 0 0"
                             Source="../../images/page_img01.png"
                             Style="{DynamicResource StyleImageFadeIn}" />
                     </Canvas>
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page4_Title}" />
                     <TextBlock
-                        Margin="0,10,0,10"
+                        Margin="0 10 0 10"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page4_Text01}"
                         TextWrapping="WrapWithOverflow" />
                     <UniformGrid
-                        Margin="0,14,0,0"
+                        Margin="0 14 0 0"
                         Columns="2"
                         Rows="2">
                         <Border Style="{DynamicResource RecommendQuery}">
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
index 3df4b506e..7495231ae 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -79,18 +79,18 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24,20,24,20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20">
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource Welcome_Page5_Title}" />
                     <TextBlock
-                        Margin="0,10,0,0"
+                        Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page5_Text01}"
                         TextWrapping="WrapWithOverflow" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 30 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnAutoStartupChecked"
                             Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@@ -98,7 +98,7 @@
                             Style="{DynamicResource DefaultCheckBoxStyle}"
                             Unchecked="OnAutoStartupUncheck" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
+                    <StackPanel Margin="0 0 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnHideOnStartupChecked"
                             Content="{DynamicResource hideOnStartup}"
@@ -109,7 +109,7 @@
                     <Button
                         Width="150"
                         Height="40"
-                        Margin="0,60,0,0"
+                        Margin="0 60 0 0"
                         HorizontalAlignment="Right"
                         Click="BtnCancel_OnClick"
                         Content="{DynamicResource done}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
index 89d25377b..5f9e57faa 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
@@ -37,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}"
@@ -49,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"
@@ -75,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>
@@ -97,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}"
@@ -111,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}}"
@@ -125,7 +125,7 @@
                 <ItemsPanelTemplate>
                     <wpftk:VirtualizingWrapPanel
                         x:Name="ItemWrapPanel"
-                        Margin="0,0,0,10"
+                        Margin="0 0 0 10"
                         ItemSize="216,184"
                         MouseWheelDelta="48"
                         ScrollLineDelta="16"
@@ -143,7 +143,7 @@
                                         <Grid>
                                             <StackPanel Orientation="Vertical">
                                                 <TextBlock
-                                                    Margin="2,0,0,10"
+                                                    Margin="2 0 0 10"
                                                     VerticalAlignment="Top"
                                                     FontSize="16"
                                                     FontWeight="Bold"
@@ -231,10 +231,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,7 +253,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="5,4,0,0"
+                                        Margin="5 4 0 0"
                                         TextWrapping="Wrap">
                                         <Hyperlink
                                             Foreground="{DynamicResource Color04B}"
@@ -267,13 +267,13 @@
                                         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}"
@@ -282,8 +282,8 @@
                                             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}"
@@ -292,8 +292,8 @@
                                             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}"
@@ -311,15 +311,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"
@@ -328,7 +328,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}"
@@ -336,8 +336,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/SettingsPaneProxy.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
index 768abbf97..f429a6e29 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
@@ -2,11 +2,11 @@
     x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneProxy"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     Title="Proxy"
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneProxyViewModel}"
@@ -18,8 +18,8 @@
     </Page.Resources>
     <ScrollViewer
         Padding="5 0 24 0"
-        FontSize="14"
         CanContentScroll="True"
+        FontSize="14"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
 
@@ -71,9 +71,9 @@
             <cc:Card Title="{DynamicResource testProxy}" Margin="0 8 0 0">
                 <Button
                     Width="150"
+                    Command="{Binding TestProxyClickedCommand}"
                     Content="{DynamicResource testProxy}"
-                    IsEnabled="{Binding Settings.Proxy.Enabled}"
-                    Command="{Binding TestProxyClickedCommand}"/>
+                    IsEnabled="{Binding Settings.Proxy.Enabled}" />
             </cc:Card>
         </StackPanel>
     </ScrollViewer>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index f5017ced5..80b004ff9 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -60,17 +60,17 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}"
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,0,0,20" Orientation="Horizontal">
+                <StackPanel Margin="0 0 0 20" Orientation="Horizontal">
                     <Grid Width="474" HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -86,23 +86,23 @@
                             Grid.Row="0"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Margin="5,0,0,20">
+                            Margin="5 0 0 20">
                             <TextBlock
-                                Margin="0,0,0,4"
+                                Margin="0 0 0 4"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage01}"
                                 TextWrapping="WrapWithOverflow" />
                             <TextBlock
-                                Margin="0,4,0,4"
+                                Margin="0 4 0 4"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage02}"
                                 TextWrapping="WrapWithOverflow" />
                             <TextBlock
-                                Margin="0,4,0,0"
+                                Margin="0 4 0 0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -112,7 +112,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="5,0,20,0"
+                            Margin="5 0 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -122,14 +122,14 @@
                             Grid.Column="1"
                             Width="120"
                             Height="34"
-                            Margin="5,0,10,0"
+                            Margin="5 0 10 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Text="{Binding Name}" />
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="5,10,20,0"
+                            Margin="5 10 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -139,7 +139,7 @@
                             Grid.Column="1"
                             Width="120"
                             Height="34"
-                            Margin="5,10,10,0"
+                            Margin="5 10 10 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type local:BrowserType}}}"
@@ -147,7 +147,7 @@
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="5,10,20,0"
+                            Margin="5 10 20 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -159,7 +159,7 @@
                             <Button
                                 Height="34"
                                 MinWidth="100"
-                                Margin="5,10,0,0"
+                                Margin="5 10 0 0"
                                 VerticalContentAlignment="Stretch"
                                 Click="OnSelectPathClick"
                                 Content="{DynamicResource flowlauncher_plugin_browserbookmark_browseBrowserBookmark}"
@@ -167,7 +167,7 @@
                             <TextBox
                                 Name="PathTextBox"
                                 Height="34"
-                                Margin="5,10,0,0"
+                                Margin="5 10 0 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding DataDirectoryPath}" />
@@ -180,18 +180,18 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     MinWidth="145"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="CancelEditCustomBrowser"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="btnConfirm"
                     MinWidth="145"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     Click="ConfirmEditCustomBrowser"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 37a7ccb8d..ae0f91d93 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -57,20 +57,20 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource plugin_explorer_manageactionkeywords_header}"
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
                     <TextBlock
                         MinWidth="150"
-                        Margin="0,10,15,10"
+                        Margin="0 10 15 10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -84,10 +84,10 @@
                         PreviewKeyDown="TxtCurrentActionKeyword_OnKeyDown"
                         Text="{Binding ActionKeyword}" />
                 </StackPanel>
-                <StackPanel Margin="0,10,0,15" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 15" Orientation="Horizontal">
                     <TextBlock
                         MinWidth="150"
-                        Margin="0,0,18,0"
+                        Margin="0 0 18 0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -105,20 +105,20 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
                     Height="30"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="DownButton"
                     Width="145"
                     Height="30"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     Click="OnDoneButtonClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource plugin_explorer_actionkeyword_done}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 9848f51cf..26efc6813 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
@@ -5,21 +5,21 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Flow.Launcher.Plugin.Program.ViewModels"
-    mc:Ignorable="d"
     Title="{DynamicResource flowlauncher_plugin_program_directory}"
-    d:DataContext="{d:DesignInstance vm:AddProgramSourceViewModel}"
     Width="Auto"
     Height="276"
+    d:DataContext="{d:DesignInstance vm:AddProgramSourceViewModel}"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Width"
-    WindowStartupLocation="CenterScreen">
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
     <Window.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -59,11 +59,11 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Grid.Row="0" Margin="0 0 0 12">
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_program_edit_program_source_title}"
@@ -77,7 +77,7 @@
                         TextWrapping="WrapWithOverflow" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,10,0" Orientation="Horizontal">
+                <StackPanel Margin="0 10 10 0" Orientation="Horizontal">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -104,16 +104,16 @@
                                 HorizontalAlignment="Stretch"
                                 Click="BrowseButton_Click"
                                 Content="{DynamicResource flowlauncher_plugin_program_browse}"
-                                Visibility="{Binding IsCustomSource, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                DockPanel.Dock="Right" />
+                                DockPanel.Dock="Right"
+                                Visibility="{Binding IsCustomSource, Converter={StaticResource BooleanToVisibilityConverter}}" />
                             <TextBox
                                 Name="Directory"
                                 Width="350"
                                 Margin="10"
-                                Text="{Binding Location, Mode=TwoWay}"
-                                IsReadOnly="{Binding IsNotCustomSource}"
                                 HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center" />
+                                VerticalAlignment="Center"
+                                IsReadOnly="{Binding IsNotCustomSource}"
+                                Text="{Binding Location, Mode=TwoWay}" />
                         </DockPanel>
                         <TextBlock
                             Grid.Row="1"
@@ -127,30 +127,30 @@
                             x:Name="Chkbox"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="10,0"
-                            IsChecked="{Binding Enabled, Mode=TwoWay}"
-                            VerticalAlignment="Center" />
+                            Margin="10 0"
+                            VerticalAlignment="Center"
+                            IsChecked="{Binding Enabled, Mode=TwoWay}" />
                     </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
         <Border
             Grid.Row="1"
-            Margin="0,14,0,0"
+            Margin="0 14 0 0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     MinWidth="140"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnAdd"
                     MinWidth="140"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="BtnAdd_OnClick"
                     Content="{Binding AddBtnText}"
                     Style="{DynamicResource AccentButtonStyle}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
index 71bc12a86..53baa79a3 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
@@ -46,8 +46,8 @@
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Margin" Value="0,5,0,0" />
-            <Setter Property="Padding" Value="15,15,15,15" />
+            <Setter Property="Margin" Value="0 5 0 0" />
+            <Setter Property="Padding" Value="15 15 15 15" />
             <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="Visibility" Value="Collapsed" />
             <Style.Triggers>
@@ -65,8 +65,8 @@
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Margin" Value="0,5,0,0" />
-            <Setter Property="Padding" Value="15,15,15,15" />
+            <Setter Property="Margin" Value="0 5 0 0" />
+            <Setter Property="Padding" Value="15 15 15 15" />
             <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="Visibility" Value="Collapsed" />
             <Style.Triggers>
@@ -120,20 +120,20 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,12,26,0">
+            <StackPanel Margin="26 12 26 0">
 
-                <StackPanel Margin="0,0,0,12">
+                <StackPanel Margin="0 0 0 12">
 
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource flowlauncher_plugin_program_suffixes}"
                         TextAlignment="Left" />
                 </StackPanel>
                 <TextBlock
-                    Margin="0,0,0,10"
+                    Margin="0 0 0 10"
                     FontSize="14"
                     Text="{DynamicResource flowlauncher_plugin_program_only_index_tip}"
                     TextWrapping="Wrap" />
@@ -151,82 +151,82 @@
                         TextWrapping="Wrap" />
                 </Border>
 
-                <Grid Margin="0,20,0,12">
+                <Grid Margin="0 20 0 12">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="250" />
                         <ColumnDefinition Width="250" />
                     </Grid.ColumnDefinitions>
 
-                    <StackPanel Grid.Column="0" Margin="0,0,0,0">
+                    <StackPanel Grid.Column="0" Margin="0 0 0 0">
                         <TextBlock
-                            Margin="0,0,0,8"
+                            Margin="0 0 0 8"
                             FontSize="16"
                             FontWeight="SemiBold"
                             Text="{DynamicResource flowlauncher_plugin_program_suffixes_executable_types}" />
                         <CheckBox
                             Name="apprefMS"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[appref-ms]}">
                             appref-ms
                         </CheckBox>
                         <CheckBox
                             Name="exe"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[exe]}">
                             exe
                         </CheckBox>
                         <CheckBox
                             Name="lnk"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             IsChecked="{Binding SuffixesStatus[lnk]}">
                             lnk
                         </CheckBox>
                         <CheckBox
                             Name="CustomFiles"
-                            Margin="10,0,0,0"
+                            Margin="10 0 0 0"
                             Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_file_types}"
                             IsChecked="{Binding UseCustomSuffixes}" />
                         <TextBox
                             x:Name="tbSuffixes"
-                            Margin="10,4,0,10"
+                            Margin="10 4 0 10"
                             Style="{StaticResource CustomFileTypeTextBox}" />
                     </StackPanel>
 
                     <Border
                         Grid.Column="1"
-                        Margin="20,0,0,10"
-                        Padding="20,0,0,0"
+                        Margin="20 0 0 10"
+                        Padding="20 0 0 0"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1,0,0,0">
+                        BorderThickness="1 0 0 0">
                         <StackPanel>
                             <TextBlock
-                                Margin="0,0,0,8"
+                                Margin="0 0 0 8"
                                 FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{DynamicResource flowlauncher_plugin_program_suffixes_URL_types}" />
                             <CheckBox
                                 Name="steam"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_steam}"
                                 IsChecked="{Binding ProtocolsStatus[steam]}" />
                             <CheckBox
                                 Name="epic"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_epic}"
                                 IsChecked="{Binding ProtocolsStatus[epic]}" />
                             <CheckBox
                                 Name="http"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_http}"
                                 IsChecked="{Binding ProtocolsStatus[http]}" />
                             <CheckBox
                                 Name="CustomProtocol"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_urls}"
                                 IsChecked="{Binding UseCustomProtocols}" />
                             <TextBox
                                 x:Name="tbProtocols"
-                                Margin="10,4,0,0"
+                                Margin="10 4 0 0"
                                 Style="{StaticResource CustomURLTypeTextBox}" />
                         </StackPanel>
                     </Border>
@@ -237,27 +237,27 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnReset"
                     Height="30"
                     MinWidth="140"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="BtnReset_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_reset}" />
                 <Button
                     x:Name="btnCancel"
                     Height="30"
                     MinWidth="140"
-                    Margin="5,0,5,0"
+                    Margin="5 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
 
                 <Button
                     Height="30"
                     MinWidth="140"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     HorizontalAlignment="Right"
                     Click="BtnAdd_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_update}"