diff --git a/Flow.Launcher/SettingPages/Views/About.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/About.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index e5d58098c..9386c9625 100644
--- a/Flow.Launcher/SettingPages/Views/About.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Flow.Launcher.SettingPages.Views.About"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneAbout"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Flow.Launcher/SettingPages/Views/About.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
similarity index 91%
rename from Flow.Launcher/SettingPages/Views/About.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
index cbc97a724..e079cc18c 100644
--- a/Flow.Launcher/SettingPages/Views/About.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -22,9 +22,9 @@ using Path = System.IO.Path;
 namespace Flow.Launcher.SettingPages.Views
 {
 
-    public partial class About
+    public partial class SettingsPaneAbout
     {
-        public About()
+        public SettingsPaneAbout()
         {
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/General.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/General.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 778c11876..64a8cbfb1 100644
--- a/Flow.Launcher/SettingPages/Views/General.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Flow.Launcher.SettingPages.Views.General"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneGeneral"
     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"
@@ -361,4 +361,4 @@
             </cc:Card>
         </VirtualizingStackPanel>
     </ScrollViewer>
-</ui:Page>
\ No newline at end of file
+</ui:Page>
diff --git a/Flow.Launcher/SettingPages/Views/General.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
similarity index 97%
rename from Flow.Launcher/SettingPages/Views/General.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
index 2aaa0fbc2..012a8b70d 100644
--- a/Flow.Launcher/SettingPages/Views/General.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -34,7 +34,7 @@ using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views
 {
-    public partial class General
+    public partial class SettingsPaneGeneral
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
diff --git a/Flow.Launcher/SettingPages/Views/Hotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/Hotkey.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
index 20a69971c..c8a510e4f 100644
--- a/Flow.Launcher/SettingPages/Views/Hotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="Flow.Launcher.SettingPages.Views.Hotkey"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneHotkey"
     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"
diff --git a/Flow.Launcher/SettingPages/Views/Hotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
similarity index 87%
rename from Flow.Launcher/SettingPages/Views/Hotkey.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
index be72da402..1093b3f4a 100644
--- a/Flow.Launcher/SettingPages/Views/Hotkey.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -18,9 +18,9 @@ namespace Flow.Launcher.SettingPages.Views
     /// <summary>
     /// Hotkey.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class Hotkey : Page
+    public partial class SettingsPaneHotkey : Page
     {
-        public Hotkey()
+        public SettingsPaneHotkey()
         {
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/PluginStore.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/PluginStore.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
index 3a0d3bac1..bed68e86a 100644
--- a/Flow.Launcher/SettingPages/Views/PluginStore.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="Flow.Launcher.SettingPages.Views.PluginStore"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPanePluginStore"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Flow.Launcher/SettingPages/Views/PluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
similarity index 85%
rename from Flow.Launcher/SettingPages/Views/PluginStore.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
index 3d756f6fa..c55592395 100644
--- a/Flow.Launcher/SettingPages/Views/PluginStore.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -18,9 +18,9 @@ namespace Flow.Launcher.SettingPages.Views
     /// <summary>
     /// PluginStore.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class PluginStore : Page
+    public partial class SettingsPanePluginStore : Page
     {
-        public PluginStore()
+        public SettingsPanePluginStore()
         {
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/Plugins.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/Plugins.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
index dc8d3ebdf..9a9b05183 100644
--- a/Flow.Launcher/SettingPages/Views/Plugins.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Flow.Launcher.SettingPages.Views.Plugins"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPanePlugins"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Flow.Launcher/SettingPages/Views/Plugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
similarity index 87%
rename from Flow.Launcher/SettingPages/Views/Plugins.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
index ecc8578d1..91c12e7d6 100644
--- a/Flow.Launcher/SettingPages/Views/Plugins.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -18,9 +18,9 @@ namespace Flow.Launcher.SettingPages.Views
     /// <summary>
     /// Plugins.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class Plugins
+    public partial class SettingsPanePlugins
     {
-        public Plugins()
+        public SettingsPanePlugins()
         {
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/Proxy.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/Proxy.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
index 41742a276..48d7a89d5 100644
--- a/Flow.Launcher/SettingPages/Views/Proxy.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="Flow.Launcher.SettingPages.Views.Proxy"
+    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:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Flow.Launcher/SettingPages/Views/Proxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
similarity index 87%
rename from Flow.Launcher/SettingPages/Views/Proxy.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
index 7b057ab06..041bd40bc 100644
--- a/Flow.Launcher/SettingPages/Views/Proxy.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -18,9 +18,9 @@ namespace Flow.Launcher.SettingPages.Views
     /// <summary>
     /// Proxy.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class Proxy : Page
+    public partial class SettingsPaneProxy : Page
     {
-        public Proxy()
+        public SettingsPaneProxy()
         {
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/Theme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
similarity index 99%
rename from Flow.Launcher/SettingPages/Views/Theme.xaml
rename to Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 7ee9c7934..61b0b199b 100644
--- a/Flow.Launcher/SettingPages/Views/Theme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Flow.Launcher.SettingPages.Views.Theme"
+    x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneTheme"
     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"
@@ -18,7 +18,7 @@
         Margin="0,0,0,0"
         Padding="6,0,24,0"
         FontSize="14"
-        ScrollViewer.CanContentScroll="True"
+        CanContentScroll="True"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
         <Grid Margin="0,0,0,0">
@@ -77,6 +77,7 @@
                                 </Border>
                                 <StackPanel
                                     x:Name="ClockPanel"
+                                    Grid.Row="0"
                                     IsHitTestVisible="False"
                                     Style="{DynamicResource ClockPanel}"
                                     Visibility="Visible">
@@ -91,7 +92,7 @@
                                         Text="{Binding DateText}"
                                         Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
                                 </StackPanel>
-                                <Canvas Style="{DynamicResource SearchIconPosition}">
+                                <Canvas Grid.Row="0" Style="{DynamicResource SearchIconPosition}">
                                     <Path
                                         Margin="0"
                                         Data="{DynamicResource SearchIconImg}"
diff --git a/Flow.Launcher/SettingPages/Views/Theme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
similarity index 62%
rename from Flow.Launcher/SettingPages/Views/Theme.xaml.cs
rename to Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
index bcc59154d..85e2224f7 100644
--- a/Flow.Launcher/SettingPages/Views/Theme.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
@@ -12,14 +10,14 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using ModernWpf.Controls;
 
-namespace Flow.Launcher.SettingPages.Views
+namespace Flow.Launcher.SettingPages.Views;
+
+public partial class SettingsPaneTheme : Page
 {
-    public partial class Theme
+    public SettingsPaneTheme()
     {
-        public Theme()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index c83be85fb..6c70d5c92 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -221,66 +221,52 @@
                     </ui:NavigationView.PaneCustomContent>
                     <ui:NavigationView.MenuItems>
 
-                        <ui:NavigationViewItem
-                            x:Name="General"
-                            Content="{DynamicResource general}"
-                            Tag="General">
+                        <ui:NavigationViewItem x:Name="General" Content="{DynamicResource general}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/settings.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="plugin"
-                            Content="{DynamicResource plugin}"
-                            SelectsOnInvoked="True"
-                            Tag="Plugins">
+
+                        <ui:NavigationViewItem x:Name="Plugins" Content="{DynamicResource plugin}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/plugins.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="pluginstore"
-                            Content="{DynamicResource pluginStore}"
+
+                        <ui:NavigationViewItem x:Name="PluginStore" Content="{DynamicResource pluginStore}"
                             Tag="PluginStore">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/store.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="Theme"
-                            Content="{DynamicResource theme}"
-                            Tag="Theme">
+
+                        <ui:NavigationViewItem x:Name="Theme" Content="{DynamicResource theme}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/theme.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="Hotkey"
-                            Content="{DynamicResource hotkey}"
-                            Tag="Hotkey">
+
+                        <ui:NavigationViewItem x:Name="Hotkey" Content="{DynamicResource hotkey}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/keyboard.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="Proxy"
-                            Content="{DynamicResource proxy}"
-                            Tag="Proxy">
+
+                        <ui:NavigationViewItem x:Name="Proxy" Content="{DynamicResource proxy}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/proxy.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
-                        <ui:NavigationViewItem
-                            x:Name="About"
-                            Content="{DynamicResource about}"
-                            Tag="About">
+
+                        <ui:NavigationViewItem x:Name="About" Content="{DynamicResource about}">
                             <ui:NavigationViewItem.Icon>
                                 <ui:BitmapIcon ShowAsMonochrome="False" UriSource="/Images/info.png" />
                             </ui:NavigationViewItem.Icon>
                         </ui:NavigationViewItem>
+
                     </ui:NavigationView.MenuItems>
                     <Grid>
-                        <ui:Frame x:Name="contentFrame" Margin="0" />
+                        <ui:Frame x:Name="ContentFrame" Margin="0" />
                     </Grid>
                 </ui:NavigationView>
             </Grid>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 8f3edc872..08d175d76 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -506,25 +506,32 @@ namespace Flow.Launcher
         //}
 
         /** For Navigation View **/
-        private void NavigationView_SelectionChanged(ModernWpf.Controls.NavigationView sender, ModernWpf.Controls.NavigationViewSelectionChangedEventArgs args)
+        private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
             if (args.IsSettingsSelected)
             {
-                contentFrame.Navigate(typeof(General));
+                ContentFrame.Navigate(typeof(SettingsPaneGeneral));
             }
             else
             {
-                var selectedItem = (ModernWpf.Controls.NavigationViewItem)args.SelectedItem;
+                var selectedItem = (NavigationViewItem)args.SelectedItem;
                 if (selectedItem == null)
                 {
                     return;
                 }
-                string selectedItemTag = (string)selectedItem.Tag;
 
-                sender.Header = (string)selectedItem.Content;
-                string pageName = $"Flow.Launcher.SettingPages.Views.{selectedItemTag}";
-                Type pageType = typeof(About).Assembly.GetType(pageName);
-                contentFrame.Navigate(pageType, settings);
+                var pageType = selectedItem.Name switch
+                {
+                    nameof(General) => typeof(SettingsPaneGeneral),
+                    nameof(Plugins) => typeof(SettingsPanePlugins),
+                    nameof(PluginStore) => typeof(SettingsPanePluginStore),
+                    nameof(Theme) => typeof(SettingsPaneTheme),
+                    nameof(Hotkey) => typeof(SettingsPaneHotkey),
+                    nameof(Proxy) => typeof(SettingsPaneProxy),
+                    nameof(About) => typeof(SettingsPaneAbout),
+                    _ => typeof(SettingsPaneGeneral)
+                };
+                ContentFrame.Navigate(pageType, settings);
             }
         }
     }