diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5cb8f6097..5b0c9f079 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -448,7 +448,7 @@ namespace Flow.Launcher.Core.Plugin
                         {
                             var sep = new Separator();
 
-                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeperatorStyle");
+                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeparatorStyle");
 
                             contentControl = sep;
 
@@ -458,7 +458,7 @@ namespace Flow.Launcher.Core.Plugin
                         continue;
                 }
 
-                // If type is textBlock or seperator, we just add the content control to the main grid
+                // If type is textBlock or separator, we just add the content control to the main grid
                 if (panel == null)
                 {
                     // Add the content control to the column 0, row rowCount and columnSpan 2 of the main grid
@@ -498,7 +498,7 @@ namespace Flow.Launcher.Core.Plugin
 
         private static bool NeedSaveInSettings(string type)
         {
-            return type != "textBlock" && type != "seperator" && type != "hyperlink";
+            return type != "textBlock" && type != "separator" && type != "hyperlink";
         }
     }
 }
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index eadd23bcd..aeb8f872f 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5596,7 +5596,7 @@
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,4.5,0,4.5</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,4.5,9,4.5</Thickness>
 
-    <Style x:Key="SettingPanelSeperatorStyle" TargetType="Separator">
+    <Style x:Key="SettingPanelSeparatorStyle" TargetType="Separator">
         <Setter Property="Margin" Value="-70 13.5 -18 13.5" />
         <Setter Property="Height" Value="1" />
         <Setter Property="VerticalAlignment" Value="Top" />
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index 7f42eacf6..b1e4cd606 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -155,16 +155,16 @@ namespace Flow.Launcher.Plugin.Calculator
             return value.ToString(numberFormatInfo);
         }
 
-        private string GetDecimalSeparator()
+        private static string GetDecimalSeparator()
         {
-            string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-            switch (_settings.DecimalSeparator)
+            string systemDecimalSeparator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            return _settings.DecimalSeparator switch
             {
-                case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
-                case DecimalSeparator.Dot: return dot;
-                case DecimalSeparator.Comma: return comma;
-                default: return systemDecimalSeperator;
-            }
+                DecimalSeparator.UseSystemLocale => systemDecimalSeparator,
+                DecimalSeparator.Dot => dot,
+                DecimalSeparator.Comma => comma,
+                _ => systemDecimalSeparator,
+            };
         }
 
         private bool IsBracketComplete(string query)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 20d56c0e9..90fc898ea 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -334,7 +334,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_native_context_menu_header}" />
         </StackPanel>
 
@@ -390,7 +390,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_previewpanel_setting_header}" />
         </StackPanel>
 
@@ -470,7 +470,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_everything_setting_header}" />
         </StackPanel>
 
@@ -549,7 +549,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_manageactionkeywords_header}" />
         </StackPanel>
 
@@ -586,7 +586,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_quickaccesslinks_header}" />
         </StackPanel>
 
@@ -642,7 +642,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}" />
         </StackPanel>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index d57e44542..5c0ba8d0b 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -58,7 +58,7 @@
             Grid.Row="1"
             HorizontalAlignment="Stretch"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <DockPanel HorizontalAlignment="Stretch" LastChildFill="True">
                 <TextBlock
                     MinWidth="120"
@@ -90,7 +90,7 @@
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hideduplicatedwindowsapp_tooltip}" />
                 </WrapPanel>
             </DockPanel>
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <StackPanel
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 1b73aa966..1ce9b70b4 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -122,7 +122,7 @@
                 Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
 
-        <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeperatorStyle}" />
+        <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeparatorStyle}" />
 
         <DockPanel
             Grid.Row="3"