diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 4b5a2e7c..af1e63d1 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -2817,7 +2817,7 @@ namespace Ink_Canvas
             if (isOpeningOrHidingSettingsPane) return;
             HideSubPanels();
             {
-                var settingsWindow = new Windows.SettingsViews2.SettingsWindow2();
+                var settingsWindow = new Windows.SettingsViews.SettingsWindow();
                 settingsWindow.Owner = this;
                 settingsWindow.ShowDialog();
             }
diff --git a/Ink Canvas/Windows/SettingsViews2/MainWindowSettingsHelper.cs b/Ink Canvas/Windows/SettingsViews/MainWindowSettingsHelper.cs
similarity index 99%
rename from Ink Canvas/Windows/SettingsViews2/MainWindowSettingsHelper.cs
rename to Ink Canvas/Windows/SettingsViews/MainWindowSettingsHelper.cs
index a05b5f0d..214454bc 100644
--- a/Ink Canvas/Windows/SettingsViews2/MainWindowSettingsHelper.cs	
+++ b/Ink Canvas/Windows/SettingsViews/MainWindowSettingsHelper.cs	
@@ -7,7 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Media = System.Windows.Media;
 
-namespace Ink_Canvas.Windows.SettingsViews2
+namespace Ink_Canvas.Windows.SettingsViews
 {
     public static class MainWindowSettingsHelper
     {
@@ -331,7 +331,7 @@ namespace Ink_Canvas.Windows.SettingsViews2
                     // 查找所有打开的设置窗口
                     foreach (Window window in Application.Current.Windows)
                     {
-                        if (window.GetType().Name == "SettingsWindow2")
+                        if (window.GetType().Name == "SettingsWindow")
                         {
                             // 同步所有面板（保守策略）
                             SyncAllPanels(window);
@@ -456,8 +456,8 @@ namespace Ink_Canvas.Windows.SettingsViews2
                 // 查找所有打开的设置窗口
                 foreach (Window window in Application.Current.Windows)
                 {
-                    // 使用类型名称匹配，因为 SettingsWindow2 在不同的命名空间中
-                    if (window.GetType().Name == "SettingsWindow2")
+                    // 使用类型名称匹配，因为 SettingsWindow 在不同的命名空间中
+                    if (window.GetType().Name == "SettingsWindow")
                     {
                         // 同时调用 ApplyTheme 方法更新窗口本身
                         var applyThemeMethod = window.GetType().GetMethod("ApplyTheme",
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml
similarity index 92%
rename from Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml
index c828997d..89458f8a 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.AboutPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.AboutPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml.cs
similarity index 77%
rename from Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml.cs
index dc534e07..d743d4b6 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/AboutPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class AboutPage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml
similarity index 96%
rename from Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml
index 84b65a20..f91ec8a5 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.AppearancePage"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.AppearancePage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs
similarity index 79%
rename from Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs
index 2c88e8b5..8999b7df 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/AppearancePage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs	
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class AppearancePage : Page
     {
@@ -24,7 +24,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click(object sender, RoutedEventArgs e)
         {
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 settingsWindow.NavigateToPage("ThemePage");
@@ -33,7 +33,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click_1(object sender, RoutedEventArgs e)
         {
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 settingsWindow.NavigateToPage("ColorsPage");
@@ -42,7 +42,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click_2(object sender, RoutedEventArgs e)
         {
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 settingsWindow.NavigateToPage("FontsPage");
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml
similarity index 96%
rename from Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml
index 345c46f7..89d58661 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.BasicPage"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.BasicPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs
similarity index 83%
rename from Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs
index 9a534ea2..78b6e71b 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/BasicPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs	
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     /// <summary>
     /// Basic.xaml 的交互逻辑
@@ -27,8 +27,8 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click(object sender, RoutedEventArgs e)
         {
-            // 找到SettingsWindow2窗口
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            // 找到SettingsWindow窗口
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 // 调用NavigateToPage方法导航到启动页面
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml
similarity index 91%
rename from Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml
index b048d795..70dc2588 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.ColorsPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.ColorsPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs
similarity index 78%
rename from Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs
index f8a22d29..d2b357b1 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/ColorsPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class ColorsPage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml
similarity index 95%
rename from Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml
index 6f66039c..29ce04d3 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.DesignPage"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.DesignPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs
similarity index 81%
rename from Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs
index 4673afe8..41c804f5 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/DesignPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs	
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class DesignPage : Page
     {
@@ -24,7 +24,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click(object sender, RoutedEventArgs e)
         {
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 settingsWindow.NavigateToPage("IconographyPage");
@@ -33,7 +33,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Click_1(object sender, RoutedEventArgs e)
         {
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 settingsWindow.NavigateToPage("TypographyPage");
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml
similarity index 92%
rename from Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml
index d1454099..6102e77c 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.FontsPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.FontsPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs
similarity index 77%
rename from Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs
index a378b849..cb1b9d5d 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/FontsPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class FontsPage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml
similarity index 97%
rename from Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml
index 64ffe7e3..5657a0ae 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.HomePage"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.HomePage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs
similarity index 75%
rename from Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs
index 428fdf27..6ac88f06 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/HomePage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs	
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     /// <summary>
     /// HomePage.xaml 的交互逻辑
@@ -27,8 +27,8 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Basic_Click(object sender, RoutedEventArgs e)
         {
-            // 找到SettingsWindow2窗口
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            // 找到SettingsWindow窗口
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 // 调用NavigateToPage方法导航到基本设置页面
@@ -38,8 +38,8 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Page2_Click(object sender, RoutedEventArgs e)
         {
-            // 找到SettingsWindow2窗口
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            // 找到SettingsWindow窗口
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 // 调用NavigateToPage方法导航到页面2
@@ -49,8 +49,8 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Design_Click(object sender, RoutedEventArgs e)
         {
-            // 找到SettingsWindow2窗口
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            // 找到SettingsWindow窗口
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 // 调用NavigateToPage方法导航到设计设置页面
@@ -60,8 +60,8 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
 
         private void SettingsCard_Appearance_Click(object sender, RoutedEventArgs e)
         {
-            // 找到SettingsWindow2窗口
-            SettingsWindow2 settingsWindow = Window.GetWindow(this) as SettingsWindow2;
+            // 找到SettingsWindow窗口
+            SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow;
             if (settingsWindow != null)
             {
                 // 调用NavigateToPage方法导航到外观设置页面
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml
similarity index 96%
rename from Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml
index b2499cce..6f3fabee 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.IconographyPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.IconographyPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs
similarity index 78%
rename from Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs
index a86403fb..49a015df 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/IconographyPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs	
@@ -1,4 +1,4 @@
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class IconographyPage : iNKORE.UI.WPF.Modern.Controls.Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml
similarity index 86%
rename from Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml
index d9c939f0..d9f3124f 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.Page2Page"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.Page2Page"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="Page2">
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs
similarity index 92%
rename from Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs
index 2a49db6e..26803bb3 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/Page2Page.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs	
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     /// <summary>
     /// Page2.xaml 的交互逻辑
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml
similarity index 91%
rename from Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml
index 9e0a1d74..01a9c046 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.SettingsPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.SettingsPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml.cs
similarity index 78%
rename from Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml.cs
index 410983f1..bb36d791 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/SettingsPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/SettingsPage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class SettingsPage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml
similarity index 98%
rename from Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml
index 4a4876b8..94ae1cb3 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml	
@@ -1,9 +1,9 @@
-<Page x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.StartupPage"
+<Page x:Class="Ink_Canvas.Windows.SettingsViews.Pages.StartupPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews2.Pages"
+      xmlns:local="clr-namespace:Ink_Canvas.Windows.SettingsViews.Pages"
       xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml.cs
similarity index 88%
rename from Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml.cs
index 50aad7d7..7f934766 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/StartupPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml.cs	
@@ -2,7 +2,7 @@ using System;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     /// <summary>
     /// StartupPage.xaml 的交互逻辑
@@ -97,7 +97,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchNoFocusMode.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchNoFocusMode", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchNoFocusMode", newState);
             }
             catch (Exception ex)
             {
@@ -117,7 +117,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchWindowMode.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchWindowMode", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchWindowMode", newState);
             }
             catch (Exception ex)
             {
@@ -137,7 +137,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchAlwaysOnTop.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchAlwaysOnTop", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchAlwaysOnTop", newState);
             }
             catch (Exception ex)
             {
@@ -166,7 +166,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 MainWindow.SaveSettingsToFile();
 
                 // 通知其他面板同步状态
-                Windows.SettingsViews2.MainWindowSettingsHelper.NotifySettingsPanelsSyncState("ToggleSwitchUIAccessTopMost");
+                Windows.SettingsViews.MainWindowSettingsHelper.NotifySettingsPanelsSyncState("ToggleSwitchUIAccessTopMost");
             }
             catch (Exception ex)
             {
@@ -190,7 +190,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchRunAtStartup.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchRunAtStartup", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchRunAtStartup", newState);
             }
             catch (Exception ex)
             {
@@ -210,7 +210,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchFoldAtStartup.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchFoldAtStartup", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchFoldAtStartup", newState);
             }
             catch (Exception ex)
             {
@@ -234,7 +234,7 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
                 bool newState = ToggleSwitchPPTOnlyMode.IsOn;
 
                 // 使用Helper类更新设置并应用
-                Windows.SettingsViews2.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchMode", newState);
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchMode", newState);
             }
             catch (Exception ex)
             {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml
similarity index 92%
rename from Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml
index 6a42b271..7ba46eab 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.ThemePage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.ThemePage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs
similarity index 77%
rename from Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs
index ce91b34a..bb1fc2c6 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/ThemePage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class ThemePage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml
similarity index 91%
rename from Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml
rename to Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml
index 80ec96d0..0308f095 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml	
@@ -1,5 +1,5 @@
 <ui:Page
-    x:Class="Ink_Canvas.Windows.SettingsViews2.Pages.TypographyPage"
+    x:Class="Ink_Canvas.Windows.SettingsViews.Pages.TypographyPage"
     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/Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs
similarity index 78%
rename from Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs
index 94725c9e..9728509b 100644
--- a/Ink Canvas/Windows/SettingsViews2/Pages/TypographyPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs	
@@ -1,6 +1,6 @@
 using iNKORE.UI.WPF.Modern.Controls;
 
-namespace Ink_Canvas.Windows.SettingsViews2.Pages
+namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
     public partial class TypographyPage : Page
     {
diff --git a/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml
similarity index 99%
rename from Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml
rename to Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml
index 2fb82824..e651a6d0 100644
--- a/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml	
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Ink_Canvas.Windows.SettingsViews2.SettingsWindow2"
+    x:Class="Ink_Canvas.Windows.SettingsViews.SettingsWindow"
     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/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
similarity index 98%
rename from Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml.cs
rename to Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
index 703200cf..a4b260b5 100644
--- a/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs	
@@ -1,4 +1,4 @@
-using Ink_Canvas.Windows.SettingsViews2.Pages;
+using Ink_Canvas.Windows.SettingsViews.Pages;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Collections.Generic;
@@ -10,9 +10,9 @@ using System.Linq;
 using MessageBox = System.Windows.MessageBox;
 using Screen = System.Windows.Forms.Screen;
 
-namespace Ink_Canvas.Windows.SettingsViews2
+namespace Ink_Canvas.Windows.SettingsViews
 {
-    public partial class SettingsWindow2 : Window
+    public partial class SettingsWindow : Window
     {
         private readonly Dictionary<string, Type> _pageTypes;
         private readonly Dictionary<string, object> _pages = new Dictionary<string, object>();
@@ -26,7 +26,7 @@ namespace Ink_Canvas.Windows.SettingsViews2
         // 标记窗口是否曾经最大化过
         private bool _wasMaximized = false;
 
-        public SettingsWindow2()
+        public SettingsWindow()
         {
             InitializeComponent();