From 700aa08f02f55eaec1068ec5d01e4710486748b1 Mon Sep 17 00:00:00 2001
From: PANDA-JSR <pandajsr72@gmail.com>
Date: Sat, 14 Feb 2026 22:33:14 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=86=85=E7=9A=84=E8=B4=A1=E7=8C=AE=E8=80=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20PANDA-JSR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/InkCanvasForClass.csproj             |   1 +
 Ink Canvas/MainWindow.xaml                      |  16 ++++++++++++++++
 .../Resources/DeveloperAvatars/PANDA-JSR.jpg    | Bin 0 -> 81181 bytes
 3 files changed, 17 insertions(+)
 create mode 100644 Ink Canvas/Resources/DeveloperAvatars/PANDA-JSR.jpg

diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 3cb49b7e..2e935f17 100644
--- a/Ink Canvas/InkCanvasForClass.csproj	
+++ b/Ink Canvas/InkCanvasForClass.csproj	
@@ -269,6 +269,7 @@
     <Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
     <Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
     <Resource Include="Resources\DeveloperAvatars\PrefacedCorg.jpg" />
+    <Resource Include="Resources\DeveloperAvatars\PANDA-JSR.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\down.png" />
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 95032d06..9a2908ae 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -4043,6 +4043,7 @@
                                             <RowDefinition />
                                             <RowDefinition />
                                             <RowDefinition />
+                                            <RowDefinition />
                                         </Grid.RowDefinitions>
                                         <ui:SimpleStackPanel Grid.Column="0" Grid.Row="0" Orientation="Vertical">
                                             <Image Source="/Resources/DeveloperAvatars/RaspberryKan.jpg"
@@ -4220,6 +4221,21 @@
                                                 PrefacedCorg
                                             </TextBlock>
                                         </ui:SimpleStackPanel>
+                                        <ui:SimpleStackPanel Grid.Column="0" Grid.Row="3" Orientation="Vertical"
+                                                             Margin="0,16,0,0">
+                                            <Image Source="/Resources/DeveloperAvatars/PANDA-JSR.jpg"
+                                                   VerticalAlignment="Center" HorizontalAlignment="Center"
+                                                   RenderOptions.BitmapScalingMode="HighQuality" Width="48"
+                                                   Margin="0,0,0,6" Height="48">
+                                                <Image.Clip>
+                                                    <EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
+                                                </Image.Clip>
+                                            </Image>
+                                            <TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center" FontSize="12" Foreground="White">
+                                                PANDA-JSR
+                                            </TextBlock>
+                                        </ui:SimpleStackPanel>
                                     </Grid>
                                     <ui:SimpleStackPanel Spacing="3" Orientation="Vertical">
                                         <TextBlock
diff --git a/Ink Canvas/Resources/DeveloperAvatars/PANDA-JSR.jpg b/Ink Canvas/Resources/DeveloperAvatars/PANDA-JSR.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8470bb8a2f82834095ddff0f4c424d6d9b13e793
GIT binary patch
literal 81181
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
D+)N)l

literal 0
HcmV?d00001


From 02991cead9ff4efa5537cd6e0db147bbc6e88d4c Mon Sep 17 00:00:00 2001
From: PANDA-JSR <pandajsr72@gmail.com>
Date: Tue, 10 Mar 2026 20:38:32 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=8F=AF=E6=8B=96=E5=8A=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Windows/SettingsViews/SettingsWindow.xaml | 13 +++++++---
 .../SettingsViews/SettingsWindow.xaml.cs      | 26 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml
index ba1eba77..6d822b1f 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml	
@@ -650,7 +650,9 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <Grid Height="48" VerticalAlignment="Top" Grid.Row="0">
+                        <Grid Height="48" VerticalAlignment="Top" Grid.Row="0"
+                              Background="Transparent"
+                              MouseLeftButtonDown="SidebarTopBar_MouseLeftButtonDown">
                             <Border x:Name="SearchButtonBorder" CornerRadius="8" Background="#d9d9d9" Width="34" Height="34" Margin="8,0,0,0" HorizontalAlignment="Left" MouseLeftButtonDown="SearchButton_Click" Cursor="Hand">
                                 <Image Width="16" Height="16">
                                     <Image.Source>
@@ -664,7 +666,8 @@
                                     </Image.Source>
                                 </Image>
                             </Border>
-                            <TextBlock x:Name="TitleTextBlock" FontSize="15" Text="软件设置" Foreground="#2e3436" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock x:Name="TitleTextBlock" FontSize="15" Text="软件设置" Foreground="#2e3436" FontWeight="Bold"
+                                       VerticalAlignment="Center" HorizontalAlignment="Center" IsHitTestVisible="False"/>
                             <Border CornerRadius="8" Background="#d9d9d9" Width="34" Height="34" Margin="0,0,8,0" HorizontalAlignment="Right" PreviewMouseLeftButtonDown="MenuButton_Click" Cursor="Hand" x:Name="MenuButtonBorder">
                                 <Image Width="16" Height="16">
                                     <Image.Source>
@@ -858,7 +861,8 @@
                 
                 <!--Topbar-->
                 <Grid Height="48" VerticalAlignment="Top" Margin="250,0,0,0">
-                    <Border x:Name="TopBarBorder" Height="48" CornerRadius="0,6,0,0" Background="#fafafa">
+                    <Border x:Name="TopBarBorder" Height="48" CornerRadius="0,6,0,0" Background="#fafafa"
+                            MouseLeftButtonDown="TopBarBorder_MouseLeftButtonDown">
                         <Border.Clip>
                             <RectangleGeometry Rect="0,0,640,56"/>
                         </Border.Clip>
@@ -868,7 +872,8 @@
                             </Border.Effect>
                         </Border>
                     </Border>
-                    <TextBlock FontSize="16" Text="设置标题" Name="SettingsWindowTitle" Foreground="#2e3436" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <TextBlock FontSize="16" Text="设置标题" Name="SettingsWindowTitle" Foreground="#2e3436" FontWeight="Bold"
+                               VerticalAlignment="Center" HorizontalAlignment="Center" IsHitTestVisible="False"/>
                     <Border CornerRadius="8" Background="#33ef4444" Width="34" Height="34" Margin="0,0,8,0" HorizontalAlignment="Right" MouseLeftButtonDown="CloseButton_Click" Cursor="Hand">
                         <Image Width="12" Height="12">
                             <Image.Source>
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
index b4e18967..5cf1fbdc 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs	
@@ -1160,6 +1160,30 @@ private void SidebarItem_MouseLeave(object sender, MouseEventArgs e)
             _sidebarItemMouseDownBorder = null;
         }
 
+        private void TopBarBorder_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton != MouseButton.Left) return;
+            DragMove();
+        }
+
+        private void SidebarTopBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton != MouseButton.Left) return;
+
+            var source = e.OriginalSource as DependencyObject;
+            if (IsInsideElement(source, SearchButtonBorder) || IsInsideElement(source, MenuButtonBorder))
+                return;
+
+            DragMove();
+        }
+
+        private static bool IsInsideElement(DependencyObject source, DependencyObject target)
+        {
+            if (source == null || target == null) return false;
+            if (source == target) return true;
+            return IsInsideElement(VisualTreeHelper.GetParent(source), target);
+        }
+
         private void CloseButton_Click(object sender, MouseButtonEventArgs e)
         {
             Close();
@@ -1838,4 +1862,4 @@ private class CustomSliderInfo
 
         #endregion
     }
-}
\ No newline at end of file
+}

From c60effa87c2e7597a2d481a6e3219119df323c31 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Tue, 7 Apr 2026 20:00:56 +0800
Subject: [PATCH 03/15] =?UTF-8?q?refactor:=20=E6=96=B0=E5=A2=9E=20MainWind?=
 =?UTF-8?q?ow=20=E6=A0=B7=E5=BC=8F=E4=B8=8E=E5=9B=BE=E6=A0=87=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_Styles.xaml       | 164 ++++++++++++++++++
 Ink Canvas/MainWindow_cs/MW_ToolbarIcons.xaml |  63 +++++++
 2 files changed, 227 insertions(+)
 create mode 100644 Ink Canvas/MainWindow_cs/MW_Styles.xaml
 create mode 100644 Ink Canvas/MainWindow_cs/MW_ToolbarIcons.xaml

diff --git a/Ink Canvas/MainWindow_cs/MW_Styles.xaml b/Ink Canvas/MainWindow_cs/MW_Styles.xaml
new file mode 100644
index 00000000..3e53bda5
--- /dev/null
+++ b/Ink Canvas/MainWindow_cs/MW_Styles.xaml	
@@ -0,0 +1,164 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+                    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf">
+    <Style x:Key="NavButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="#27272a"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="#3b82f6"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="startup"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="canvas"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="gesture"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="inkrecognition"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="crashaction"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="ppt"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="advanced"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="automation"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="randomwindow"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="theme"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="shortcuts"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="about"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                        <DataTrigger Binding="{Binding Tag}" Value="plugins"><Setter Property="Background" Value="#3b82f6"/></DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="GroupBoxBase" TargetType="GroupBox">
+        <Setter Property="Foreground" Value="#fafafa"/>
+        <Setter Property="Margin" Value="0,0,0,8"/>
+    </Style>
+    <Style x:Key="GroupBoxPlugins" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxStartup" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxModeSettings" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxNewSettings" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxCanvas" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxCrashAction" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxGesture" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxInkRecognition" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+    <Style x:Key="GroupBoxAppearanceNewUI" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
+
+    <Style x:Key="SettingsPanelScrollViewer" TargetType="ui:ScrollViewerEx">
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="PanningMode" Value="VerticalOnly"/>
+    </Style>
+
+    <Style x:Key="SimpleStackPanel" TargetType="ikw:SimpleStackPanel">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="BoardToolBorderBase" TargetType="Border">
+        <Setter Property="Width" Value="60"/>
+        <Setter Property="Height" Value="50"/>
+        <Setter Property="Background" Value="{DynamicResource BoardFloatBarBackground}"/>
+        <Setter Property="Opacity" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BoardFloatBarBorderBrush}"/>
+    </Style>
+    <Style x:Key="BoardSelect" TargetType="Border" BasedOn="{StaticResource BoardToolBorderBase}">
+        <Setter Property="BorderThickness" Value="1,1,0,1"/>
+        <Setter Property="CornerRadius" Value="5,0,0,5"/>
+    </Style>
+    <Style x:Key="BoardPen" TargetType="Border" BasedOn="{StaticResource BoardToolBorderBase}">
+        <Setter Property="BorderThickness" Value="0,1,0,1"/>
+    </Style>
+    <Style x:Key="BoardEraser" TargetType="Border" BasedOn="{StaticResource BoardToolBorderBase}">
+        <Setter Property="BorderThickness" Value="0,1,1,1"/>
+    </Style>
+
+    <Style x:Key="BoardDefaultPenTabButton" TargetType="Border">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Width" Value="36"/>
+        <Setter Property="CornerRadius" Value="3"/>
+    </Style>
+    <Style x:Key="BoardHighlightPenTabButton" TargetType="Border">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Width" Value="52"/>
+        <Setter Property="CornerRadius" Value="3"/>
+    </Style>
+    <Style x:Key="BoardCircleEraserTabButton" TargetType="Border">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Width" Value="40"/>
+        <Setter Property="CornerRadius" Value="3"/>
+    </Style>
+    <Style x:Key="BoardRectangleEraserTabButton" TargetType="Border" BasedOn="{StaticResource BoardCircleEraserTabButton}"/>
+
+    <Style x:Key="BoardBorderPenColor" TargetType="Border">
+        <Setter Property="BorderThickness" Value="1.5"/>
+        <Setter Property="CornerRadius" Value="100"/>
+        <Setter Property="Width" Value="45"/>
+    </Style>
+
+    <Style x:Key="PPTPreviousButtonBorderBase" TargetType="Border">
+        <Setter Property="Width" Value="50"/>
+        <Setter Property="Height" Value="50"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style x:Key="PPTNextButtonBorderBase" TargetType="Border" BasedOn="{StaticResource PPTPreviousButtonBorderBase}">
+        <Setter Property="CornerRadius" Value="0 0 5 5"/>
+    </Style>
+    <Style x:Key="PPTPageButtonBase" TargetType="Border">
+        <Setter Property="Visibility" Value="Visible"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style x:Key="PPTButtonFeedbackBorderBase" TargetType="Border">
+        <Setter Property="Background" Value="#18181b"/>
+        <Setter Property="Opacity" Value="0"/>
+    </Style>
+
+    <Style x:Key="GridNotifications" TargetType="Grid">
+        <Setter Property="Margin" Value="0,110"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+    </Style>
+
+    <Style x:Key="PopupBorderBase" TargetType="Border">
+        <Setter Property="ClipToBounds" Value="True"/>
+        <Setter Property="CornerRadius" Value="5"/>
+        <Setter Property="Background" Value="{DynamicResource FloatBarBackground}"/>
+        <Setter Property="Opacity" Value="1"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+    <Style x:Key="BorderTools" TargetType="Border" BasedOn="{StaticResource PopupBorderBase}">
+        <Setter Property="BorderBrush" Value="#2563eb"/>
+    </Style>
+    <Style x:Key="BoardBorderTools" TargetType="Border" BasedOn="{StaticResource PopupBorderBase}">
+        <Setter Property="BorderBrush" Value="#2563eb"/>
+    </Style>
+    <Style x:Key="BorderDrawShape" TargetType="Border" BasedOn="{StaticResource PopupBorderBase}">
+        <Setter Property="BorderBrush" Value="#2563eb"/>
+    </Style>
+    <Style x:Key="BoardBorderDrawShape" TargetType="Border" BasedOn="{StaticResource BorderDrawShape}"/>
+    <Style x:Key="EraserSizePanel" TargetType="Border" BasedOn="{StaticResource PopupBorderBase}">
+        <Setter Property="BorderBrush" Value="#2563eb"/>
+    </Style>
+    <Style x:Key="BoardEraserSizePanel" TargetType="Border" BasedOn="{StaticResource EraserSizePanel}"/>
+    <Style x:Key="TwoFingerGestureBorder" TargetType="Border" BasedOn="{StaticResource PopupBorderBase}">
+        <Setter Property="BorderBrush" Value="#2563eb"/>
+    </Style>
+    <Style x:Key="BoardTwoFingerGestureBorder" TargetType="Border" BasedOn="{StaticResource TwoFingerGestureBorder}"/>
+    <Style x:Key="EnableTwoFingerGestureBorder" TargetType="Border">
+        <Setter Property="Width" Value="36"/>
+        <Setter Property="Height" Value="36"/>
+        <Setter Property="CornerRadius" Value="5"/>
+        <Setter Property="Background" Value="{DynamicResource FloatBarBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource FloatBarBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+</ResourceDictionary>
diff --git a/Ink Canvas/MainWindow_cs/MW_ToolbarIcons.xaml b/Ink Canvas/MainWindow_cs/MW_ToolbarIcons.xaml
new file mode 100644
index 00000000..350eaa3a
--- /dev/null
+++ b/Ink Canvas/MainWindow_cs/MW_ToolbarIcons.xaml	
@@ -0,0 +1,63 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Geometry x:Key="BoardGestureGeometry">F0 M24,24z M0,0z M7.82154,10.0753L7.82154,3.74613C7.82154,3.06603 8.08946,2.40655 8.57377,1.92224 9.05808,1.43793 9.70726,1.17001 10.3977,1.17001 11.0881,1.17001 11.7372,1.43793 12.2216,1.92224 12.7059,2.40655 12.9738,3.05573 12.9738,3.74613L12.9738,6.37308C13.1415,6.33947 13.3139,6.32225 13.489,6.32225 14.1794,6.32225 14.8286,6.59016 15.3129,7.07447 15.4484,7.21001 15.567,7.35845 15.6675,7.5171 15.9551,7.40916 16.2634,7.35269 16.5803,7.35269 17.2707,7.35269 17.9199,7.62061 18.4042,8.10492 18.5461,8.24683 18.6695,8.4029 18.7729,8.57001 19.6856,8.26338 20.7674,8.45871 21.4647,9.15599 21.949,9.6403 22.2169,10.2998 22.2169,10.9799L22.2169,15.6169C22.2169,17.5438 21.4647,19.3574 20.1045,20.7176 18.7443,22.0778 16.9307,22.83 15.0038,22.83L13.149,22.83 13.1799,22.8094 12.8398,22.8094C11.7682,22.7579 10.7068,22.4694 9.75878,21.9541 8.70773,21.3874 7.81124,20.563 7.15175,19.5738L6.94566,19.2647C6.60562,18.7494 5.49273,16.8019 3.52458,13.3087 3.19484,12.7213 3.1021,12.0412 3.27727,11.3818 3.45245,10.7326 3.86463,10.1761 4.44168,9.83608 5.00842,9.49604 5.66791,9.35177 6.31709,9.43421 6.86548,9.50385 7.39181,9.7279 7.82154,10.0753z</Geometry>
+    <Geometry x:Key="BoardGestureGeometry2">F0 M24,24z M0,0z </Geometry>
+    <Geometry x:Key="BoardSelectGeometry">F1 M24,24z M0,0z M22.7989,10.1653L1.14304,1.14304 10.1653,22.7989 12.8305,14.9518 19.6892,21.8105 21.8105,19.6892 14.9518,12.8305 22.7989,10.1653z</Geometry>
+    <Geometry x:Key="BoardPenGeometry">F1 M24,24z M0,0z M20.4786,1.42438C19.9985,1.23743 19.4847,1.15194 18.9698,1.17319 18.4549,1.19444 17.9499,1.32197 17.4869,1.54789 17.0368,1.76752 16.6358,2.07554 16.3083,2.45361L3.85516,14.9067 9.08243,20.134 21.5311,7.68529C21.9113,7.36382 22.223,6.96912 22.447,6.52438 22.6786,6.06462 22.8113,5.56167 22.8365,5.04763 22.8616,4.5336 22.7787,4.02012 22.593,3.54002 22.4073,3.05994 22.1232,2.62403 21.759,2.25988 21.3949,1.89574 20.9587,1.61132 20.4786,1.42438z M7.28056,21.1605L2.8286,16.7086 1.15912,22.83 7.28056,21.1605z</Geometry>
+    <Geometry x:Key="BoardEraserGeometry">F1 M24,24z M0,0z M15.6314,20.7262L22.7921,13.5655C24.3494,12.141,24.2819,9.81776,22.8105,8.34633L16.7793,2.31508C15.3547,0.757753,13.0315,0.825236,11.5601,2.29666L4.38099,9.47574 15.6314,20.7262z M14.2172,22.1404L2.96677,10.89 1.20761,12.6491C-0.34971,14.0737,-0.281711,16.3974,1.18971,17.8688L6.15089,22.83 13.5276,22.83 14.2172,22.1404z</Geometry>
+
+    <Geometry x:Key="CursorIconGeometry">F0 M24,24z M0,0z</Geometry>
+    <Geometry x:Key="PenIconGeometry">F0 M24,24z M0,0z</Geometry>
+    <Geometry x:Key="StrokeEraserIconGeometry">F0 M24,24z M0,0z</Geometry>
+    <Geometry x:Key="CircleEraserIconGeometry">F0 M24,24z M0,0z</Geometry>
+    <Geometry x:Key="LassoSelectIconGeometry">F0 M24,24z M0,0z</Geometry>
+    <Geometry x:Key="ShapesIconGeometry">F1 M24,24z M0,0z M8.7269,2.9067C8.84872,2.70875 9.00852,2.57931 9.20647,2.5184 9.41966,2.44227 9.62541,2.43465 9.82337,2.49556 10.0365,2.55647 10.2039,2.67829 10.3257,2.86102L13.9118,8.13731C12.9068,8.47231 12.0084,8.99766 11.2165,9.71334 10.4247,10.4138 9.8157,11.2513 9.38933,12.2259 8.93251,13.2156 8.70413,14.2587 8.70413,15.3551L8.7269,15.9946 2.46851,15.9946C2.22487,15.9946 2.01158,15.9185 1.82885,15.7662 1.66135,15.614 1.55481,15.4236 1.50913,15.1952 1.47868,14.9668 1.5244,14.746 1.64622,14.5328L8.7269,2.9067z</Geometry>
+    <Geometry x:Key="UndoIconGeometry">F1 M24,24z M0,0z M10.3344,5.02734L10.3605,8.62849C12.2431,8.87029 14.0305,9.44026 15.7232,10.3384 17.4676,11.2538 18.9187,12.4196 20.0759,13.8359 21.3367,15.3731 22.1398,17.0657 22.4852,18.9138 22.5197,19.1211 22.4938,19.3197 22.4075,19.5097 22.3211,19.6997 22.2003,19.8292 22.0448,19.8983 21.8894,19.9501 21.7423,19.9069 21.6042,19.7687 20.7579,18.8361 19.6268,17.9984 18.2105,17.2557 16.9324,16.5821 15.5591,16.0553 14.091,15.6754 12.7093,15.3126 11.4659,15.1313 10.3605,15.1313L10.3344,18.862C10.3344,19.2938 10.2395,19.6047 10.0495,19.7947 9.8941,19.9501 9.69547,20.0106 9.45367,19.976 9.21187,19.9242 8.99586,19.8119 8.80587,19.6392 8.14955,18.9829 6.90606,17.7739 5.07526,16.0121 3.46899,14.475 2.41544,13.4559 1.91456,12.9551 1.63821,12.6787 1.5,12.3678 1.5,12.0224 1.51727,11.6769 1.67272,11.3574 1.96634,11.0638 4.02168,9.00847 6.3103,6.73724 8.83197,4.25011 9.00468,4.07739 9.20331,3.99967 9.42784,4.01694 9.66965,4.01694 9.87683,4.11194 10.0495,4.30193 10.2395,4.47464 10.3344,4.71645 10.3344,5.02734z</Geometry>
+    <Geometry x:Key="RedoIconGeometry">F1 M24,24z M0,0z M13.6656,5.02734L13.6395,8.62849C11.7569,8.87029 9.96948,9.44026 8.27685,10.3384 6.5324,11.2538 5.08134,12.4196 3.92413,13.8359 2.6633,15.3731 1.86023,17.0657 1.5148,18.9138 1.48026,19.1211 1.50619,19.3197 1.59255,19.5097 1.6789,19.6997 1.79974,19.8292 1.95518,19.8983 2.11063,19.9501 2.25766,19.9069 2.39583,19.7687 3.24215,18.8361 4.37323,17.9984 5.78951,17.2557 7.06761,16.5821 8.44089,16.0553 9.90899,15.6754 11.2907,15.3126 12.5341,15.1313 13.6395,15.1313L13.6656,18.862C13.6656,19.2938 13.7605,19.6047 13.9505,19.7947 14.1059,19.9501 14.3045,20.0106 14.5463,19.976 14.7881,19.9242 15.0041,19.8119 15.1941,19.6392 15.8505,18.9829 17.0939,17.7739 18.9247,16.0121 20.531,14.475 21.5846,13.4559 22.0854,12.9551 22.3618,12.6787 22.5,12.3678 22.5,12.0224 22.4827,11.6769 22.3273,11.3574 22.0337,11.0638 19.9783,9.00847 17.6897,6.73724 15.168,4.25011 14.9953,4.07739 14.7967,3.99967 14.5722,4.01694 14.3304,4.01694 14.1232,4.11194 13.9505,4.30193 13.7605,4.47464 13.6656,4.71645 13.6656,5.02734z</Geometry>
+
+    <Geometry x:Key="PPTLBPreviousButtonGeometry">F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z</Geometry>
+    <Geometry x:Key="PPTLBNextButtonGeometry">F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z</Geometry>
+    <Geometry x:Key="PPTRBPreviousButtonGeometry">F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z</Geometry>
+    <Geometry x:Key="PPTRBNextButtonGeometry">F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z</Geometry>
+    <Geometry x:Key="PPTLSPreviousButtonGeometry">F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z</Geometry>
+    <Geometry x:Key="PPTLSNextButtonGeometry">F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z</Geometry>
+    <Geometry x:Key="PPTRSPreviousButtonGeometry">F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z</Geometry>
+    <Geometry x:Key="PPTRSNextButtonGeometry">F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z</Geometry>
+
+    <DrawingImage x:Key="BoardPenIcon">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="{StaticResource BoardPenGeometry}"/>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <BitmapImage x:Key="BoardColorThemeSwitchIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png"/>
+
+    <DrawingImage x:Key="ImageRotate45"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M12,3A9,9 0 1,1 3,12L5.2,12A6.8,6.8 0 1,0 12,5.2L12,8.2 16,4.2 12,0.2z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+    <DrawingImage x:Key="ImageRotate90"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M12,3A9,9 0 1,1 3,12L5.2,12A6.8,6.8 0 1,0 12,5.2L12,8.2 16,4.2 12,0.2z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+    <DrawingImage x:Key="ImageFlipHorizontal"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M2,4H11V20H2z M13,4H22V20H13z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+    <DrawingImage x:Key="ImageFlipVertical"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M4,2H20V11H4z M4,13H20V22H4z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+    <DrawingImage x:Key="ImageClone"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M7,7H17V17H7z M4,4H14V6H6V14H4z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+    <DrawingImage x:Key="ImageDelete"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z"><GeometryDrawing Brush="{DynamicResource IconForeground}" Geometry="F1 M24,24z M0,0z M9,3H15L16,5H20V7H4V5H8z M6,8H18L17,21H7z"/></DrawingGroup></DrawingImage.Drawing></DrawingImage>
+
+    <Style x:Key="ImageResizeHandleBase" TargetType="Ellipse">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Height" Value="8"/>
+        <Setter Property="Fill" Value="White"/>
+        <Setter Property="Stroke" Value="#0078D4"/>
+        <Setter Property="StrokeThickness" Value="1"/>
+    </Style>
+    <Style x:Key="ImageResizeHandleNWSE" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+        <Setter Property="Cursor" Value="SizeNWSE"/>
+    </Style>
+    <Style x:Key="ImageResizeHandleNESW" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+        <Setter Property="Cursor" Value="SizeNESW"/>
+    </Style>
+    <Style x:Key="ImageResizeHandleNS" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+        <Setter Property="Cursor" Value="SizeNS"/>
+    </Style>
+    <Style x:Key="ImageResizeHandleWE" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+        <Setter Property="Cursor" Value="SizeWE"/>
+    </Style>
+</ResourceDictionary>

From 4ad905d06c5487f1598c6fa828382be6f7541e09 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Tue, 7 Apr 2026 20:01:11 +0800
Subject: [PATCH 04/15] =?UTF-8?q?refactor:=20MainWindow=20=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E8=B5=84=E6=BA=90=E5=AD=97=E5=85=B8=E5=B9=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=86=85=E8=81=94=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 274 ++++++++++++-------------------------
 1 file changed, 85 insertions(+), 189 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index cf129f5f..9ea0266d 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -41,6 +41,8 @@
             <!-- 合并新橡皮擦资源 -->
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="MainWindow_cs/MW_Eraser.xaml"/>
+                <ResourceDictionary Source="MainWindow_cs/MW_Styles.xaml"/>
+                <ResourceDictionary Source="MainWindow_cs/MW_ToolbarIcons.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
@@ -149,71 +151,6 @@
                 <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="10" />
             </Style>
 
-            <!-- Navigation Button Style -->
-            <Style x:Key="NavButton" TargetType="Button">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <Border x:Name="border" Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      CornerRadius="4">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#27272a"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="True">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </Trigger>
-                                <!-- 使用多个DataTrigger替代动态绑定 -->
-                                <DataTrigger Binding="{Binding Tag}" Value="startup">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="canvas">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="gesture">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="inkrecognition">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="crashaction">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="ppt">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="advanced">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="automation">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="randomwindow">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="theme">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="shortcuts">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="about">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="plugins">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -520,7 +457,7 @@
                         </Grid>
                         
                         <!-- 内容区域 -->
-                        <ui:ScrollViewerEx Grid.Row="1" Margin="0,0,0,0" VerticalScrollBarVisibility="Auto"
+                        <ui:ScrollViewerEx Grid.Row="1" Margin="0,0,0,0" Style="{StaticResource SettingsPanelScrollViewer}"
                                            PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Dark"
                                            ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback"
                                            Name="SettingsPanelScrollViewer">
@@ -624,7 +561,7 @@
                                     </ikw:SimpleStackPanel>
                                 </ikw:SimpleStackPanel>
                             </Border>
-                            <GroupBox Name="GroupBoxModeSettings">
+                            <GroupBox Name="GroupBoxModeSettings" Style="{StaticResource GroupBoxModeSettings}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_Mode}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -643,7 +580,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             
-                            <GroupBox Name="GroupBoxSettings">
+                            <GroupBox Name="GroupBoxSettings" Style="{StaticResource GroupBoxNewSettings}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_NewWindow}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -656,7 +593,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             
-                            <GroupBox Name="GroupBoxStartup">
+                            <GroupBox Name="GroupBoxStartup" Style="{StaticResource GroupBoxStartup}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Startup_Start}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -797,7 +734,7 @@
                 -->
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxCanvas">
+                            <GroupBox Name="GroupBoxCanvas" Style="{StaticResource GroupBoxCanvas}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Canvas_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1024,7 +961,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             <!-- 崩溃后操作设置 -->
-                            <GroupBox Name="GroupBoxCrashAction">
+                            <GroupBox Name="GroupBoxCrashAction" Style="{StaticResource GroupBoxCrashAction}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Crash_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1042,7 +979,7 @@
                                     <TextBlock Text="{i18n:I18n Key=Crash_Hint}" Foreground="#a1a1aa" TextWrapping="Wrap" Width="420" />
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxGesture">
+                            <GroupBox Name="GroupBoxGesture" Style="{StaticResource GroupBoxGesture}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Gesture_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1098,7 +1035,7 @@
                                                Visibility="{Binding ElementName=ToggleSwitchEnablePalmEraser, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}" />    
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxInkRecognition">
+                            <GroupBox Name="GroupBoxInkRecognition" Style="{StaticResource GroupBoxInkRecognition}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=InkRecog_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1250,7 +1187,7 @@
                                     <TextBlock Text="{i18n:I18n Key=InkRecog_LineEndpointSnappingHint}" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxAppearanceNewUI">
+                            <GroupBox Name="GroupBoxAppearanceNewUI" Style="{StaticResource GroupBoxAppearanceNewUI}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Theme_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -5054,77 +4991,37 @@
                     Visibility="Collapsed" 
                     Panel.ZIndex="1000">
                 <!-- 四个角控制点 -->
-                <Ellipse Name="ImageTopLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNWSE"
+                <Ellipse Name="ImageTopLeftHandle" Style="{StaticResource ImageResizeHandleNWSE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageTopRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNESW"
+                <Ellipse Name="ImageTopRightHandle" Style="{StaticResource ImageResizeHandleNESW}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNESW"
+                <Ellipse Name="ImageBottomLeftHandle" Style="{StaticResource ImageResizeHandleNESW}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNWSE"
+                <Ellipse Name="ImageBottomRightHandle" Style="{StaticResource ImageResizeHandleNWSE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
                 
                 <!-- 四个边控制点 -->
-                <Ellipse Name="ImageTopHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNS"
+                <Ellipse Name="ImageTopHandle" Style="{StaticResource ImageResizeHandleNS}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNS"
+                <Ellipse Name="ImageBottomHandle" Style="{StaticResource ImageResizeHandleNS}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeWE"
+                <Ellipse Name="ImageLeftHandle" Style="{StaticResource ImageResizeHandleWE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeWE"
+                <Ellipse Name="ImageRightHandle" Style="{StaticResource ImageResizeHandleWE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
@@ -5360,7 +5257,7 @@
                                                                     Geometry="F0 M24,24z M0,0z M7.82154,10.0753L7.82154,3.74613C7.82154,3.06603 8.08946,2.40655 8.57377,1.92224 9.05808,1.43793 9.70726,1.17001 10.3977,1.17001 11.0881,1.17001 11.7372,1.43793 12.2216,1.92224 12.7059,2.40655 12.9738,3.05573 12.9738,3.74613L12.9738,6.37308C13.1415,6.33947 13.3139,6.32225 13.489,6.32225 14.1794,6.32225 14.8286,6.59016 15.3129,7.07447 15.4484,7.21001 15.567,7.35845 15.6675,7.5171 15.9551,7.40916 16.2634,7.35269 16.5803,7.35269 17.2707,7.35269 17.9199,7.62061 18.4042,8.10492 18.5461,8.24683 18.6695,8.4029 18.7729,8.57001 19.6856,8.26338 20.7674,8.45871 21.4647,9.15599 21.949,9.6403 22.2169,10.2998 22.2169,10.9799L22.2169,15.6169C22.2169,17.5438 21.4647,19.3574 20.1045,20.7176 18.7443,22.0778 16.9307,22.83 15.0038,22.83L13.149,22.83 13.1799,22.8094 12.8398,22.8094C11.7682,22.7579 10.7068,22.4694 9.75878,21.9541 8.70773,21.3874 7.81124,20.563 7.15175,19.5738L6.94566,19.2647C6.60562,18.7494 5.49273,16.8019 3.52458,13.3087 3.19484,12.7213 3.1021,12.0412 3.27727,11.3818 3.45245,10.7326 3.86463,10.1761 4.44168,9.83608 5.00842,9.49604 5.66791,9.35177 6.31709,9.43421 6.86548,9.50385 7.39181,9.7279 7.82154,10.0753z M10.037,3.38547C10.1297,3.28243 10.2637,3.23091 10.3977,3.23091 10.5316,3.23091 10.6656,3.29273 10.7583,3.38547 10.8614,3.47821 10.9129,3.61217 10.9129,3.74613L10.9129,11.4745C10.9129,12.0412 11.3766,12.5049 11.9433,12.5049 12.5101,12.5049 12.9738,12.0412 12.9738,11.4745L12.9738,8.89836C12.9738,8.7644 13.0356,8.63045 13.1283,8.53771 13.2211,8.43466 13.355,8.38314 13.489,8.38314 13.623,8.38314 13.7569,8.44497 13.8497,8.53771 13.9527,8.63045 14.0042,8.7644 14.0042,8.89836L14.0042,11.4745C14.0042,12.0412 14.4679,12.5049 15.0347,12.5049 15.6014,12.5049 16.0651,12.0412 16.0651,11.4745L16.0651,9.92881C16.0651,9.79485 16.1269,9.66089 16.2197,9.56815 16.3124,9.46511 16.4464,9.41359 16.5803,9.41359 16.7143,9.41359 16.8483,9.47541 16.941,9.56815 17.044,9.66089 17.0956,9.79485 17.0956,9.92881L17.0956,10.5869C17.0752,10.7163 17.0646,10.8477 17.0646,10.9799 17.0646,11.0661 17.0754,11.1499 17.0956,11.2301L17.0956,11.4745C17.0956,12.0412 17.5593,12.5049 18.126,12.5049 18.6928,12.5049 19.1565,12.0412 19.1565,11.4745L19.1565,10.8128C19.1834,10.7399 19.2266,10.6727 19.2801,10.6192 19.4759,10.4234 19.8159,10.4234 20.0117,10.6192 20.1148,10.712 20.1663,10.8459 20.1663,10.9799L20.1663,15.6169C20.1663,16.9977 19.6408,18.296 18.6618,19.2647 17.6829,20.2333 16.3949,20.7691 15.0141,20.7691L13.1593,20.7691C12.3143,20.7691 11.4796,20.5527 10.7274,20.1509 9.98548,19.749 9.3363,19.1616 8.8726,18.4506L8.66651,18.1415C8.35737,17.6675 7.23419,15.7096 5.31756,12.2988 5.24543,12.1752 5.23512,12.0412 5.26604,11.9073 5.30725,11.7733 5.38969,11.6703 5.50304,11.5981 5.66791,11.4951 5.874,11.4539 6.06978,11.4745 6.26557,11.5054 6.45105,11.5878 6.59531,11.7321L8.11007,13.2469C8.49419,13.631 9.10425,13.648 9.50833,13.2978 9.73651,13.1084 9.88244,12.8229 9.88244,12.5049L9.88244,3.74613C9.88244,3.61217,9.94426,3.47821,10.037,3.38547z M2.99905,6.31195L1.78313,4.65293 2.61779,4.04497C3.46275,3.4267,4.37985,2.89087,5.33817,2.46838L6.27587,2.0459 7.12084,3.93162 6.18313,4.3541C5.35878,4.72506,4.56533,5.17846,3.83372,5.71429L2.99905,6.32225 2.99905,6.31195z M18.2806,5.20935L19.1565,5.75549 20.259,4.01404 19.3831,3.4679C18.1157,2.67446,16.7452,2.0768,15.3026,1.68523L14.303,1.41731 13.7672,3.40607 14.7667,3.67399C16.0033,4.00373,17.1883,4.51895,18.2806,5.20935z" />
                                                                 <GeometryDrawing x:Name="BoardGestureGeometry2"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F0 M24,24z M0,0z " />
+                                                                    Geometry="{StaticResource BoardGestureGeometry2}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5373,7 +5270,7 @@
                                     </Border>
                                     <Border>
                                         <Grid Width="0" Margin="0,0,0,5" RenderTransformOrigin="0,1">
-                                            <Border ClipToBounds="True" x:Name="BoardTwoFingerGestureBorder"
+                                            <Border ClipToBounds="True" x:Name="BoardTwoFingerGestureBorder" Style="{StaticResource BoardTwoFingerGestureBorder}"
                                                 Margin="-115,-161,-55,50"
                                                 CornerRadius="8"
                                                 Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
@@ -5554,7 +5451,7 @@
 
                             <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}" Margin="0,0,5,0">
                                 <ikw:SimpleStackPanel Orientation="Horizontal">
-                                    <Border x:Name="BoardSelect" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardSelect" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardSelect}"
                                             BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="SymbolIconSelect_MouseUp" CornerRadius="5,0,0,5"
                                             Background="{DynamicResource BoardFloatBarBackground}"
@@ -5568,7 +5465,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardSelectGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M22.7989,10.1653L1.14304,1.14304 10.1653,22.7989 12.8305,14.9518 19.6892,21.8105 21.8105,19.6892 14.9518,12.8305 22.7989,10.1653z" />
+                                                                    Geometry="{StaticResource BoardSelectGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5579,7 +5476,7 @@
                                                        HorizontalAlignment="Center" FontSize="12" />
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardPen}"
                                             BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="PenIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
                                         <Grid Margin="6,6,6,4">
@@ -5591,7 +5488,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardPenGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M20.4786,1.42438C19.9985,1.23743 19.4847,1.15194 18.9698,1.17319 18.4549,1.19444 17.9499,1.32197 17.4869,1.54789 17.0368,1.76752 16.6358,2.07554 16.3083,2.45361L3.85516,14.9067 9.08243,20.134 21.5311,7.68529C21.9113,7.36382 22.223,6.96912 22.447,6.52438 22.6786,6.06462 22.8113,5.56167 22.8365,5.04763 22.8616,4.5336 22.7787,4.02012 22.593,3.54002 22.4073,3.05994 22.1232,2.62403 21.759,2.25988 21.3949,1.89574 20.9587,1.61132 20.4786,1.42438z M7.28056,21.1605L2.8286,16.7086 1.15912,22.83 7.28056,21.1605z" />
+                                                                    Geometry="{StaticResource BoardPenGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5629,7 +5526,7 @@
                                                                 <ikw:SimpleStackPanel Orientation="Horizontal"
                                                                     HorizontalAlignment="Stretch"
                                                                     Margin="8,0,0,0" Spacing="2">
-                                                                    <Border x:Name="BoardDefaultPenTabButton"
+                                                                    <Border x:Name="BoardDefaultPenTabButton" Style="{StaticResource BoardDefaultPenTabButton}"
                                                                             MouseDown="SwitchToDefaultPen"
                                                                             Background="#48dbeafe" Height="20"
                                                                             Width="36"
@@ -5667,7 +5564,7 @@
                                                                             </ikw:SimpleStackPanel>
                                                                         </Canvas>
                                                                     </Border>
-                                                                    <Border x:Name="BoardHighlightPenTabButton"
+                                                                    <Border x:Name="BoardHighlightPenTabButton" Style="{StaticResource BoardHighlightPenTabButton}"
                                                                             MouseDown="SwitchToHighlighterPen"
                                                                             Background="Transparent" Height="20"
                                                                             Width="52"
@@ -5877,7 +5774,7 @@
                                                                                     <Grid Margin="3">
                                                                                         <Image
                                                                                             x:Name="BoardColorThemeSwitchIcon"
-                                                                                            Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png"
+                                                                                            Source="{StaticResource BoardColorThemeSwitchIcon}"
                                                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                                                             VerticalAlignment="Top"
                                                                                             Width="23"
@@ -5893,7 +5790,7 @@
                                                                                     </Grid>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorBlack"
+                                                                                    x:Name="BoardBorderPenColorBlack" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="Black"
                                                                                     BorderBrush="#D3D3D3"
                                                                                     BorderThickness="1.5"
@@ -5914,7 +5811,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorWhite"
+                                                                                    x:Name="BoardBorderPenColorWhite" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="White"
                                                                                     BorderBrush="#71717a"
                                                                                     BorderThickness="1.5"
@@ -5934,7 +5831,7 @@
                                                                                             Margin="0,0,0,0" />
                                                                                     </Viewbox>
                                                                                 </Border>
-                                                                                <Border x:Name="BoardBorderPenColorRed"
+                                                                                <Border x:Name="BoardBorderPenColorRed" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#dc2626"
                                                                                     BorderBrush="#7f1d1d"
                                                                                     BorderThickness="1.5"
@@ -5955,7 +5852,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorYellow"
+                                                                                    x:Name="BoardBorderPenColorYellow" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#eab308"
                                                                                     BorderBrush="#713f12"
                                                                                     BorderThickness="1.5"
@@ -5984,7 +5881,7 @@
                                                                                 Margin="0">
 
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorGreen"
+                                                                                    x:Name="BoardBorderPenColorGreen" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#16a34a"
                                                                                     BorderBrush="#14532d"
                                                                                     BorderThickness="1.5"
@@ -6005,7 +5902,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorBlue"
+                                                                                    x:Name="BoardBorderPenColorBlue" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#2563eb"
                                                                                     BorderBrush="#1e3a8a"
                                                                                     BorderThickness="1.5"
@@ -6026,7 +5923,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorPink"
+                                                                                    x:Name="BoardBorderPenColorPink" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#db2777"
                                                                                     BorderBrush="#831843"
                                                                                     BorderThickness="1.5"
@@ -6047,7 +5944,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorTeal"
+                                                                                    x:Name="BoardBorderPenColorTeal" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#0d9488"
                                                                                     BorderBrush="#134e4a"
                                                                                     BorderThickness="1.5"
@@ -6068,7 +5965,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorOrange"
+                                                                                    x:Name="BoardBorderPenColorOrange" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#ea580c"
                                                                                     BorderBrush="#7c2d12"
                                                                                     BorderThickness="1.5"
@@ -6488,7 +6385,7 @@
 
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardEraser}"
                                             BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="BoardEraserIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
                                         <Grid Margin="6,6,6,4">
@@ -6500,7 +6397,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardEraserGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M15.6314,20.7262L22.7921,13.5655C24.3494,12.141,24.2819,9.81776,22.8105,8.34633L16.7793,2.31508C15.3547,0.757753,13.0315,0.825236,11.5601,2.29666L4.38099,9.47574 15.6314,20.7262z M14.2172,22.1404L2.96677,10.89 1.20761,12.6491C-0.34971,14.0737,-0.281711,16.3974,1.18971,17.8688L6.15089,22.83 13.5276,22.83 14.2172,22.1404z" />
+                                                                    Geometry="{StaticResource BoardEraserGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -6522,7 +6419,7 @@
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
                                             <Border Visibility="Visible" ClipToBounds="True"
-                                                    Name="BoardEraserSizePanel"
+                                                    Name="BoardEraserSizePanel" Style="{StaticResource BoardEraserSizePanel}"
                                                     CornerRadius="5" Background="{DynamicResource FloatBarBackground}"
                                                     Opacity="1"
                                                     BorderBrush="#2563eb" BorderThickness="1">
@@ -6576,7 +6473,7 @@
                                                     <ikw:SimpleStackPanel Orientation="Horizontal"
                                                                          HorizontalAlignment="Center"
                                                                          Margin="0,0,0,0" Spacing="4">
-                                                        <Border x:Name="BoardCircleEraserTabButton"
+                                                        <Border x:Name="BoardCircleEraserTabButton" Style="{StaticResource BoardCircleEraserTabButton}"
                                                                 MouseDown="SwitchToCircleEraser"
                                                                 Background="{DynamicResource BoardFloatBarButtonBackgroundPointerOverKey}" Height="20" Width="40"
                                                                 CornerRadius="3">
@@ -6603,7 +6500,7 @@
                                                                 </ikw:SimpleStackPanel>
                                                             </Canvas>
                                                         </Border>
-                                                        <Border x:Name="BoardRectangleEraserTabButton"
+                                                        <Border x:Name="BoardRectangleEraserTabButton" Style="{StaticResource BoardRectangleEraserTabButton}"
                                                                 MouseDown="SwitchToRectangleEraser"
                                                                 Background="{DynamicResource BoardFloatBarButtonBackgroundKey}"
                                                                 Height="20" Width="40" CornerRadius="3">
@@ -6745,7 +6642,7 @@
                                         </Grid>
                                     </Border>
                                     <Border Width="0">
-                                        <Border x:Name="BoardBorderDrawShape" Visibility="Visible"
+                                        <Border x:Name="BoardBorderDrawShape" Visibility="Visible" Style="{StaticResource BoardBorderDrawShape}"
                                                 Background="{DynamicResource FloatBarBackground}"
                                                 Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="5"
                                                 Margin="-147,-286,-89,55">
@@ -7072,7 +6969,7 @@
                                                     <TranslateTransform />
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
-                                            <Border ClipToBounds="True" Name="BoardBorderTools"
+                                        <Border ClipToBounds="True" Name="BoardBorderTools" Style="{StaticResource BoardBorderTools}"
                                                     Margin="-80,-138.5,-39,33.5"
                                                     CornerRadius="5" Background="{DynamicResource SettingsPageBackground}" Opacity="1"
                                                     BorderThickness="1"
@@ -7575,7 +7472,7 @@
 
 
         <!-- 通知弹窗 -->
-        <Grid Name="GridNotifications" Margin="0,110" Visibility="Collapsed" HorizontalAlignment="Center"
+        <Grid Name="GridNotifications" Margin="0,110" Visibility="Collapsed" HorizontalAlignment="Center" Style="{StaticResource GridNotifications}"
               VerticalAlignment="Bottom">
             <Border CornerRadius="6" MaxHeight="200" Padding="20 10" Background="{DynamicResource SettingsPageBackground}" Opacity="0.95"
                     BorderBrush="#b91c1c" BorderThickness="1.5">
@@ -7714,13 +7611,13 @@
                     <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLBBorder"
                             Background="#f4f4f5" Opacity="1" CornerRadius="6">
                         <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                                     Name="PPTLBPreviousButtonBorder"
                                     MouseDown="GridPPTControlPrevious_MouseDown"
                                     MouseLeave="GridPPTControlPrevious_MouseLeave"
                                     CornerRadius="5 5 0 0" Background="Transparent">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image Height="28" Width="28">
                                         <Image.Source>
@@ -7729,7 +7626,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTLBPreviousButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z" />
+                                                                         Geometry="{StaticResource PPTLBPreviousButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7737,12 +7634,12 @@
                                     </Image>
                                 </Grid>
                             </Border>
-                            <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717"
+                            <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                                     MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                                     MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                                     Background="Transparent">
                                 <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder"
+                                    <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                                          Spacing="0.5" Margin="12,0">
@@ -7756,11 +7653,11 @@
 
                                 </Grid>
                             </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                                     MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                                     CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLBNextButtonBorder">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                            Width="28">
@@ -7770,7 +7667,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTLBNextButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z" />
+                                                                         Geometry="{StaticResource PPTLBNextButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7786,13 +7683,13 @@
                     <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRBBorder"
                             Background="#f4f4f5" Opacity="1" CornerRadius="6">
                         <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                                     Name="PPTRBPreviousButtonBorder"
                                     MouseDown="GridPPTControlPrevious_MouseDown"
                                     MouseLeave="GridPPTControlPrevious_MouseLeave"
                                     CornerRadius="5 5 0 0" Background="Transparent">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image Height="28" Width="28">
                                         <Image.Source>
@@ -7801,7 +7698,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTRBPreviousButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z" />
+                                                                         Geometry="{StaticResource PPTRBPreviousButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7809,12 +7706,12 @@
                                     </Image>
                                 </Grid>
                             </Border>
-                            <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717"
+                            <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                                     MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                                     MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                                     Background="Transparent">
                                 <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder"
+                                    <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                                          Spacing="0.5" Margin="12,0">
@@ -7828,11 +7725,11 @@
 
                                 </Grid>
                             </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                                     MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                                     CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRBNextButtonBorder">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                            Width="28">
@@ -7842,7 +7739,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTRBNextButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z" />
+                                                                         Geometry="{StaticResource PPTRBNextButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7862,12 +7759,12 @@
             <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLSBorder"
                     Background="#f4f4f5" Opacity="1" CornerRadius="6" Margin="6,0,0,0">
                 <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                             Name="PPTLSPreviousButtonBorder"
                             MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
                             CornerRadius="5 5 0 0" Background="Transparent">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image Height="28" Width="28">
                                 <Image.Source>
@@ -7875,7 +7772,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTLSPreviousButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z" />
+                                                                 Geometry="{StaticResource PPTLSPreviousButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7883,12 +7780,12 @@
                             </Image>
                         </Grid>
                     </Border>
-                    <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717"
+                    <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                             MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                             MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
                             Background="Transparent">
                         <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder"
+                            <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
                                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -7899,11 +7796,11 @@
                             </ikw:SimpleStackPanel>
                         </Grid>
                     </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                             MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                             CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLSNextButtonBorder">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
                                 <Image.Source>
@@ -7911,7 +7808,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTLSNextButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z" />
+                                                                 Geometry="{StaticResource PPTLSNextButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7927,12 +7824,12 @@
             <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRSBorder"
                     Background="#f4f4f5" Opacity="1" CornerRadius="6"  Margin="0,0,6,0">
                 <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                             Name="PPTRSPreviousButtonBorder"
                             MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
                             CornerRadius="5 5 0 0" Background="Transparent">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image Height="28" Width="28">
                                 <Image.Source>
@@ -7940,7 +7837,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTRSPreviousButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z" />
+                                                                 Geometry="{StaticResource PPTRSPreviousButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7948,12 +7845,12 @@
                             </Image>
                         </Grid>
                     </Border>
-                    <Border Visibility="Visible" Name="PPTRSPageButton"
+                    <Border Visibility="Visible" Name="PPTRSPageButton" Style="{StaticResource PPTPageButtonBase}"
                             MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                             MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
                             Background="Transparent" TextBlock.Foreground="#171717">
                         <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder"
+                            <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
                                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -7965,11 +7862,11 @@
                             </ikw:SimpleStackPanel>
                         </Grid>
                     </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                             MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                             CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRSNextButtonBorder">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
                                 <Image.Source>
@@ -7977,7 +7874,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTRSNextButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z" />
+                                                                 Geometry="{StaticResource PPTRSNextButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -9560,7 +9457,7 @@
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="ShapesIconGeometry"
                                                                              Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M8.7269,2.9067C8.84872,2.70875 9.00852,2.57931 9.20647,2.5184 9.41966,2.44227 9.62541,2.43465 9.82337,2.49556 10.0365,2.55647 10.2039,2.67829 10.3257,2.86102L13.9118,8.13731C12.9068,8.47231 12.0084,8.99766 11.2165,9.71334 10.4247,10.4138 9.8157,11.2513 9.38933,12.2259 8.93251,13.2156 8.70413,14.2587 8.70413,15.3551L8.7269,15.9946 2.46851,15.9946C2.22487,15.9946 2.01158,15.9185 1.82885,15.7662 1.66135,15.614 1.55481,15.4236 1.50913,15.1952 1.47868,14.9668 1.5244,14.746 1.64622,14.5328L8.7269,2.9067z M16.3329,21.545C15.2061,21.545 14.1632,21.2633 13.2038,20.6999 12.275,20.1517 11.5288,19.4056 10.9654,18.4615 10.4172,17.5022 10.1431,16.4667 10.1431,15.3551 10.1431,14.2283 10.4172,13.1928 10.9654,12.2487 11.5288,11.3046 12.2825,10.5585 13.2266,10.0103 14.1707,9.44687 15.1986,9.16516 16.3102,9.16516 17.437,9.16516 18.4724,9.44687 19.4165,10.0103 20.3606,10.5585 21.1068,11.3046 21.6549,12.2487 22.2184,13.1928 22.5,14.2283 22.5,15.3551 22.5,16.4667 22.2184,17.5022 21.6549,18.4615 21.1068,19.4056 20.3683,20.1517 19.4395,20.6999 18.4801,21.2633 17.4445,21.545 16.3329,21.545z" />
+                                                                             Geometry="{StaticResource ShapesIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9572,7 +9469,7 @@
                                     </ikw:SimpleStackPanel>
 
                                     <Grid Width="0">
-                                        <Border x:Name="BorderDrawShape" Background="{DynamicResource FloatBarBackground}" Opacity="1"
+                                        <Border x:Name="BorderDrawShape" Background="{DynamicResource FloatBarBackground}" Opacity="1" Style="{StaticResource BorderDrawShape}"
                                                 Visibility="Visible" BorderBrush="#2563eb"
                                                 BorderThickness="1"
                                                 CornerRadius="5" Margin="-170,-140,-147,37">
@@ -9834,7 +9731,7 @@
                                                     <DrawingImage.Drawing>
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="UndoIconGeometry" Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M10.3344,5.02734L10.3605,8.62849C12.2431,8.87029 14.0305,9.44026 15.7232,10.3384 17.4676,11.2538 18.9187,12.4196 20.0759,13.8359 21.3367,15.3731 22.1398,17.0657 22.4852,18.9138 22.5197,19.1211 22.4938,19.3197 22.4075,19.5097 22.3211,19.6997 22.2003,19.8292 22.0448,19.8983 21.8894,19.9501 21.7423,19.9069 21.6042,19.7687 20.7579,18.8361 19.6268,17.9984 18.2105,17.2557 16.9324,16.5821 15.5591,16.0553 14.091,15.6754 12.7093,15.3126 11.4659,15.1313 10.3605,15.1313L10.3344,18.862C10.3344,19.2938 10.2395,19.6047 10.0495,19.7947 9.8941,19.9501 9.69547,20.0106 9.45367,19.976 9.21187,19.9242 8.99586,19.8119 8.80587,19.6392 8.14955,18.9829 6.90606,17.7739 5.07526,16.0121 3.46899,14.475 2.41544,13.4559 1.91456,12.9551 1.63821,12.6787 1.5,12.3678 1.5,12.0224 1.51727,11.6769 1.67272,11.3574 1.96634,11.0638 4.02168,9.00847 6.3103,6.73724 8.83197,4.25011 9.00468,4.07739 9.20331,3.99967 9.42784,4.01694 9.66965,4.01694 9.87683,4.11194 10.0495,4.30193 10.2395,4.47464 10.3344,4.71645 10.3344,5.02734z" />
+                                                                             Geometry="{StaticResource UndoIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9863,7 +9760,7 @@
                                                     <DrawingImage.Drawing>
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="RedoIconGeometry" Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M13.6656,5.02734L13.6395,8.62849C11.7569,8.87029 9.96948,9.44026 8.27685,10.3384 6.5324,11.2538 5.08134,12.4196 3.92413,13.8359 2.6633,15.3731 1.86023,17.0657 1.5148,18.9138 1.48026,19.1211 1.50619,19.3197 1.59255,19.5097 1.6789,19.6997 1.79974,19.8292 1.95518,19.8983 2.11063,19.9501 2.25766,19.9069 2.39583,19.7687 3.24215,18.8361 4.37323,17.9984 5.78951,17.2557 7.06761,16.5821 8.44089,16.0553 9.90899,15.6754 11.2907,15.3126 12.5341,15.1313 13.6395,15.1313L13.6656,18.862C13.6656,19.2938 13.7605,19.6047 13.9505,19.7947 14.1059,19.9501 14.3045,20.0106 14.5463,19.976 14.7881,19.9242 15.0041,19.8119 15.1941,19.6392 15.8505,18.9829 17.0939,17.7739 18.9247,16.0121 20.531,14.475 21.5846,13.4559 22.0854,12.9551 22.3618,12.6787 22.5,12.3678 22.5,12.0224 22.4827,11.6769 22.3273,11.3574 22.0337,11.0638 19.9783,9.00847 17.6897,6.73724 15.168,4.25011 14.9953,4.07739 14.7967,3.99967 14.5722,4.01694 14.3304,4.01694 14.1232,4.11194 13.9505,4.30193 13.7605,4.47464 13.6656,4.71645 13.6656,5.02734z" />
+                                                                             Geometry="{StaticResource RedoIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9904,7 +9801,7 @@
                                     <Grid x:Name="BackgroundPaletteGrid" Margin="-203,-128,83,37">
                                         <!-- 背景面板将在代码中动态添加 -->
                                     </Grid>
-                                    <Border Visibility="Visible" ClipToBounds="True" Name="EraserSizePanel"
+                                        <Border Visibility="Visible" ClipToBounds="True" Name="EraserSizePanel" Style="{StaticResource EraserSizePanel}"
                                             Margin="-203,-148,83,40" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1"
                                             BorderBrush="#2563eb" BorderThickness="1">
                                         <ikw:SimpleStackPanel Margin="0">
@@ -10114,7 +10011,7 @@
                                                    Style="{StaticResource AutoFitMainToolbarLabel8}" />
                                     </ikw:SimpleStackPanel>
                                     <Grid Width="0">
-                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37"
+                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37" Style="{StaticResource BorderTools}"
                                                 CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderThickness="1"
                                                 BorderBrush="#2563eb">
                                             <ikw:SimpleStackPanel Margin="-1,0,0,0">
@@ -10339,7 +10236,7 @@
                     </Border>
 
 
-                    <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
+                    <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36" Style="{StaticResource EnableTwoFingerGestureBorder}"
                             Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}"
                             BorderThickness="1">
                         <ikw:SimpleStackPanel
@@ -10355,7 +10252,7 @@
                         </ikw:SimpleStackPanel>
                     </Border>
                     <Grid Width="0">
-                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40"
+                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40" Style="{StaticResource TwoFingerGestureBorder}"
                                 CornerRadius="5"
                                 Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
                                 BorderThickness="1">
@@ -11066,4 +10963,3 @@
         </Border>
     </Grid>
 </Window>
-

From b00b84515ddb4a38d2b2888106bbb827e93daf19 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Tue, 7 Apr 2026 20:01:11 +0800
Subject: [PATCH 05/15] =?UTF-8?q?refactor:=20MainWindow=20=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E8=B5=84=E6=BA=90=E5=AD=97=E5=85=B8=E5=B9=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=86=85=E8=81=94=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml              | 274 ++++++++----------------
 Ink Canvas/MainWindow_cs/MW_Styles.xaml |   1 +
 2 files changed, 86 insertions(+), 189 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index cf129f5f..9ea0266d 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -41,6 +41,8 @@
             <!-- 合并新橡皮擦资源 -->
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="MainWindow_cs/MW_Eraser.xaml"/>
+                <ResourceDictionary Source="MainWindow_cs/MW_Styles.xaml"/>
+                <ResourceDictionary Source="MainWindow_cs/MW_ToolbarIcons.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
@@ -149,71 +151,6 @@
                 <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="10" />
             </Style>
 
-            <!-- Navigation Button Style -->
-            <Style x:Key="NavButton" TargetType="Button">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <Border x:Name="border" Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      CornerRadius="4">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#27272a"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="True">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </Trigger>
-                                <!-- 使用多个DataTrigger替代动态绑定 -->
-                                <DataTrigger Binding="{Binding Tag}" Value="startup">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="canvas">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="gesture">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="inkrecognition">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="crashaction">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="ppt">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="advanced">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="automation">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="randomwindow">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="theme">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="shortcuts">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="about">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Tag}" Value="plugins">
-                                    <Setter Property="Background" Value="#3b82f6"/>
-                                </DataTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -520,7 +457,7 @@
                         </Grid>
                         
                         <!-- 内容区域 -->
-                        <ui:ScrollViewerEx Grid.Row="1" Margin="0,0,0,0" VerticalScrollBarVisibility="Auto"
+                        <ui:ScrollViewerEx Grid.Row="1" Margin="0,0,0,0" Style="{StaticResource SettingsPanelScrollViewer}"
                                            PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Dark"
                                            ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback"
                                            Name="SettingsPanelScrollViewer">
@@ -624,7 +561,7 @@
                                     </ikw:SimpleStackPanel>
                                 </ikw:SimpleStackPanel>
                             </Border>
-                            <GroupBox Name="GroupBoxModeSettings">
+                            <GroupBox Name="GroupBoxModeSettings" Style="{StaticResource GroupBoxModeSettings}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_Mode}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -643,7 +580,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             
-                            <GroupBox Name="GroupBoxSettings">
+                            <GroupBox Name="GroupBoxSettings" Style="{StaticResource GroupBoxNewSettings}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_NewWindow}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -656,7 +593,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             
-                            <GroupBox Name="GroupBoxStartup">
+                            <GroupBox Name="GroupBoxStartup" Style="{StaticResource GroupBoxStartup}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Startup_Start}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -797,7 +734,7 @@
                 -->
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxCanvas">
+                            <GroupBox Name="GroupBoxCanvas" Style="{StaticResource GroupBoxCanvas}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Canvas_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1024,7 +961,7 @@
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
                             <!-- 崩溃后操作设置 -->
-                            <GroupBox Name="GroupBoxCrashAction">
+                            <GroupBox Name="GroupBoxCrashAction" Style="{StaticResource GroupBoxCrashAction}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Crash_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1042,7 +979,7 @@
                                     <TextBlock Text="{i18n:I18n Key=Crash_Hint}" Foreground="#a1a1aa" TextWrapping="Wrap" Width="420" />
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxGesture">
+                            <GroupBox Name="GroupBoxGesture" Style="{StaticResource GroupBoxGesture}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Gesture_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1098,7 +1035,7 @@
                                                Visibility="{Binding ElementName=ToggleSwitchEnablePalmEraser, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}" />    
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxInkRecognition">
+                            <GroupBox Name="GroupBoxInkRecognition" Style="{StaticResource GroupBoxInkRecognition}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=InkRecog_Title}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -1250,7 +1187,7 @@
                                     <TextBlock Text="{i18n:I18n Key=InkRecog_LineEndpointSnappingHint}" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ikw:SimpleStackPanel>
                             </GroupBox>
-                            <GroupBox Name="GroupBoxAppearanceNewUI">
+                            <GroupBox Name="GroupBoxAppearanceNewUI" Style="{StaticResource GroupBoxAppearanceNewUI}">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Theme_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
                                                FontSize="26" />
@@ -5054,77 +4991,37 @@
                     Visibility="Collapsed" 
                     Panel.ZIndex="1000">
                 <!-- 四个角控制点 -->
-                <Ellipse Name="ImageTopLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNWSE"
+                <Ellipse Name="ImageTopLeftHandle" Style="{StaticResource ImageResizeHandleNWSE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageTopRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNESW"
+                <Ellipse Name="ImageTopRightHandle" Style="{StaticResource ImageResizeHandleNESW}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNESW"
+                <Ellipse Name="ImageBottomLeftHandle" Style="{StaticResource ImageResizeHandleNESW}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNWSE"
+                <Ellipse Name="ImageBottomRightHandle" Style="{StaticResource ImageResizeHandleNWSE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
                 
                 <!-- 四个边控制点 -->
-                <Ellipse Name="ImageTopHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNS"
+                <Ellipse Name="ImageTopHandle" Style="{StaticResource ImageResizeHandleNS}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeNS"
+                <Ellipse Name="ImageBottomHandle" Style="{StaticResource ImageResizeHandleNS}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageLeftHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeWE"
+                <Ellipse Name="ImageLeftHandle" Style="{StaticResource ImageResizeHandleWE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageRightHandle" 
-                         Width="8" Height="8" 
-                         Fill="White" 
-                         Stroke="#0078D4" 
-                         StrokeThickness="1" 
-                         Cursor="SizeWE"
+                <Ellipse Name="ImageRightHandle" Style="{StaticResource ImageResizeHandleWE}"
                          MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
                          MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
                          MouseMove="ImageResizeHandle_MouseMove" />
@@ -5360,7 +5257,7 @@
                                                                     Geometry="F0 M24,24z M0,0z M7.82154,10.0753L7.82154,3.74613C7.82154,3.06603 8.08946,2.40655 8.57377,1.92224 9.05808,1.43793 9.70726,1.17001 10.3977,1.17001 11.0881,1.17001 11.7372,1.43793 12.2216,1.92224 12.7059,2.40655 12.9738,3.05573 12.9738,3.74613L12.9738,6.37308C13.1415,6.33947 13.3139,6.32225 13.489,6.32225 14.1794,6.32225 14.8286,6.59016 15.3129,7.07447 15.4484,7.21001 15.567,7.35845 15.6675,7.5171 15.9551,7.40916 16.2634,7.35269 16.5803,7.35269 17.2707,7.35269 17.9199,7.62061 18.4042,8.10492 18.5461,8.24683 18.6695,8.4029 18.7729,8.57001 19.6856,8.26338 20.7674,8.45871 21.4647,9.15599 21.949,9.6403 22.2169,10.2998 22.2169,10.9799L22.2169,15.6169C22.2169,17.5438 21.4647,19.3574 20.1045,20.7176 18.7443,22.0778 16.9307,22.83 15.0038,22.83L13.149,22.83 13.1799,22.8094 12.8398,22.8094C11.7682,22.7579 10.7068,22.4694 9.75878,21.9541 8.70773,21.3874 7.81124,20.563 7.15175,19.5738L6.94566,19.2647C6.60562,18.7494 5.49273,16.8019 3.52458,13.3087 3.19484,12.7213 3.1021,12.0412 3.27727,11.3818 3.45245,10.7326 3.86463,10.1761 4.44168,9.83608 5.00842,9.49604 5.66791,9.35177 6.31709,9.43421 6.86548,9.50385 7.39181,9.7279 7.82154,10.0753z M10.037,3.38547C10.1297,3.28243 10.2637,3.23091 10.3977,3.23091 10.5316,3.23091 10.6656,3.29273 10.7583,3.38547 10.8614,3.47821 10.9129,3.61217 10.9129,3.74613L10.9129,11.4745C10.9129,12.0412 11.3766,12.5049 11.9433,12.5049 12.5101,12.5049 12.9738,12.0412 12.9738,11.4745L12.9738,8.89836C12.9738,8.7644 13.0356,8.63045 13.1283,8.53771 13.2211,8.43466 13.355,8.38314 13.489,8.38314 13.623,8.38314 13.7569,8.44497 13.8497,8.53771 13.9527,8.63045 14.0042,8.7644 14.0042,8.89836L14.0042,11.4745C14.0042,12.0412 14.4679,12.5049 15.0347,12.5049 15.6014,12.5049 16.0651,12.0412 16.0651,11.4745L16.0651,9.92881C16.0651,9.79485 16.1269,9.66089 16.2197,9.56815 16.3124,9.46511 16.4464,9.41359 16.5803,9.41359 16.7143,9.41359 16.8483,9.47541 16.941,9.56815 17.044,9.66089 17.0956,9.79485 17.0956,9.92881L17.0956,10.5869C17.0752,10.7163 17.0646,10.8477 17.0646,10.9799 17.0646,11.0661 17.0754,11.1499 17.0956,11.2301L17.0956,11.4745C17.0956,12.0412 17.5593,12.5049 18.126,12.5049 18.6928,12.5049 19.1565,12.0412 19.1565,11.4745L19.1565,10.8128C19.1834,10.7399 19.2266,10.6727 19.2801,10.6192 19.4759,10.4234 19.8159,10.4234 20.0117,10.6192 20.1148,10.712 20.1663,10.8459 20.1663,10.9799L20.1663,15.6169C20.1663,16.9977 19.6408,18.296 18.6618,19.2647 17.6829,20.2333 16.3949,20.7691 15.0141,20.7691L13.1593,20.7691C12.3143,20.7691 11.4796,20.5527 10.7274,20.1509 9.98548,19.749 9.3363,19.1616 8.8726,18.4506L8.66651,18.1415C8.35737,17.6675 7.23419,15.7096 5.31756,12.2988 5.24543,12.1752 5.23512,12.0412 5.26604,11.9073 5.30725,11.7733 5.38969,11.6703 5.50304,11.5981 5.66791,11.4951 5.874,11.4539 6.06978,11.4745 6.26557,11.5054 6.45105,11.5878 6.59531,11.7321L8.11007,13.2469C8.49419,13.631 9.10425,13.648 9.50833,13.2978 9.73651,13.1084 9.88244,12.8229 9.88244,12.5049L9.88244,3.74613C9.88244,3.61217,9.94426,3.47821,10.037,3.38547z M2.99905,6.31195L1.78313,4.65293 2.61779,4.04497C3.46275,3.4267,4.37985,2.89087,5.33817,2.46838L6.27587,2.0459 7.12084,3.93162 6.18313,4.3541C5.35878,4.72506,4.56533,5.17846,3.83372,5.71429L2.99905,6.32225 2.99905,6.31195z M18.2806,5.20935L19.1565,5.75549 20.259,4.01404 19.3831,3.4679C18.1157,2.67446,16.7452,2.0768,15.3026,1.68523L14.303,1.41731 13.7672,3.40607 14.7667,3.67399C16.0033,4.00373,17.1883,4.51895,18.2806,5.20935z" />
                                                                 <GeometryDrawing x:Name="BoardGestureGeometry2"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F0 M24,24z M0,0z " />
+                                                                    Geometry="{StaticResource BoardGestureGeometry2}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5373,7 +5270,7 @@
                                     </Border>
                                     <Border>
                                         <Grid Width="0" Margin="0,0,0,5" RenderTransformOrigin="0,1">
-                                            <Border ClipToBounds="True" x:Name="BoardTwoFingerGestureBorder"
+                                            <Border ClipToBounds="True" x:Name="BoardTwoFingerGestureBorder" Style="{StaticResource BoardTwoFingerGestureBorder}"
                                                 Margin="-115,-161,-55,50"
                                                 CornerRadius="8"
                                                 Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
@@ -5554,7 +5451,7 @@
 
                             <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}" Margin="0,0,5,0">
                                 <ikw:SimpleStackPanel Orientation="Horizontal">
-                                    <Border x:Name="BoardSelect" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardSelect" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardSelect}"
                                             BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="SymbolIconSelect_MouseUp" CornerRadius="5,0,0,5"
                                             Background="{DynamicResource BoardFloatBarBackground}"
@@ -5568,7 +5465,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardSelectGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M22.7989,10.1653L1.14304,1.14304 10.1653,22.7989 12.8305,14.9518 19.6892,21.8105 21.8105,19.6892 14.9518,12.8305 22.7989,10.1653z" />
+                                                                    Geometry="{StaticResource BoardSelectGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5579,7 +5476,7 @@
                                                        HorizontalAlignment="Center" FontSize="12" />
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardPen}"
                                             BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="PenIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
                                         <Grid Margin="6,6,6,4">
@@ -5591,7 +5488,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardPenGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M20.4786,1.42438C19.9985,1.23743 19.4847,1.15194 18.9698,1.17319 18.4549,1.19444 17.9499,1.32197 17.4869,1.54789 17.0368,1.76752 16.6358,2.07554 16.3083,2.45361L3.85516,14.9067 9.08243,20.134 21.5311,7.68529C21.9113,7.36382 22.223,6.96912 22.447,6.52438 22.6786,6.06462 22.8113,5.56167 22.8365,5.04763 22.8616,4.5336 22.7787,4.02012 22.593,3.54002 22.4073,3.05994 22.1232,2.62403 21.759,2.25988 21.3949,1.89574 20.9587,1.61132 20.4786,1.42438z M7.28056,21.1605L2.8286,16.7086 1.15912,22.83 7.28056,21.1605z" />
+                                                                    Geometry="{StaticResource BoardPenGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -5629,7 +5526,7 @@
                                                                 <ikw:SimpleStackPanel Orientation="Horizontal"
                                                                     HorizontalAlignment="Stretch"
                                                                     Margin="8,0,0,0" Spacing="2">
-                                                                    <Border x:Name="BoardDefaultPenTabButton"
+                                                                    <Border x:Name="BoardDefaultPenTabButton" Style="{StaticResource BoardDefaultPenTabButton}"
                                                                             MouseDown="SwitchToDefaultPen"
                                                                             Background="#48dbeafe" Height="20"
                                                                             Width="36"
@@ -5667,7 +5564,7 @@
                                                                             </ikw:SimpleStackPanel>
                                                                         </Canvas>
                                                                     </Border>
-                                                                    <Border x:Name="BoardHighlightPenTabButton"
+                                                                    <Border x:Name="BoardHighlightPenTabButton" Style="{StaticResource BoardHighlightPenTabButton}"
                                                                             MouseDown="SwitchToHighlighterPen"
                                                                             Background="Transparent" Height="20"
                                                                             Width="52"
@@ -5877,7 +5774,7 @@
                                                                                     <Grid Margin="3">
                                                                                         <Image
                                                                                             x:Name="BoardColorThemeSwitchIcon"
-                                                                                            Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png"
+                                                                                            Source="{StaticResource BoardColorThemeSwitchIcon}"
                                                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                                                             VerticalAlignment="Top"
                                                                                             Width="23"
@@ -5893,7 +5790,7 @@
                                                                                     </Grid>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorBlack"
+                                                                                    x:Name="BoardBorderPenColorBlack" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="Black"
                                                                                     BorderBrush="#D3D3D3"
                                                                                     BorderThickness="1.5"
@@ -5914,7 +5811,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorWhite"
+                                                                                    x:Name="BoardBorderPenColorWhite" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="White"
                                                                                     BorderBrush="#71717a"
                                                                                     BorderThickness="1.5"
@@ -5934,7 +5831,7 @@
                                                                                             Margin="0,0,0,0" />
                                                                                     </Viewbox>
                                                                                 </Border>
-                                                                                <Border x:Name="BoardBorderPenColorRed"
+                                                                                <Border x:Name="BoardBorderPenColorRed" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#dc2626"
                                                                                     BorderBrush="#7f1d1d"
                                                                                     BorderThickness="1.5"
@@ -5955,7 +5852,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorYellow"
+                                                                                    x:Name="BoardBorderPenColorYellow" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#eab308"
                                                                                     BorderBrush="#713f12"
                                                                                     BorderThickness="1.5"
@@ -5984,7 +5881,7 @@
                                                                                 Margin="0">
 
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorGreen"
+                                                                                    x:Name="BoardBorderPenColorGreen" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#16a34a"
                                                                                     BorderBrush="#14532d"
                                                                                     BorderThickness="1.5"
@@ -6005,7 +5902,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorBlue"
+                                                                                    x:Name="BoardBorderPenColorBlue" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#2563eb"
                                                                                     BorderBrush="#1e3a8a"
                                                                                     BorderThickness="1.5"
@@ -6026,7 +5923,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorPink"
+                                                                                    x:Name="BoardBorderPenColorPink" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#db2777"
                                                                                     BorderBrush="#831843"
                                                                                     BorderThickness="1.5"
@@ -6047,7 +5944,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorTeal"
+                                                                                    x:Name="BoardBorderPenColorTeal" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#0d9488"
                                                                                     BorderBrush="#134e4a"
                                                                                     BorderThickness="1.5"
@@ -6068,7 +5965,7 @@
                                                                                     </Viewbox>
                                                                                 </Border>
                                                                                 <Border
-                                                                                    x:Name="BoardBorderPenColorOrange"
+                                                                                    x:Name="BoardBorderPenColorOrange" Style="{StaticResource BoardBorderPenColor}"
                                                                                     Background="#ea580c"
                                                                                     BorderBrush="#7c2d12"
                                                                                     BorderThickness="1.5"
@@ -6488,7 +6385,7 @@
 
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown"
+                                    <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown" Style="{StaticResource BoardEraser}"
                                             BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="BoardEraserIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
                                         <Grid Margin="6,6,6,4">
@@ -6500,7 +6397,7 @@
                                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                                 <GeometryDrawing x:Name="BoardEraserGeometry"
                                                                     Brush="{DynamicResource IconForeground}"
-                                                                    Geometry="F1 M24,24z M0,0z M15.6314,20.7262L22.7921,13.5655C24.3494,12.141,24.2819,9.81776,22.8105,8.34633L16.7793,2.31508C15.3547,0.757753,13.0315,0.825236,11.5601,2.29666L4.38099,9.47574 15.6314,20.7262z M14.2172,22.1404L2.96677,10.89 1.20761,12.6491C-0.34971,14.0737,-0.281711,16.3974,1.18971,17.8688L6.15089,22.83 13.5276,22.83 14.2172,22.1404z" />
+                                                                    Geometry="{StaticResource BoardEraserGeometry}" />
                                                             </DrawingGroup>
                                                         </DrawingImage.Drawing>
                                                     </DrawingImage>
@@ -6522,7 +6419,7 @@
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
                                             <Border Visibility="Visible" ClipToBounds="True"
-                                                    Name="BoardEraserSizePanel"
+                                                    Name="BoardEraserSizePanel" Style="{StaticResource BoardEraserSizePanel}"
                                                     CornerRadius="5" Background="{DynamicResource FloatBarBackground}"
                                                     Opacity="1"
                                                     BorderBrush="#2563eb" BorderThickness="1">
@@ -6576,7 +6473,7 @@
                                                     <ikw:SimpleStackPanel Orientation="Horizontal"
                                                                          HorizontalAlignment="Center"
                                                                          Margin="0,0,0,0" Spacing="4">
-                                                        <Border x:Name="BoardCircleEraserTabButton"
+                                                        <Border x:Name="BoardCircleEraserTabButton" Style="{StaticResource BoardCircleEraserTabButton}"
                                                                 MouseDown="SwitchToCircleEraser"
                                                                 Background="{DynamicResource BoardFloatBarButtonBackgroundPointerOverKey}" Height="20" Width="40"
                                                                 CornerRadius="3">
@@ -6603,7 +6500,7 @@
                                                                 </ikw:SimpleStackPanel>
                                                             </Canvas>
                                                         </Border>
-                                                        <Border x:Name="BoardRectangleEraserTabButton"
+                                                        <Border x:Name="BoardRectangleEraserTabButton" Style="{StaticResource BoardRectangleEraserTabButton}"
                                                                 MouseDown="SwitchToRectangleEraser"
                                                                 Background="{DynamicResource BoardFloatBarButtonBackgroundKey}"
                                                                 Height="20" Width="40" CornerRadius="3">
@@ -6745,7 +6642,7 @@
                                         </Grid>
                                     </Border>
                                     <Border Width="0">
-                                        <Border x:Name="BoardBorderDrawShape" Visibility="Visible"
+                                        <Border x:Name="BoardBorderDrawShape" Visibility="Visible" Style="{StaticResource BoardBorderDrawShape}"
                                                 Background="{DynamicResource FloatBarBackground}"
                                                 Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="5"
                                                 Margin="-147,-286,-89,55">
@@ -7072,7 +6969,7 @@
                                                     <TranslateTransform />
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
-                                            <Border ClipToBounds="True" Name="BoardBorderTools"
+                                        <Border ClipToBounds="True" Name="BoardBorderTools" Style="{StaticResource BoardBorderTools}"
                                                     Margin="-80,-138.5,-39,33.5"
                                                     CornerRadius="5" Background="{DynamicResource SettingsPageBackground}" Opacity="1"
                                                     BorderThickness="1"
@@ -7575,7 +7472,7 @@
 
 
         <!-- 通知弹窗 -->
-        <Grid Name="GridNotifications" Margin="0,110" Visibility="Collapsed" HorizontalAlignment="Center"
+        <Grid Name="GridNotifications" Margin="0,110" Visibility="Collapsed" HorizontalAlignment="Center" Style="{StaticResource GridNotifications}"
               VerticalAlignment="Bottom">
             <Border CornerRadius="6" MaxHeight="200" Padding="20 10" Background="{DynamicResource SettingsPageBackground}" Opacity="0.95"
                     BorderBrush="#b91c1c" BorderThickness="1.5">
@@ -7714,13 +7611,13 @@
                     <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLBBorder"
                             Background="#f4f4f5" Opacity="1" CornerRadius="6">
                         <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                                     Name="PPTLBPreviousButtonBorder"
                                     MouseDown="GridPPTControlPrevious_MouseDown"
                                     MouseLeave="GridPPTControlPrevious_MouseLeave"
                                     CornerRadius="5 5 0 0" Background="Transparent">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image Height="28" Width="28">
                                         <Image.Source>
@@ -7729,7 +7626,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTLBPreviousButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z" />
+                                                                         Geometry="{StaticResource PPTLBPreviousButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7737,12 +7634,12 @@
                                     </Image>
                                 </Grid>
                             </Border>
-                            <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717"
+                            <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                                     MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                                     MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                                     Background="Transparent">
                                 <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder"
+                                    <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                                          Spacing="0.5" Margin="12,0">
@@ -7756,11 +7653,11 @@
 
                                 </Grid>
                             </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                                     MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                                     CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLBNextButtonBorder">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                            Width="28">
@@ -7770,7 +7667,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTLBNextButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z" />
+                                                                         Geometry="{StaticResource PPTLBNextButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7786,13 +7683,13 @@
                     <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRBBorder"
                             Background="#f4f4f5" Opacity="1" CornerRadius="6">
                         <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                                     Name="PPTRBPreviousButtonBorder"
                                     MouseDown="GridPPTControlPrevious_MouseDown"
                                     MouseLeave="GridPPTControlPrevious_MouseLeave"
                                     CornerRadius="5 5 0 0" Background="Transparent">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image Height="28" Width="28">
                                         <Image.Source>
@@ -7801,7 +7698,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTRBPreviousButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z" />
+                                                                         Geometry="{StaticResource PPTRBPreviousButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7809,12 +7706,12 @@
                                     </Image>
                                 </Grid>
                             </Border>
-                            <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717"
+                            <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                                     MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                                     MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                                     Background="Transparent">
                                 <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder"
+                                    <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                                          Spacing="0.5" Margin="12,0">
@@ -7828,11 +7725,11 @@
 
                                 </Grid>
                             </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                                     MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                                     CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRBNextButtonBorder">
                                 <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder"
+                                    <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                             Background="#18181b" Opacity="0" />
                                     <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                            Width="28">
@@ -7842,7 +7739,7 @@
                                                     <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                         <GeometryDrawing Brush="#27272a"
                                                                          x:Name="PPTRBNextButtonGeometry"
-                                                                         Geometry="F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z" />
+                                                                         Geometry="{StaticResource PPTRBNextButtonGeometry}" />
                                                     </DrawingGroup>
                                                 </DrawingImage.Drawing>
                                             </DrawingImage>
@@ -7862,12 +7759,12 @@
             <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLSBorder"
                     Background="#f4f4f5" Opacity="1" CornerRadius="6" Margin="6,0,0,0">
                 <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                             Name="PPTLSPreviousButtonBorder"
                             MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
                             CornerRadius="5 5 0 0" Background="Transparent">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image Height="28" Width="28">
                                 <Image.Source>
@@ -7875,7 +7772,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTLSPreviousButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z" />
+                                                                 Geometry="{StaticResource PPTLSPreviousButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7883,12 +7780,12 @@
                             </Image>
                         </Grid>
                     </Border>
-                    <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717"
+                    <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                             MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                             MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
                             Background="Transparent">
                         <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder"
+                            <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
                                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -7899,11 +7796,11 @@
                             </ikw:SimpleStackPanel>
                         </Grid>
                     </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                             MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                             CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLSNextButtonBorder">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
                                 <Image.Source>
@@ -7911,7 +7808,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTLSNextButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z" />
+                                                                 Geometry="{StaticResource PPTLSNextButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7927,12 +7824,12 @@
             <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRSBorder"
                     Background="#f4f4f5" Opacity="1" CornerRadius="6"  Margin="0,0,6,0">
                 <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
                             Name="PPTRSPreviousButtonBorder"
                             MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
                             CornerRadius="5 5 0 0" Background="Transparent">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image Height="28" Width="28">
                                 <Image.Source>
@@ -7940,7 +7837,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTRSPreviousButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z" />
+                                                                 Geometry="{StaticResource PPTRSPreviousButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -7948,12 +7845,12 @@
                             </Image>
                         </Grid>
                     </Border>
-                    <Border Visibility="Visible" Name="PPTRSPageButton"
+                    <Border Visibility="Visible" Name="PPTRSPageButton" Style="{StaticResource PPTPageButtonBase}"
                             MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                             MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
                             Background="Transparent" TextBlock.Foreground="#171717">
                         <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder"
+                            <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
                                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -7965,11 +7862,11 @@
                             </ikw:SimpleStackPanel>
                         </Grid>
                     </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp"
+                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                             MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
                             CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRSNextButtonBorder">
                         <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder"
+                            <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                     Background="#18181b" Opacity="0" />
                             <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
                                 <Image.Source>
@@ -7977,7 +7874,7 @@
                                         <DrawingImage.Drawing>
                                             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                 <GeometryDrawing Brush="#27272a" x:Name="PPTRSNextButtonGeometry"
-                                                                 Geometry="F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z" />
+                                                                 Geometry="{StaticResource PPTRSNextButtonGeometry}" />
                                             </DrawingGroup>
                                         </DrawingImage.Drawing>
                                     </DrawingImage>
@@ -9560,7 +9457,7 @@
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="ShapesIconGeometry"
                                                                              Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M8.7269,2.9067C8.84872,2.70875 9.00852,2.57931 9.20647,2.5184 9.41966,2.44227 9.62541,2.43465 9.82337,2.49556 10.0365,2.55647 10.2039,2.67829 10.3257,2.86102L13.9118,8.13731C12.9068,8.47231 12.0084,8.99766 11.2165,9.71334 10.4247,10.4138 9.8157,11.2513 9.38933,12.2259 8.93251,13.2156 8.70413,14.2587 8.70413,15.3551L8.7269,15.9946 2.46851,15.9946C2.22487,15.9946 2.01158,15.9185 1.82885,15.7662 1.66135,15.614 1.55481,15.4236 1.50913,15.1952 1.47868,14.9668 1.5244,14.746 1.64622,14.5328L8.7269,2.9067z M16.3329,21.545C15.2061,21.545 14.1632,21.2633 13.2038,20.6999 12.275,20.1517 11.5288,19.4056 10.9654,18.4615 10.4172,17.5022 10.1431,16.4667 10.1431,15.3551 10.1431,14.2283 10.4172,13.1928 10.9654,12.2487 11.5288,11.3046 12.2825,10.5585 13.2266,10.0103 14.1707,9.44687 15.1986,9.16516 16.3102,9.16516 17.437,9.16516 18.4724,9.44687 19.4165,10.0103 20.3606,10.5585 21.1068,11.3046 21.6549,12.2487 22.2184,13.1928 22.5,14.2283 22.5,15.3551 22.5,16.4667 22.2184,17.5022 21.6549,18.4615 21.1068,19.4056 20.3683,20.1517 19.4395,20.6999 18.4801,21.2633 17.4445,21.545 16.3329,21.545z" />
+                                                                             Geometry="{StaticResource ShapesIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9572,7 +9469,7 @@
                                     </ikw:SimpleStackPanel>
 
                                     <Grid Width="0">
-                                        <Border x:Name="BorderDrawShape" Background="{DynamicResource FloatBarBackground}" Opacity="1"
+                                        <Border x:Name="BorderDrawShape" Background="{DynamicResource FloatBarBackground}" Opacity="1" Style="{StaticResource BorderDrawShape}"
                                                 Visibility="Visible" BorderBrush="#2563eb"
                                                 BorderThickness="1"
                                                 CornerRadius="5" Margin="-170,-140,-147,37">
@@ -9834,7 +9731,7 @@
                                                     <DrawingImage.Drawing>
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="UndoIconGeometry" Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M10.3344,5.02734L10.3605,8.62849C12.2431,8.87029 14.0305,9.44026 15.7232,10.3384 17.4676,11.2538 18.9187,12.4196 20.0759,13.8359 21.3367,15.3731 22.1398,17.0657 22.4852,18.9138 22.5197,19.1211 22.4938,19.3197 22.4075,19.5097 22.3211,19.6997 22.2003,19.8292 22.0448,19.8983 21.8894,19.9501 21.7423,19.9069 21.6042,19.7687 20.7579,18.8361 19.6268,17.9984 18.2105,17.2557 16.9324,16.5821 15.5591,16.0553 14.091,15.6754 12.7093,15.3126 11.4659,15.1313 10.3605,15.1313L10.3344,18.862C10.3344,19.2938 10.2395,19.6047 10.0495,19.7947 9.8941,19.9501 9.69547,20.0106 9.45367,19.976 9.21187,19.9242 8.99586,19.8119 8.80587,19.6392 8.14955,18.9829 6.90606,17.7739 5.07526,16.0121 3.46899,14.475 2.41544,13.4559 1.91456,12.9551 1.63821,12.6787 1.5,12.3678 1.5,12.0224 1.51727,11.6769 1.67272,11.3574 1.96634,11.0638 4.02168,9.00847 6.3103,6.73724 8.83197,4.25011 9.00468,4.07739 9.20331,3.99967 9.42784,4.01694 9.66965,4.01694 9.87683,4.11194 10.0495,4.30193 10.2395,4.47464 10.3344,4.71645 10.3344,5.02734z" />
+                                                                             Geometry="{StaticResource UndoIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9863,7 +9760,7 @@
                                                     <DrawingImage.Drawing>
                                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                                             <GeometryDrawing x:Name="RedoIconGeometry" Brush="{DynamicResource IconForeground}"
-                                                                             Geometry="F1 M24,24z M0,0z M13.6656,5.02734L13.6395,8.62849C11.7569,8.87029 9.96948,9.44026 8.27685,10.3384 6.5324,11.2538 5.08134,12.4196 3.92413,13.8359 2.6633,15.3731 1.86023,17.0657 1.5148,18.9138 1.48026,19.1211 1.50619,19.3197 1.59255,19.5097 1.6789,19.6997 1.79974,19.8292 1.95518,19.8983 2.11063,19.9501 2.25766,19.9069 2.39583,19.7687 3.24215,18.8361 4.37323,17.9984 5.78951,17.2557 7.06761,16.5821 8.44089,16.0553 9.90899,15.6754 11.2907,15.3126 12.5341,15.1313 13.6395,15.1313L13.6656,18.862C13.6656,19.2938 13.7605,19.6047 13.9505,19.7947 14.1059,19.9501 14.3045,20.0106 14.5463,19.976 14.7881,19.9242 15.0041,19.8119 15.1941,19.6392 15.8505,18.9829 17.0939,17.7739 18.9247,16.0121 20.531,14.475 21.5846,13.4559 22.0854,12.9551 22.3618,12.6787 22.5,12.3678 22.5,12.0224 22.4827,11.6769 22.3273,11.3574 22.0337,11.0638 19.9783,9.00847 17.6897,6.73724 15.168,4.25011 14.9953,4.07739 14.7967,3.99967 14.5722,4.01694 14.3304,4.01694 14.1232,4.11194 13.9505,4.30193 13.7605,4.47464 13.6656,4.71645 13.6656,5.02734z" />
+                                                                             Geometry="{StaticResource RedoIconGeometry}" />
                                                         </DrawingGroup>
                                                     </DrawingImage.Drawing>
                                                 </DrawingImage>
@@ -9904,7 +9801,7 @@
                                     <Grid x:Name="BackgroundPaletteGrid" Margin="-203,-128,83,37">
                                         <!-- 背景面板将在代码中动态添加 -->
                                     </Grid>
-                                    <Border Visibility="Visible" ClipToBounds="True" Name="EraserSizePanel"
+                                        <Border Visibility="Visible" ClipToBounds="True" Name="EraserSizePanel" Style="{StaticResource EraserSizePanel}"
                                             Margin="-203,-148,83,40" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1"
                                             BorderBrush="#2563eb" BorderThickness="1">
                                         <ikw:SimpleStackPanel Margin="0">
@@ -10114,7 +10011,7 @@
                                                    Style="{StaticResource AutoFitMainToolbarLabel8}" />
                                     </ikw:SimpleStackPanel>
                                     <Grid Width="0">
-                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37"
+                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37" Style="{StaticResource BorderTools}"
                                                 CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderThickness="1"
                                                 BorderBrush="#2563eb">
                                             <ikw:SimpleStackPanel Margin="-1,0,0,0">
@@ -10339,7 +10236,7 @@
                     </Border>
 
 
-                    <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
+                    <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36" Style="{StaticResource EnableTwoFingerGestureBorder}"
                             Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}"
                             BorderThickness="1">
                         <ikw:SimpleStackPanel
@@ -10355,7 +10252,7 @@
                         </ikw:SimpleStackPanel>
                     </Border>
                     <Grid Width="0">
-                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40"
+                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40" Style="{StaticResource TwoFingerGestureBorder}"
                                 CornerRadius="5"
                                 Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
                                 BorderThickness="1">
@@ -11066,4 +10963,3 @@
         </Border>
     </Grid>
 </Window>
-
diff --git a/Ink Canvas/MainWindow_cs/MW_Styles.xaml b/Ink Canvas/MainWindow_cs/MW_Styles.xaml
index 3e53bda5..dcf4d739 100644
--- a/Ink Canvas/MainWindow_cs/MW_Styles.xaml	
+++ b/Ink Canvas/MainWindow_cs/MW_Styles.xaml	
@@ -43,6 +43,7 @@
     <Style x:Key="GroupBoxBase" TargetType="GroupBox">
         <Setter Property="Foreground" Value="#fafafa"/>
         <Setter Property="Margin" Value="0,0,0,8"/>
+        <Setter Property="BorderThickness" Value="0"/>
     </Style>
     <Style x:Key="GroupBoxPlugins" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>
     <Style x:Key="GroupBoxStartup" TargetType="GroupBox" BasedOn="{StaticResource GroupBoxBase}"/>

From ccb2c3e30e033bcc3bcad6ad68b6dca5f99ae7ea Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Tue, 7 Apr 2026 21:25:35 +0800
Subject: [PATCH 06/15] =?UTF-8?q?refactor:=20=E6=8F=90=E5=8F=96=20MainWind?=
 =?UTF-8?q?ow=20UI=20=E7=BB=84=E4=BB=B6=E5=88=B0=20MainWindow=5Fcontrols?=
 =?UTF-8?q?=20=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 10 个 UserControl 到 MainWindow_controls 目录
- PPT 导航控件: PPTNavigationBottomLeft/Right, PPTNavigationSideLeft/Right
- 选择工具栏: StrokeSelectionToolbar, ImageSelectionToolbar
- 图像控制: ImageResizeHandles
- 颜色画笔: PenColorPalette, HighlighterColorPalette, PenSettingsPanel
- 每个控件包含依赖属性和路由事件接口
- 修复 ikw:SimpleStackPanel 和 UniformGrid 命名空间引用
- MainWindow.xaml 添加 mwcontrols 命名空间声明
---
 Ink Canvas/MainWindow.xaml                    |   1 +
 .../HighlighterColorPalette.xaml              | 336 +++++++++++++++
 .../HighlighterColorPalette.xaml.cs           |  79 ++++
 .../ImageResizeHandles.xaml                   |  44 ++
 .../ImageResizeHandles.xaml.cs                |  80 ++++
 .../ImageSelectionToolbar.xaml                | 111 +++++
 .../ImageSelectionToolbar.xaml.cs             | 117 +++++
 .../PPTNavigationBottomLeft.xaml              |  77 ++++
 .../PPTNavigationBottomLeft.xaml.cs           | 118 +++++
 .../PPTNavigationBottomRight.xaml             |  77 ++++
 .../PPTNavigationBottomRight.xaml.cs          | 117 +++++
 .../PPTNavigationSideLeft.xaml                |  71 +++
 .../PPTNavigationSideLeft.xaml.cs             | 117 +++++
 .../PPTNavigationSideRight.xaml               |  71 +++
 .../PPTNavigationSideRight.xaml.cs            | 117 +++++
 .../MainWindow_controls/PenColorPalette.xaml  | 405 ++++++++++++++++++
 .../PenColorPalette.xaml.cs                   | 126 ++++++
 .../MainWindow_controls/PenSettingsPanel.xaml | 205 +++++++++
 .../PenSettingsPanel.xaml.cs                  | 190 ++++++++
 .../StrokeSelectionToolbar.xaml               | 116 +++++
 .../StrokeSelectionToolbar.xaml.cs            | 142 ++++++
 21 files changed, 2717 insertions(+)
 create mode 100644 Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PenColorPalette.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs
 create mode 100644 Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml
 create mode 100644 Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 9ea0266d..ed6b7c07 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -8,6 +8,7 @@
         xmlns:c="clr-namespace:Ink_Canvas.Converter"
         xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
         xmlns:controls="clr-namespace:Ink_Canvas.Controls"
+        xmlns:mwcontrols="clr-namespace:Ink_Canvas.MainWindow_controls"
         xmlns:Windows="clr-namespace:Ink_Canvas.Windows"
         xmlns:props="clr-namespace:Ink_Canvas.Properties"
         xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
diff --git a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml
new file mode 100644
index 00000000..5ccac6dd
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml	
@@ -0,0 +1,336 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.HighlighterColorPalette"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
+             x:Name="Root">
+    <Grid>
+        <!-- Board Version -->
+        <Viewbox x:Name="BoardHighlighterPenColorsPanel"
+                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource BoolToVisibilityConverter}}"
+                Margin="0,8,0,0" Stretch="Fill">
+            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
+                <Border Width="300" Height="110" BorderBrush="Black"
+                        BorderThickness="0" CornerRadius="5">
+                    <Controls:UniformGrid Rows="2" Height="110">
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5"
+                                Width="270"
+                                Margin="0">
+                                <Border x:Name="BoardHighlighterPenColorBlack"
+                                    BorderBrush="#e4e4e7"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorBlack_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="Black" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorBlackContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorWhite"
+                                    Background="White"
+                                    BorderBrush="#dddddd"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnHighlighterColorWhite_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="White" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorWhiteContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorRed"
+                                    BorderBrush="#fecaca"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorRed_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#ef4444" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorRedContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorYellow"
+                                    BorderBrush="#fef08a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorYellow_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#eab308" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorYellowContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorGreen"
+                                    BorderBrush="#bbf7d0"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorGreen_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#22c55e" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorGreenContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270" Margin="0">
+                                <Border x:Name="BoardHighlighterPenColorOrange"
+                                    BorderBrush="#fed7aa"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorOrange_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#f97316" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorOrangeContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                    </Controls:UniformGrid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+
+        <!-- Non-Board Version -->
+        <Viewbox x:Name="HighlighterPenColorsPanel"
+                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                Margin="0,8,0,0" Stretch="Fill">
+            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
+                <Border Width="300" Height="110" BorderBrush="Black"
+                        BorderThickness="0" CornerRadius="5">
+                    <Controls:UniformGrid Rows="2" Height="110">
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270" Margin="0">
+                                <Border x:Name="HighlighterPenColorBlack"
+                                    BorderBrush="#e4e4e7"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorBlack_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="Black" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorBlackContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorWhite"
+                                    Background="White"
+                                    BorderBrush="#dddddd"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnHighlighterColorWhite_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="White" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorWhiteContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorRed"
+                                    BorderBrush="#fecaca"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorRed_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#ef4444" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorRedContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorYellow"
+                                    BorderBrush="#fef08a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorYellow_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#eab308" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorYellowContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorGreen"
+                                    BorderBrush="#bbf7d0"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorGreen_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#22c55e" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorGreenContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270" Margin="0">
+                                <Border x:Name="HighlighterPenColorOrange"
+                                    BorderBrush="#fed7aa"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100" Width="45"
+                                    MouseUp="BtnHighlighterColorOrange_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
+                                            Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#f97316" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorOrangeContent"
+                                            Visibility="Visible"
+                                            Canvas.Top="9"
+                                            Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                    </Controls:UniformGrid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+    </Grid>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs
new file mode 100644
index 00000000..e3d139a6
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs	
@@ -0,0 +1,79 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class HighlighterColorPalette : UserControl
+    {
+        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(
+            nameof(SelectedColor), typeof(Color), typeof(HighlighterColorPalette), new PropertyMetadata(Colors.Black));
+
+        public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
+            nameof(IsBoardMode), typeof(bool), typeof(HighlighterColorPalette), new PropertyMetadata(false));
+
+        public static readonly RoutedEvent ColorSelectedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ColorSelected), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(HighlighterColorPalette));
+
+        public Color SelectedColor
+        {
+            get => (Color)GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
+        }
+
+        public bool IsBoardMode
+        {
+            get => (bool)GetValue(IsBoardModeProperty);
+            set => SetValue(IsBoardModeProperty, value);
+        }
+
+        public event RoutedEventHandler ColorSelected
+        {
+            add => AddHandler(ColorSelectedEvent, value);
+            remove => RemoveHandler(ColorSelectedEvent, value);
+        }
+
+        public HighlighterColorPalette()
+        {
+            InitializeComponent();
+        }
+
+        private void BtnHighlighterColorBlack_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = Colors.Black;
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnHighlighterColorWhite_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = Colors.White;
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnHighlighterColorRed_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#ef4444");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnHighlighterColorYellow_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#eab308");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnHighlighterColorGreen_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#22c55e");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnHighlighterColorOrange_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#f97316");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
new file mode 100644
index 00000000..098dd122
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
@@ -0,0 +1,44 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.ImageResizeHandles"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Name="Root">
+    <Canvas Name="ImageResizeHandlesCanvas" 
+            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" 
+            Panel.ZIndex="1000">
+        <!-- 四个角控制点 -->
+        <Ellipse Name="ImageTopLeftHandle" Style="{StaticResource ImageResizeHandleNWSE}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageTopRightHandle" Style="{StaticResource ImageResizeHandleNESW}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageBottomLeftHandle" Style="{StaticResource ImageResizeHandleNESW}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageBottomRightHandle" Style="{StaticResource ImageResizeHandleNWSE}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        
+        <!-- 四个边控制点 -->
+        <Ellipse Name="ImageTopHandle" Style="{StaticResource ImageResizeHandleNS}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageBottomHandle" Style="{StaticResource ImageResizeHandleNS}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageLeftHandle" Style="{StaticResource ImageResizeHandleWE}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+        <Ellipse Name="ImageRightHandle" Style="{StaticResource ImageResizeHandleWE}"
+                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                 MouseMove="ImageResizeHandle_MouseMove" />
+    </Canvas>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs
new file mode 100644
index 00000000..820d3d53
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs	
@@ -0,0 +1,80 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class ImageResizeHandles : UserControl
+    {
+        public static readonly DependencyProperty TargetBoundsProperty = DependencyProperty.Register(
+            nameof(TargetBounds), typeof(Rect), typeof(ImageResizeHandles), new PropertyMetadata(new Rect(0, 0, 0, 0)));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(Visibility), typeof(ImageResizeHandles), new PropertyMetadata(Visibility.Collapsed));
+
+        public static readonly RoutedEvent ResizeStartedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ResizeStarted), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
+
+        public static readonly RoutedEvent ResizeCompletedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ResizeCompleted), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
+
+        public static readonly RoutedEvent BoundsChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(BoundsChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
+
+        public Rect TargetBounds
+        {
+            get => (Rect)GetValue(TargetBoundsProperty);
+            set => SetValue(TargetBoundsProperty, value);
+        }
+
+        public new Visibility IsVisible
+        {
+            get => (Visibility)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler ResizeStarted
+        {
+            add => AddHandler(ResizeStartedEvent, value);
+            remove => RemoveHandler(ResizeStartedEvent, value);
+        }
+
+        public event RoutedEventHandler ResizeCompleted
+        {
+            add => AddHandler(ResizeCompletedEvent, value);
+            remove => RemoveHandler(ResizeCompletedEvent, value);
+        }
+
+        public event RoutedEventHandler BoundsChanged
+        {
+            add => AddHandler(BoundsChangedEvent, value);
+            remove => RemoveHandler(BoundsChangedEvent, value);
+        }
+
+        public ImageResizeHandles()
+        {
+            InitializeComponent();
+        }
+
+        private void ImageResizeHandle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(ResizeStartedEvent, this));
+            e.Handled = true;
+        }
+
+        private void ImageResizeHandle_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(ResizeCompletedEvent, this));
+            e.Handled = true;
+        }
+
+        private void ImageResizeHandle_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                RaiseEvent(new RoutedEventArgs(BoundsChangedEvent, this));
+            }
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml
new file mode 100644
index 00000000..f04f9f08
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml	
@@ -0,0 +1,111 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.ImageSelectionToolbar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Border Name="BorderImageSelectionControl"
+            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,0"
+            CornerRadius="5" Height="80"
+            Background="{DynamicResource FloatBarBackground}"
+            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}"
+            BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
+        <Viewbox Margin="0,-2.5">
+            <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
+                <Border Name="BorderImageClone" Margin="0,2,-9,2" Background="Transparent"
+                        CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
+                        Width="40" MouseDown="Border_MouseDown" MouseUp="BorderImageClone_MouseUp">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource ImageSelectionCloneIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                        <TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Name="BorderImageCloneToNewBoard"
+                        Margin="0,2,-9,2"
+                        Background="Transparent"
+                        CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
+                        Width="40"
+                        MouseDown="Border_MouseDown" 
+                        MouseUp="BorderImageCloneToNewBoard_MouseUp"
+                        Visibility="{Binding Visibility, ElementName=GridBackgroundCover}">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center"
+                                         HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource ImageSelectionCloneToNewBoardIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality"
+                               Height="25"
+                               Width="25" />
+                        <TextBlock Text="克隆至新页"
+                                   FontSize="8"
+                                   Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" 
+                        Height="45" 
+                        BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
+                        Height="40">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" 
+                                         Spacing="5" 
+                                         Margin="0,-10">
+                        <ikw:SimpleStackPanel Orientation="Horizontal"
+                                             Spacing="10">
+                            <Image Source="{DynamicResource Rotate45DrawingImage}"
+                                   Height="22"
+                                   MouseDown="Border_MouseDown"
+                                   MouseUp="BorderImageRotateLeft_MouseUp" />
+                            <Image Source="{DynamicResource Rotate90DrawingImage}"
+                                   Height="22"
+                                   MouseDown="Border_MouseDown"
+                                   MouseUp="BorderImageRotateRight_MouseUp" />
+                        </ikw:SimpleStackPanel>
+                        <TextBlock Text="旋转"
+                                   FontSize="10"
+                                   HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource FloatBarForeground}" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
+                        Height="40">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
+                            <Grid MouseDown="Border_MouseDown" MouseUp="GridImageScaleDecrease_MouseUp">
+                                <Image Source="{DynamicResource ImageSelectionScaleIcon1}"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                                <TextBlock Text="-" Foreground="{DynamicResource FloatBarForeground}"
+                                           VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                           Margin="0,0,-2,-7" FontSize="15" />
+                            </Grid>
+                            <Grid MouseDown="Border_MouseDown" MouseUp="GridImageScaleIncrease_MouseUp">
+                                <Image Source="{DynamicResource ImageSelectionScaleIcon2}"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                                <TextBlock Text="+" Foreground="{DynamicResource FloatBarForeground}"
+                                           VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                           Margin="0,0,-3,-4" FontSize="11" />
+                            </Grid>
+                        </ikw:SimpleStackPanel>
+                        <TextBlock Text="缩放" FontSize="10" HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource FloatBarForeground}" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border Margin="-8,0,0,0"
+                        CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
+                        Width="40" MouseDown="Border_MouseDown" MouseUp="BorderImageDelete_MouseUp">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource ImageSelectionDeleteIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                        <TextBlock Margin="0,5,0,0" Text="删除" FontSize="10"
+                                   Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+    </Border>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs
new file mode 100644
index 00000000..97c121df
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs	
@@ -0,0 +1,117 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class ImageSelectionToolbar : UserControl
+    {
+        public static readonly DependencyProperty SelectedImageProperty = DependencyProperty.Register(
+            nameof(SelectedImage), typeof(object), typeof(ImageSelectionToolbar), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(Visibility), typeof(ImageSelectionToolbar), new PropertyMetadata(Visibility.Collapsed));
+
+        public static readonly RoutedEvent CloneRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(CloneRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
+
+        public static readonly RoutedEvent CloneToNewBoardRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(CloneToNewBoardRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
+
+        public static readonly RoutedEvent DeleteRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(DeleteRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
+
+        public static readonly RoutedEvent RotateRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(RotateRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
+
+        public static readonly RoutedEvent ScaleChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ScaleChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
+
+        public object SelectedImage
+        {
+            get => GetValue(SelectedImageProperty);
+            set => SetValue(SelectedImageProperty, value);
+        }
+
+        public new Visibility IsVisible
+        {
+            get => (Visibility)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler CloneRequested
+        {
+            add => AddHandler(CloneRequestedEvent, value);
+            remove => RemoveHandler(CloneRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler CloneToNewBoardRequested
+        {
+            add => AddHandler(CloneToNewBoardRequestedEvent, value);
+            remove => RemoveHandler(CloneToNewBoardRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler DeleteRequested
+        {
+            add => AddHandler(DeleteRequestedEvent, value);
+            remove => RemoveHandler(DeleteRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler RotateRequested
+        {
+            add => AddHandler(RotateRequestedEvent, value);
+            remove => RemoveHandler(RotateRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler ScaleChanged
+        {
+            add => AddHandler(ScaleChangedEvent, value);
+            remove => RemoveHandler(ScaleChangedEvent, value);
+        }
+
+        public ImageSelectionToolbar()
+        {
+            InitializeComponent();
+        }
+
+        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void BorderImageClone_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(CloneRequestedEvent, this));
+        }
+
+        private void BorderImageCloneToNewBoard_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(CloneToNewBoardRequestedEvent, this));
+        }
+
+        private void BorderImageDelete_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(DeleteRequestedEvent, this));
+        }
+
+        private void BorderImageRotateLeft_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(RotateRequestedEvent, this));
+        }
+
+        private void BorderImageRotateRight_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(RotateRequestedEvent, this));
+        }
+
+        private void GridImageScaleDecrease_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(ScaleChangedEvent, this));
+        }
+
+        private void GridImageScaleIncrease_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(ScaleChangedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml
new file mode 100644
index 00000000..4e6c5b53
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml	
@@ -0,0 +1,77 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PPTNavigationBottomLeft"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Margin="6,0,0,6" Height="50"
+             HorizontalAlignment="Left" VerticalAlignment="Bottom">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLBBorder"
+                Background="#f4f4f5" Opacity="1" CornerRadius="6">
+            <ikw:SimpleStackPanel Orientation="Horizontal">
+                <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
+                        Name="PPTLBPreviousButtonBorder"
+                        MouseDown="GridPPTControlPrevious_MouseDown"
+                        MouseLeave="GridPPTControlPrevious_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a"
+                                                             x:Name="PPTLBPreviousButtonGeometry"
+                                                             Geometry="{StaticResource PPTLBPreviousButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
+                        MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
+                        MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
+                        Background="Transparent">
+                    <Grid>
+                        <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
+                                             Spacing="0.5" Margin="12,0">
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold"
+                                       Text="{Binding CurrentPage, ElementName=Root, StringFormat={}{0}}" />
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10"
+                                       Text="{Binding TotalPages, ElementName=Root, StringFormat=/ {0}}" />
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
+                        MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLBNextButtonBorder">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
+                               Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a"
+                                                             x:Name="PPTLBNextButtonGeometry"
+                                                             Geometry="{StaticResource PPTLBNextButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Border>
+    </Viewbox>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs
new file mode 100644
index 00000000..d8286160
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs	
@@ -0,0 +1,118 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PPTNavigationBottomLeft : UserControl
+    {
+        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
+            nameof(CurrentPage), typeof(int), typeof(PPTNavigationBottomLeft), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
+            nameof(TotalPages), typeof(int), typeof(PPTNavigationBottomLeft), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(bool), typeof(PPTNavigationBottomLeft), new PropertyMetadata(true));
+
+        public static readonly RoutedEvent PreviousClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PreviousClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomLeft));
+
+        public static readonly RoutedEvent NextClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(NextClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomLeft));
+
+        public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomLeft));
+
+        public int CurrentPage
+        {
+            get => (int)GetValue(CurrentPageProperty);
+            set => SetValue(CurrentPageProperty, value);
+        }
+
+        public int TotalPages
+        {
+            get => (int)GetValue(TotalPagesProperty);
+            set => SetValue(TotalPagesProperty, value);
+        }
+
+        public bool IsVisible
+        {
+            get => (bool)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler PreviousClicked
+        {
+            add => AddHandler(PreviousClickedEvent, value);
+            remove => RemoveHandler(PreviousClickedEvent, value);
+        }
+
+        public event RoutedEventHandler NextClicked
+        {
+            add => AddHandler(NextClickedEvent, value);
+            remove => RemoveHandler(NextClickedEvent, value);
+        }
+
+        public event RoutedEventHandler PageClicked
+        {
+            add => AddHandler(PageClickedEvent, value);
+            remove => RemoveHandler(PageClickedEvent, value);
+        }
+
+        public PPTNavigationBottomLeft()
+        {
+            InitializeComponent();
+        }
+
+        private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBPreviousButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
+        }
+
+        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBPageButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLBPageButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
+        }
+
+        private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBNextButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLBNextButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLBNextButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml
new file mode 100644
index 00000000..88df2feb
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml	
@@ -0,0 +1,77 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PPTNavigationBottomRight"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Margin="0,0,6,6" Height="50"
+             HorizontalAlignment="Right" VerticalAlignment="Bottom">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRBBorder"
+                Background="#f4f4f5" Opacity="1" CornerRadius="6">
+            <ikw:SimpleStackPanel Orientation="Horizontal">
+                <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
+                        Name="PPTRBPreviousButtonBorder"
+                        MouseDown="GridPPTControlPrevious_MouseDown"
+                        MouseLeave="GridPPTControlPrevious_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a"
+                                                             x:Name="PPTRBPreviousButtonGeometry"
+                                                             Geometry="{StaticResource PPTRBPreviousButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
+                        MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
+                        MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
+                        Background="Transparent">
+                    <Grid>
+                        <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
+                                             Spacing="0.5" Margin="12,0">
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold"
+                                       Text="{Binding CurrentPage, ElementName=Root, StringFormat={}{0}}" />
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10"
+                                       Text="{Binding TotalPages, ElementName=Root, StringFormat=/ {0}}" />
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
+                        MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRBNextButtonBorder">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
+                               Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a"
+                                                             x:Name="PPTRBNextButtonGeometry"
+                                                             Geometry="{StaticResource PPTRBNextButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Border>
+    </Viewbox>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs
new file mode 100644
index 00000000..8915dc9e
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs	
@@ -0,0 +1,117 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PPTNavigationBottomRight : UserControl
+    {
+        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
+            nameof(CurrentPage), typeof(int), typeof(PPTNavigationBottomRight), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
+            nameof(TotalPages), typeof(int), typeof(PPTNavigationBottomRight), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(bool), typeof(PPTNavigationBottomRight), new PropertyMetadata(true));
+
+        public static readonly RoutedEvent PreviousClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PreviousClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomRight));
+
+        public static readonly RoutedEvent NextClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(NextClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomRight));
+
+        public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomRight));
+
+        public int CurrentPage
+        {
+            get => (int)GetValue(CurrentPageProperty);
+            set => SetValue(CurrentPageProperty, value);
+        }
+
+        public int TotalPages
+        {
+            get => (int)GetValue(TotalPagesProperty);
+            set => SetValue(TotalPagesProperty, value);
+        }
+
+        public bool IsVisible
+        {
+            get => (bool)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler PreviousClicked
+        {
+            add => AddHandler(PreviousClickedEvent, value);
+            remove => RemoveHandler(PreviousClickedEvent, value);
+        }
+
+        public event RoutedEventHandler NextClicked
+        {
+            add => AddHandler(NextClickedEvent, value);
+            remove => RemoveHandler(NextClickedEvent, value);
+        }
+
+        public event RoutedEventHandler PageClicked
+        {
+            add => AddHandler(PageClickedEvent, value);
+            remove => RemoveHandler(PageClickedEvent, value);
+        }
+
+        public PPTNavigationBottomRight()
+        {
+            InitializeComponent();
+        }
+
+        private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBPreviousButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
+        }
+
+        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBPageButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRBPageButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBPageButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
+        }
+
+        private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBNextButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRBNextButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRBNextButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml
new file mode 100644
index 00000000..0b46cd6d
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml	
@@ -0,0 +1,71 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PPTNavigationSideLeft"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Width="56"
+             HorizontalAlignment="Left" VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLSBorder"
+                Background="#f4f4f5" Opacity="1" CornerRadius="6" Margin="6,0,0,0">
+            <ikw:SimpleStackPanel Orientation="Vertical">
+                <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
+                        Name="PPTLSPreviousButtonBorder"
+                        MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" x:Name="PPTLSPreviousButtonGeometry"
+                                                             Geometry="{StaticResource PPTLSPreviousButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
+                        MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
+                        MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
+                        Background="Transparent">
+                    <Grid>
+                        <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold"
+                                       Text="{Binding CurrentPage, ElementName=Root, StringFormat={}{0}}" />
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10" Text="{Binding TotalPages, ElementName=Root, StringFormat=/ {0}}" />
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
+                        MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLSNextButtonBorder">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" x:Name="PPTLSNextButtonGeometry"
+                                                             Geometry="{StaticResource PPTLSNextButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Border>
+    </Viewbox>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs
new file mode 100644
index 00000000..5a58437b
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs	
@@ -0,0 +1,117 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PPTNavigationSideLeft : UserControl
+    {
+        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
+            nameof(CurrentPage), typeof(int), typeof(PPTNavigationSideLeft), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
+            nameof(TotalPages), typeof(int), typeof(PPTNavigationSideLeft), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(bool), typeof(PPTNavigationSideLeft), new PropertyMetadata(true));
+
+        public static readonly RoutedEvent PreviousClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PreviousClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideLeft));
+
+        public static readonly RoutedEvent NextClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(NextClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideLeft));
+
+        public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideLeft));
+
+        public int CurrentPage
+        {
+            get => (int)GetValue(CurrentPageProperty);
+            set => SetValue(CurrentPageProperty, value);
+        }
+
+        public int TotalPages
+        {
+            get => (int)GetValue(TotalPagesProperty);
+            set => SetValue(TotalPagesProperty, value);
+        }
+
+        public bool IsVisible
+        {
+            get => (bool)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler PreviousClicked
+        {
+            add => AddHandler(PreviousClickedEvent, value);
+            remove => RemoveHandler(PreviousClickedEvent, value);
+        }
+
+        public event RoutedEventHandler NextClicked
+        {
+            add => AddHandler(NextClickedEvent, value);
+            remove => RemoveHandler(NextClickedEvent, value);
+        }
+
+        public event RoutedEventHandler PageClicked
+        {
+            add => AddHandler(PageClickedEvent, value);
+            remove => RemoveHandler(PageClickedEvent, value);
+        }
+
+        public PPTNavigationSideLeft()
+        {
+            InitializeComponent();
+        }
+
+        private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSPreviousButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
+        }
+
+        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSPageButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLSPageButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSPageButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
+        }
+
+        private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSNextButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTLSNextButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTLSNextButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml
new file mode 100644
index 00000000..a61f33bb
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml	
@@ -0,0 +1,71 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PPTNavigationSideRight"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Width="56"
+             HorizontalAlignment="Right" VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRSBorder"
+                Background="#f4f4f5" Opacity="1" CornerRadius="6" Margin="0,0,6,0">
+            <ikw:SimpleStackPanel Orientation="Vertical">
+                <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
+                        Name="PPTRSPreviousButtonBorder"
+                        MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" x:Name="PPTRSPreviousButtonGeometry"
+                                                             Geometry="{StaticResource PPTRSPreviousButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border Visibility="Visible" Name="PPTRSPageButton" Style="{StaticResource PPTPageButtonBase}"
+                        MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
+                        MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
+                        Background="Transparent" TextBlock.Foreground="#171717">
+                    <Grid>
+                        <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold"
+                                       Text="{Binding CurrentPage, ElementName=Root, StringFormat={}{0}}" />
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10" Text="{Binding TotalPages, ElementName=Root, StringFormat=/ {0}}" />
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
+                        MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRSNextButtonBorder">
+                    <Grid>
+                        <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                                Background="#18181b" Opacity="0" />
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" x:Name="PPTRSNextButtonGeometry"
+                                                             Geometry="{StaticResource PPTRSNextButtonGeometry}" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Border>
+    </Viewbox>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs
new file mode 100644
index 00000000..750b9d97
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs	
@@ -0,0 +1,117 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PPTNavigationSideRight : UserControl
+    {
+        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
+            nameof(CurrentPage), typeof(int), typeof(PPTNavigationSideRight), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
+            nameof(TotalPages), typeof(int), typeof(PPTNavigationSideRight), new PropertyMetadata(1));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(bool), typeof(PPTNavigationSideRight), new PropertyMetadata(true));
+
+        public static readonly RoutedEvent PreviousClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PreviousClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideRight));
+
+        public static readonly RoutedEvent NextClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(NextClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideRight));
+
+        public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideRight));
+
+        public int CurrentPage
+        {
+            get => (int)GetValue(CurrentPageProperty);
+            set => SetValue(CurrentPageProperty, value);
+        }
+
+        public int TotalPages
+        {
+            get => (int)GetValue(TotalPagesProperty);
+            set => SetValue(TotalPagesProperty, value);
+        }
+
+        public bool IsVisible
+        {
+            get => (bool)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler PreviousClicked
+        {
+            add => AddHandler(PreviousClickedEvent, value);
+            remove => RemoveHandler(PreviousClickedEvent, value);
+        }
+
+        public event RoutedEventHandler NextClicked
+        {
+            add => AddHandler(NextClickedEvent, value);
+            remove => RemoveHandler(NextClickedEvent, value);
+        }
+
+        public event RoutedEventHandler PageClicked
+        {
+            add => AddHandler(PageClickedEvent, value);
+            remove => RemoveHandler(PageClickedEvent, value);
+        }
+
+        public PPTNavigationSideRight()
+        {
+            InitializeComponent();
+        }
+
+        private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSPreviousButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
+        }
+
+        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSPageButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRSPageButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSPageButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
+        }
+
+        private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSNextButtonFeedbackBorder.Opacity = 1;
+        }
+
+        private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
+        {
+            PPTRSNextButtonFeedbackBorder.Opacity = 0;
+        }
+
+        private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            PPTRSNextButtonFeedbackBorder.Opacity = 0;
+            RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml
new file mode 100644
index 00000000..12fa1663
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml	
@@ -0,0 +1,405 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PenColorPalette"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
+             x:Name="Root">
+    <Grid>
+        <!-- Board Version -->
+        <Viewbox x:Name="BoardDefaultPenColorsPanel"
+                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Collapsed}"
+                Margin="0,8,0,0" Stretch="Fill">
+            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
+                <Border Width="300" Height="100" BorderBrush="{DynamicResource IconForeground}"
+                        BorderThickness="0" CornerRadius="5">
+                    <Controls:UniformGrid Rows="2" Height="100">
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5"
+                                Width="270"
+                                Margin="0">
+                                <Border BorderBrush="{DynamicResource FloatBarBorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="100" Width="45"
+                                    MouseDown="Border_MouseDown"
+                                    MouseUp="ColorThemeSwitch_MouseUp">
+                                    <Grid Margin="3">
+                                        <Image
+                                            x:Name="BoardColorThemeSwitchIcon"
+                                            Source="{StaticResource BoardColorThemeSwitchIcon}"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="23"
+                                            Height="23"
+                                            Margin="0,0,0,0" />
+                                        <TextBlock Margin="0,0,0,2"
+                                            x:Name="BoardColorThemeSwitchTextBlock"
+                                            Text="亮系"
+                                            Foreground="{DynamicResource FloatBarForeground}"
+                                            VerticalAlignment="Bottom"
+                                            HorizontalAlignment="Center"
+                                            FontSize="11" />
+                                    </Grid>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorBlack" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="Black"
+                                    BorderBrush="#D3D3D3"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorBlack_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorBlackContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorWhite" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="White"
+                                    BorderBrush="#71717a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorWhite_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorWhiteContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-black.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorRed" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#dc2626"
+                                    BorderBrush="#7f1d1d"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorRed_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorRedContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorYellow" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#eab308"
+                                    BorderBrush="#713f12"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorYellow_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorYellowContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5"
+                                Width="270"
+                                Margin="0">
+                                <Border x:Name="BoardBorderPenColorGreen" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#16a34a"
+                                    BorderBrush="#14532d"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorGreen_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorGreenContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorBlue" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#2563eb"
+                                    BorderBrush="#1e3a8a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorBlue_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorBlueContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorPink" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#db2777"
+                                    BorderBrush="#831843"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorPink_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorPinkContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorTeal" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#0d9488"
+                                    BorderBrush="#134e4a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorTeal_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorTealContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BoardBorderPenColorOrange" Style="{StaticResource BoardBorderPenColor}"
+                                    Background="#ea580c"
+                                    BorderBrush="#7c2d12"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorOrange_Click">
+                                    <Viewbox x:Name="BoardViewboxBtnColorOrangeContent"
+                                        Visibility="Collapsed"
+                                        Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                    </Controls:UniformGrid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+
+        <!-- Non-Board Version -->
+        <Viewbox x:Name="DefaultPenColorsPanel" 
+                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                Margin="0,8,0,0" Stretch="Fill">
+            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
+                <Border Width="300" Height="100" BorderBrush="Black"
+                        BorderThickness="0" CornerRadius="5">
+                    <Controls:UniformGrid Rows="2" Height="100">
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270"
+                                Margin="0">
+                                <Border BorderBrush="{DynamicResource FloatBarBorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="100" Width="45"
+                                    MouseDown="Border_MouseDown"
+                                    MouseUp="ColorThemeSwitch_MouseUp">
+                                    <Grid Margin="3">
+                                        <Image x:Name="ColorThemeSwitchIcon"
+                                            Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="23"
+                                            Height="23" Margin="0,0,0,0" />
+                                        <TextBlock Margin="0,0,0,2"
+                                            x:Name="ColorThemeSwitchTextBlock"
+                                            Text="亮系" Foreground="{DynamicResource FloatBarForeground}"
+                                            VerticalAlignment="Bottom"
+                                            HorizontalAlignment="Center"
+                                            FontSize="11" />
+                                    </Grid>
+                                </Border>
+                                <Border x:Name="BorderPenColorBlack"
+                                    Background="Black" BorderBrush="#D3D3D3"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorBlack_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorBlackContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorWhite"
+                                    Background="White"
+                                    BorderBrush="#71717a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorWhite_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorWhiteContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-black.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorRed"
+                                    Background="#dc2626"
+                                    BorderBrush="#7f1d1d"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45" MouseUp="BtnColorRed_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorRedContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorYellow"
+                                    Background="#eab308"
+                                    BorderBrush="#713f12"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorYellow_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorYellowContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Height="45"
+                            Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270"
+                                Margin="0">
+                                <Border x:Name="BorderPenColorGreen"
+                                    Background="#16a34a"
+                                    BorderBrush="#14532d"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorGreen_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorGreenContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorBlue"
+                                    Background="#2563eb"
+                                    BorderBrush="#1e3a8a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45" MouseUp="BtnColorBlue_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorBlueContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorPink"
+                                    Background="#db2777"
+                                    BorderBrush="#831843"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45" MouseUp="BtnColorPink_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorPinkContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorTeal"
+                                    Background="#0d9488"
+                                    BorderBrush="#134e4a"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorTeal_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorTealContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                                <Border x:Name="BorderPenColorOrange"
+                                    Background="#ea580c"
+                                    BorderBrush="#7c2d12"
+                                    BorderThickness="1.5"
+                                    CornerRadius="100"
+                                    Width="45"
+                                    MouseUp="BtnColorOrange_Click">
+                                    <Viewbox x:Name="ViewboxBtnColorOrangeContent"
+                                        Visibility="Collapsed" Margin="8">
+                                        <Image Source="/Resources/new-icons/checked-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            VerticalAlignment="Top"
+                                            Width="24"
+                                            Height="24" Margin="0,0,0,0" />
+                                    </Viewbox>
+                                </Border>
+                            </Controls:UniformGrid>
+                        </ikw:SimpleStackPanel>
+                    </Controls:UniformGrid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+    </Grid>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs
new file mode 100644
index 00000000..ded2efa6
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs	
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PenColorPalette : UserControl
+    {
+        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(
+            nameof(SelectedColor), typeof(Color), typeof(PenColorPalette), new PropertyMetadata(Colors.Black));
+
+        public static readonly DependencyProperty ColorPaletteProperty = DependencyProperty.Register(
+            nameof(ColorPalette), typeof(ObservableCollection<Color>), typeof(PenColorPalette), 
+            new PropertyMetadata(new ObservableCollection<Color>()));
+
+        public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
+            nameof(IsBoardMode), typeof(bool), typeof(PenColorPalette), new PropertyMetadata(false));
+
+        public static readonly RoutedEvent ColorSelectedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ColorSelected), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenColorPalette));
+
+        public static readonly RoutedEvent ThemeSwitchClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(ThemeSwitchClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenColorPalette));
+
+        public Color SelectedColor
+        {
+            get => (Color)GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
+        }
+
+        public ObservableCollection<Color> ColorPalette
+        {
+            get => (ObservableCollection<Color>)GetValue(ColorPaletteProperty);
+            set => SetValue(ColorPaletteProperty, value);
+        }
+
+        public bool IsBoardMode
+        {
+            get => (bool)GetValue(IsBoardModeProperty);
+            set => SetValue(IsBoardModeProperty, value);
+        }
+
+        public event RoutedEventHandler ColorSelected
+        {
+            add => AddHandler(ColorSelectedEvent, value);
+            remove => RemoveHandler(ColorSelectedEvent, value);
+        }
+
+        public event RoutedEventHandler ThemeSwitchClicked
+        {
+            add => AddHandler(ThemeSwitchClickedEvent, value);
+            remove => RemoveHandler(ThemeSwitchClickedEvent, value);
+        }
+
+        public PenColorPalette()
+        {
+            InitializeComponent();
+        }
+
+        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void ColorThemeSwitch_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(ThemeSwitchClickedEvent, this));
+        }
+
+        private void BtnColorBlack_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = Colors.Black;
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorWhite_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = Colors.White;
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorRed_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#dc2626");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorYellow_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#eab308");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorGreen_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#16a34a");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorBlue_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#2563eb");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorPink_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#db2777");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorTeal_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#0d9488");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+
+        private void BtnColorOrange_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectedColor = (Color)ColorConverter.ConvertFromString("#ea580c");
+            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml
new file mode 100644
index 00000000..9d237525
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml	
@@ -0,0 +1,205 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.PenSettingsPanel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
+             x:Name="Root">
+    <Border Background="{DynamicResource FloatBarBackground}"
+            Opacity="1" BorderBrush="#2563eb"
+            BorderThickness="1" CornerRadius="8"
+            Margin="-160,-200,-33,32">
+        <ikw:SimpleStackPanel Margin="0,-20,0,0">
+            <!-- Header with tab buttons -->
+            <Border BorderBrush="#1e3a8a" Height="32" BorderThickness="0,0,0,1"
+                    CornerRadius="8,8,0,0" Background="#2563eb"
+                    Margin="-1,-1,-1,0" Padding="1,1,1,0">
+                <ikw:SimpleStackPanel Orientation="Vertical" VerticalAlignment="Center">
+                    <ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="8,0,0,0" Spacing="2">
+                        <!-- Default Pen Tab -->
+                        <Border x:Name="DefaultPenTabButton"
+                                MouseDown="SwitchToDefaultPen"
+                                Background="#48dbeafe" Height="20" Width="36"
+                                CornerRadius="3">
+                            <Canvas>
+                                <ikw:SimpleStackPanel x:Name="DefaultPenTabButtonIndicator"
+                                    Visibility="Visible"
+                                    Orientation="Horizontal"
+                                    Canvas.Left="9" Canvas.Right="9" Canvas.Bottom="0">
+                                    <Border Width="18" Height="2"
+                                        Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
+                                </ikw:SimpleStackPanel>
+                                <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="36">
+                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
+                                        HorizontalAlignment="Center" Margin="0,3">
+                                        <Image Source="/Resources/new-icons/pen-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            Height="13" Width="13" />
+                                        <TextBlock x:Name="DefaultPenTabButtonText"
+                                            Foreground="White" FontWeight="Medium"
+                                            FontSize="9" TextAlignment="Center"
+                                            Text="画笔" Margin="2,1,0,0" />
+                                    </ikw:SimpleStackPanel>
+                                </ikw:SimpleStackPanel>
+                            </Canvas>
+                        </Border>
+                        <!-- Highlighter Pen Tab -->
+                        <Border x:Name="HighlightPenTabButton"
+                                MouseDown="SwitchToHighlighterPen"
+                                Background="Transparent" Height="20" Width="52"
+                                CornerRadius="3">
+                            <Canvas>
+                                <ikw:SimpleStackPanel Visibility="Collapsed"
+                                    x:Name="HighlightPenTabButtonIndicator"
+                                    Orientation="Horizontal" Canvas.Left="14" Canvas.Right="14" Canvas.Bottom="0">
+                                    <Border Width="24" Height="2"
+                                        Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
+                                </ikw:SimpleStackPanel>
+                                <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="52">
+                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
+                                        HorizontalAlignment="Center" Margin="0,3">
+                                        <Image Source="/Resources/new-icons/highlighter-white.png"
+                                            RenderOptions.BitmapScalingMode="HighQuality"
+                                            Height="13" Width="13" />
+                                        <TextBlock x:Name="HighlightPenTabButtonText"
+                                            Foreground="White" FontWeight="Medium"
+                                            FontSize="9" TextAlignment="Center"
+                                            Text="荧光笔" Margin="2,1,0,0" Width="35" />
+                                    </ikw:SimpleStackPanel>
+                                </ikw:SimpleStackPanel>
+                            </Canvas>
+                        </Border>
+                        <!-- Close button -->
+                        <Image Margin="66,0,0,0"
+                               Source="/Resources/new-icons/close-white.png"
+                               RenderOptions.BitmapScalingMode="HighQuality"
+                               Height="16" Width="16"
+                               MouseDown="Border_MouseDown"
+                               MouseUp="CloseBordertools_MouseUp" />
+                    </ikw:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
+            </Border>
+
+            <!-- Default Pen Props Panel -->
+            <Viewbox x:Name="DefaultPenPropsPanel" Visibility="Collapsed"
+                     Margin="12,8,12,0" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" Stretch="Fill">
+                <ikw:SimpleStackPanel>
+                    <ikw:SimpleStackPanel Orientation="Horizontal" Height="35" Margin="0,0,0,8">
+                        <Label Content="笔锋" Margin="0,0,6,0"
+                               Foreground="{DynamicResource FloatBarForeground}"
+                               FontSize="16" FontWeight="Bold"
+                               VerticalAlignment="Center" />
+                        <ComboBox Height="30" VerticalAlignment="Center"
+                            x:Name="ComboBoxPenStyle"
+                            FontFamily="Microsoft YaHei UI"
+                            SelectedIndex="1"
+                            SelectionChanged="ComboBoxPenStyle_SelectionChanged">
+                            <ComboBoxItem Content="实时笔锋" FontFamily="Microsoft YaHei UI" />
+                            <ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI" />
+                            <ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI" />
+                            <ComboBoxItem Content="关闭笔锋" FontFamily="Microsoft YaHei UI" />
+                        </ComboBox>
+                    </ikw:SimpleStackPanel>
+                    <Controls:UniformGrid Columns="3" Width="300" Height="55">
+                        <ikw:SimpleStackPanel x:Name="NibModeSimpleStackPanel"
+                            Orientation="Horizontal" Width="100">
+                            <Label Content="笔尖模式" FontSize="12" VerticalAlignment="Center" />
+                            <ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode"
+                                MinWidth="0" FontFamily="Microsoft YaHei UI"
+                                Width="80" Margin="10,0,0,0"
+                                Toggled="ToggleSwitchEnableNibMode_Toggled"
+                                IsOn="True" />
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Width="100">
+                            <Label Margin="0,0,10,0" Content="墨迹纠正"
+                                Foreground="{DynamicResource FloatBarForeground}"
+                                FontSize="12" VerticalAlignment="Center" />
+                            <ui:ToggleSwitch x:Name="ToggleSwitchEnableInkToShape"
+                                Foreground="{DynamicResource FloatBarForeground}"
+                                FontFamily="Microsoft YaHei UI" Width="80"
+                                Toggled="ToggleSwitchEnableInkToShape_Toggled"
+                                MinWidth="0" />
+                        </ikw:SimpleStackPanel>
+                        <ikw:SimpleStackPanel Orientation="Horizontal"
+                            Width="100" x:Name="InkFadeControlPanel">
+                            <Label Margin="0,0,10,0" Content="墨迹渐隐"
+                                Foreground="{DynamicResource FloatBarForeground}"
+                                FontSize="12" VerticalAlignment="Center" />
+                            <ui:ToggleSwitch x:Name="ToggleSwitchInkFade"
+                                Foreground="{DynamicResource FloatBarForeground}"
+                                FontFamily="Microsoft YaHei UI" Width="90"
+                                Toggled="ToggleSwitchInkFade_Toggled"
+                                MinWidth="0" IsOn="False" />
+                        </ikw:SimpleStackPanel>
+                    </Controls:UniformGrid>
+
+                    <StackPanel Orientation="Horizontal" Height="30">
+                        <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
+                               Foreground="{DynamicResource FloatBarForeground}"
+                               FontSize="17" VerticalAlignment="Center" />
+                        <Slider x:Name="InkWidthSlider" Minimum="1"
+                                Maximum="20" Width="200" FontFamily="Microsoft YaHei UI"
+                                FontSize="20" IsSnapToTickEnabled="True"
+                                Value="5" TickFrequency="0.1" TickPlacement="None"
+                                ValueChanged="InkWidthSlider_ValueChanged" />
+                        <TextBlock Width="36" TextAlignment="Right"
+                            Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
+                            FontFamily="Consolas" VerticalAlignment="Center"
+                            Margin="10,0,0,0" FontSize="15" />
+                        <Button x:Name="BrushModeButton" Width="24" Height="24" Margin="8,0,0,0"
+                                Style="{StaticResource NavButton}"
+                                VerticalAlignment="Center"
+                                Click="BrushModeButton_Click"
+                                ToolTip="板刷模式">
+                            <Viewbox Margin="4" Stretch="Uniform">
+                                <Path x:Name="BrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill">
+                                    <Path.Data>
+                                        <PathGeometry Figures="M6.7812 6.9375C6.81411 7.06468 6.87172 7.18413 6.95081 7.28903C7.0299 7.39392 7.12891 7.4822 7.24213 7.54882C7.47058 7.68347 7.74313 7.72187 7.99989 7.65557C8.25664 7.58928 8.47657 7.42372 8.61128 7.19531L11.9238 1.57031C12.0584 1.34186 12.0968 1.06928 12.0305 0.812526C11.9642 0.555772 11.7987 0.335869 11.5703 0.201167C11.3418 0.0665197 11.0693 0.028121 10.8125 0.0944166C10.5558 0.160712 10.3358 0.326268 10.2011 0.554683L6.88862 6.17968C6.82183 6.29276 6.77796 6.41788 6.75953 6.54791C6.7411 6.67793 6.74847 6.81031 6.7812 6.9375Z M5.21875 5.09375L10.1662 8.14759C10.7697 8.46231 10.9861 9.26072 10.3308 9.74464L9.70892 9.96117L3.6897 6.43971L3.7074 5.53239C3.99623 4.94715 4.46209 4.71653 5.21875 5.09375Z M3.05377 7.48846L9.04364 10.9631L7.99908 12.5052C7.77811 12.7482 7.86648 13.0797 8.08746 13.2123L9.03766 14.0298H3.66809C1.47755 14.0298 0.471255 11.9653 1.52466 10.1408L3.05377 7.48846Z" />
+                                    </Path.Data>
+                                </Path>
+                            </Viewbox>
+                        </Button>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Height="30">
+                        <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold"
+                               Foreground="{DynamicResource FloatBarForeground}"
+                               FontSize="17" VerticalAlignment="Center" />
+                        <Slider x:Name="InkAlphaSlider" Margin="0,0,0,0"
+                                Minimum="1" Maximum="255" Width="200"
+                                FontFamily="Microsoft YaHei UI" FontSize="20"
+                                IsSnapToTickEnabled="True" Value="255"
+                                TickFrequency="1" TickPlacement="None"
+                                ValueChanged="InkAlphaSlider_ValueChanged" />
+                        <TextBlock Width="36" TextAlignment="Right"
+                            Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}"
+                            FontFamily="Consolas" VerticalAlignment="Center"
+                            Margin="10,0,0,0" FontSize="15" />
+                    </StackPanel>
+                </ikw:SimpleStackPanel>
+            </Viewbox>
+
+            <!-- Highlighter Pen Props Panel -->
+            <Viewbox x:Name="HighlighterPenPropsPanel" Visibility="Collapsed"
+                     Margin="12,8,12,0" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" Stretch="Fill">
+                <ikw:SimpleStackPanel>
+                    <StackPanel Orientation="Horizontal" Height="30">
+                        <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
+                               Foreground="{DynamicResource FloatBarForeground}"
+                               FontSize="17" VerticalAlignment="Center" />
+                        <Slider x:Name="HighlighterWidthSlider" Minimum="15"
+                                Maximum="45" Width="208"
+                                FontFamily="Microsoft YaHei UI" FontSize="20"
+                                IsSnapToTickEnabled="True" Value="20"
+                                TickFrequency="1" TickPlacement="None"
+                                ValueChanged="HighlighterWidthSlider_ValueChanged" />
+                        <TextBlock Text="{Binding Value, ElementName=HighlighterWidthSlider, Mode=OneWay}"
+                            FontFamily="Consolas" VerticalAlignment="Bottom"
+                            Margin="10,0,0,4.5" FontSize="15" />
+                    </StackPanel>
+                </ikw:SimpleStackPanel>
+            </Viewbox>
+        </ikw:SimpleStackPanel>
+    </Border>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs
new file mode 100644
index 00000000..5ef0db6e
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs	
@@ -0,0 +1,190 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class PenSettingsPanel : UserControl
+    {
+        public static readonly DependencyProperty PenWidthProperty = DependencyProperty.Register(
+            nameof(PenWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(5.0));
+
+        public static readonly DependencyProperty PenAlphaProperty = DependencyProperty.Register(
+            nameof(PenAlpha), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(255.0));
+
+        public static readonly DependencyProperty HighlighterWidthProperty = DependencyProperty.Register(
+            nameof(HighlighterWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(20.0));
+
+        public static readonly DependencyProperty IsNibModeEnabledProperty = DependencyProperty.Register(
+            nameof(IsNibModeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(true));
+
+        public static readonly DependencyProperty IsInkFadeEnabledProperty = DependencyProperty.Register(
+            nameof(IsInkFadeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
+            nameof(IsBoardMode), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty SelectedPenTypeProperty = DependencyProperty.Register(
+            nameof(SelectedPenType), typeof(int), typeof(PenSettingsPanel), new PropertyMetadata(0));
+
+        public static readonly RoutedEvent PenTypeChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PenTypeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent WidthChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(WidthChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent AlphaChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(AlphaChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent NibModeChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(NibModeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent InkFadeChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(InkFadeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public double PenWidth
+        {
+            get => (double)GetValue(PenWidthProperty);
+            set => SetValue(PenWidthProperty, value);
+        }
+
+        public double PenAlpha
+        {
+            get => (double)GetValue(PenAlphaProperty);
+            set => SetValue(PenAlphaProperty, value);
+        }
+
+        public double HighlighterWidth
+        {
+            get => (double)GetValue(HighlighterWidthProperty);
+            set => SetValue(HighlighterWidthProperty, value);
+        }
+
+        public bool IsNibModeEnabled
+        {
+            get => (bool)GetValue(IsNibModeEnabledProperty);
+            set => SetValue(IsNibModeEnabledProperty, value);
+        }
+
+        public bool IsInkFadeEnabled
+        {
+            get => (bool)GetValue(IsInkFadeEnabledProperty);
+            set => SetValue(IsInkFadeEnabledProperty, value);
+        }
+
+        public bool IsBoardMode
+        {
+            get => (bool)GetValue(IsBoardModeProperty);
+            set => SetValue(IsBoardModeProperty, value);
+        }
+
+        public int SelectedPenType
+        {
+            get => (int)GetValue(SelectedPenTypeProperty);
+            set => SetValue(SelectedPenTypeProperty, value);
+        }
+
+        public event RoutedEventHandler PenTypeChanged
+        {
+            add => AddHandler(PenTypeChangedEvent, value);
+            remove => RemoveHandler(PenTypeChangedEvent, value);
+        }
+
+        public event RoutedEventHandler WidthChanged
+        {
+            add => AddHandler(WidthChangedEvent, value);
+            remove => RemoveHandler(WidthChangedEvent, value);
+        }
+
+        public event RoutedEventHandler AlphaChanged
+        {
+            add => AddHandler(AlphaChangedEvent, value);
+            remove => RemoveHandler(AlphaChangedEvent, value);
+        }
+
+        public event RoutedEventHandler NibModeChanged
+        {
+            add => AddHandler(NibModeChangedEvent, value);
+            remove => RemoveHandler(NibModeChangedEvent, value);
+        }
+
+        public event RoutedEventHandler InkFadeChanged
+        {
+            add => AddHandler(InkFadeChangedEvent, value);
+            remove => RemoveHandler(InkFadeChangedEvent, value);
+        }
+
+        public PenSettingsPanel()
+        {
+            InitializeComponent();
+        }
+
+        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void CloseBordertools_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+
+        private void SwitchToDefaultPen(object sender, MouseButtonEventArgs e)
+        {
+            SelectedPenType = 0;
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+
+        private void SwitchToHighlighterPen(object sender, MouseButtonEventArgs e)
+        {
+            SelectedPenType = 1;
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+
+        private void ComboBoxPenStyle_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+
+        private void ToggleSwitchEnableNibMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            IsNibModeEnabled = ToggleSwitchEnableNibMode.IsOn;
+            RaiseEvent(new RoutedEventArgs(NibModeChangedEvent, this));
+        }
+
+        private void ToggleSwitchEnableInkToShape_Toggled(object sender, RoutedEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+
+        private void ToggleSwitchInkFade_Toggled(object sender, RoutedEventArgs e)
+        {
+            IsInkFadeEnabled = ToggleSwitchInkFade.IsOn;
+            RaiseEvent(new RoutedEventArgs(InkFadeChangedEvent, this));
+        }
+
+        private void InkWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            PenWidth = InkWidthSlider.Value;
+            RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
+        }
+
+        private void InkAlphaSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            PenAlpha = InkAlphaSlider.Value;
+            RaiseEvent(new RoutedEventArgs(AlphaChangedEvent, this));
+        }
+
+        private void HighlighterWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            HighlighterWidth = HighlighterWidthSlider.Value;
+            RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
+        }
+
+        private void BrushModeButton_Click(object sender, RoutedEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+        }
+    }
+}
diff --git a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml
new file mode 100644
index 00000000..b42c473a
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml	
@@ -0,0 +1,116 @@
+<UserControl x:Class="Ink_Canvas.MainWindow_controls.StrokeSelectionToolbar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             x:Name="Root">
+    <Border Name="BorderStrokeSelectionControl"
+            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="800,900,0,0"
+            CornerRadius="5" Height="80"
+            Background="{DynamicResource FloatBarBackground}"
+            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}"
+            BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
+        <Viewbox Margin="0,-2.5">
+            <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
+                <Border Name="BorderStrokeSelectionClone" Margin="0,2,-9,2" Background="Transparent"
+                        CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionClone_MouseUp">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource StrokeSelectionCloneIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                        <TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Name="BorderStrokeSelectionCloneToNewBoard" Margin="0,2,-9,2" Background="Transparent"
+                        CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Width="40" MouseDown="Border_MouseDown"
+                        MouseUp="BorderStrokeSelectionCloneToNewBoard_MouseUp"
+                        Visibility="{Binding ElementName=GridBackgroundCover, Path=Visibility}">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource StrokeSelectionCloneToNewBoardIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                        <TextBlock Text="克隆至新页" FontSize="8" Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Height="40">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
+                            <Image Source="{DynamicResource Rotate45DrawingImage}" Height="22"
+                                   MouseDown="Border_MouseDown" MouseUp="ImageRotate45_MouseUp" />
+                            <Image Source="{DynamicResource Rotate90DrawingImage}" Height="22"
+                                   MouseDown="Border_MouseDown" MouseUp="ImageRotate90_MouseUp" />
+                        </ikw:SimpleStackPanel>
+                        <TextBlock Text="旋转" FontSize="10" HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource FloatBarForeground}" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Height="40">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" Margin="0,-10">
+                        <ikw:SimpleStackPanel Orientation="Horizontal">
+                            <Image MouseDown="Border_MouseDown" MouseUp="ImageFlipHorizontal_MouseUp"
+                                   Source="{DynamicResource StrokeSelectionFlipHorizontalIcon}"
+                                   RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30" />
+                            <Image MouseDown="Border_MouseDown" MouseUp="ImageFlipVertical_MouseUp"
+                                   Source="{DynamicResource StrokeSelectionFlipVerticalIcon}"
+                                   RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30" />
+                        </ikw:SimpleStackPanel>
+                        <TextBlock Text="翻转" FontSize="10" HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource FloatBarForeground}" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Height="40">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="5">
+                            <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthDecrease_MouseUp">
+                                <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                                <TextBlock Text="-" Foreground="{DynamicResource FloatBarForeground}"
+                                           VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                           Margin="0,0,-2,-7" FontSize="15" />
+                            </Grid>
+                            <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthIncrease_MouseUp">
+                                <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                                <TextBlock Text="+" Foreground="{DynamicResource FloatBarForeground}"
+                                           VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                           Margin="0,0,-3,-4" FontSize="11" />
+                            </Grid>
+                            <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthRestore_MouseUp">
+                                <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                                <Image Source="{DynamicResource AndroidRefreshDrawingImage}"
+                                       VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                       Margin="0,0,-2,-2" Width="8" />
+                            </Grid>
+                        </ikw:SimpleStackPanel>
+                        <TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource FloatBarForeground}" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+                <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
+                        Background="{DynamicResource FloatBarForeground}" />
+                <Border Margin="-8,0,0,0"
+                        CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
+                        Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionDelete_MouseUp">
+                    <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Image Source="{DynamicResource StrokeSelectionDeleteIcon}"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
+                        <TextBlock Margin="0,5,0,0" Text="删除" FontSize="10"
+                                   Foreground="{DynamicResource FloatBarForeground}"
+                                   HorizontalAlignment="Center" />
+                    </ikw:SimpleStackPanel>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+    </Border>
+</UserControl>
diff --git a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs
new file mode 100644
index 00000000..44a91e75
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs	
@@ -0,0 +1,142 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.MainWindow_controls
+{
+    public partial class StrokeSelectionToolbar : UserControl
+    {
+        public static readonly DependencyProperty SelectedStrokesProperty = DependencyProperty.Register(
+            nameof(SelectedStrokes), typeof(object), typeof(StrokeSelectionToolbar), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+            nameof(IsVisible), typeof(Visibility), typeof(StrokeSelectionToolbar), new PropertyMetadata(Visibility.Collapsed));
+
+        public static readonly RoutedEvent CloneRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(CloneRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public static readonly RoutedEvent CloneToNewBoardRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(CloneToNewBoardRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public static readonly RoutedEvent DeleteRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(DeleteRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public static readonly RoutedEvent RotateRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(RotateRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public static readonly RoutedEvent FlipRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(FlipRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public static readonly RoutedEvent WidthChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(WidthChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
+
+        public object SelectedStrokes
+        {
+            get => GetValue(SelectedStrokesProperty);
+            set => SetValue(SelectedStrokesProperty, value);
+        }
+
+        public new Visibility IsVisible
+        {
+            get => (Visibility)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        public event RoutedEventHandler CloneRequested
+        {
+            add => AddHandler(CloneRequestedEvent, value);
+            remove => RemoveHandler(CloneRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler CloneToNewBoardRequested
+        {
+            add => AddHandler(CloneToNewBoardRequestedEvent, value);
+            remove => RemoveHandler(CloneToNewBoardRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler DeleteRequested
+        {
+            add => AddHandler(DeleteRequestedEvent, value);
+            remove => RemoveHandler(DeleteRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler RotateRequested
+        {
+            add => AddHandler(RotateRequestedEvent, value);
+            remove => RemoveHandler(RotateRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler FlipRequested
+        {
+            add => AddHandler(FlipRequestedEvent, value);
+            remove => RemoveHandler(FlipRequestedEvent, value);
+        }
+
+        public event RoutedEventHandler WidthChanged
+        {
+            add => AddHandler(WidthChangedEvent, value);
+            remove => RemoveHandler(WidthChangedEvent, value);
+        }
+
+        public StrokeSelectionToolbar()
+        {
+            InitializeComponent();
+        }
+
+        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+        }
+
+        private void BorderStrokeSelectionClone_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(CloneRequestedEvent, this));
+        }
+
+        private void BorderStrokeSelectionCloneToNewBoard_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(CloneToNewBoardRequestedEvent, this));
+        }
+
+        private void BorderStrokeSelectionDelete_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(DeleteRequestedEvent, this));
+        }
+
+        private void ImageRotate45_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(RotateRequestedEvent, this));
+        }
+
+        private void ImageRotate90_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(RotateRequestedEvent, this));
+        }
+
+        private void ImageFlipHorizontal_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(FlipRequestedEvent, this));
+        }
+
+        private void ImageFlipVertical_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(FlipRequestedEvent, this));
+        }
+
+        private void GridPenWidthDecrease_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
+        }
+
+        private void GridPenWidthIncrease_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
+        }
+
+        private void GridPenWidthRestore_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
+        }
+    }
+}

From 72b90417a8c2b31440ff18961935cfaa88ae3023 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Wed, 8 Apr 2026 07:22:01 +0800
Subject: [PATCH 07/15] =?UTF-8?q?refactor:=20=E5=AE=8C=E6=88=90=20MainWind?=
 =?UTF-8?q?ow=20XAML=20=E5=88=B0=20UserControl=20=E7=9A=84=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 减少 MainWindow.xaml 从 10,966 行到 8,873 行（-2,093 行，达成 2,000+ 目标）
- 集成 11 个 UserControl：StrokeSelectionToolbar, ImageSelectionToolbar,
  ImageResizeHandles, PenSettingsPanel (x2), PenColorPalette (x2),
  HighlighterColorPalette (x2), PPTNavigationBottomLeft,
  PPTNavigationBottomRight, PPTNavigationSideLeft, PPTNavigationSideRight
- 更新 PPTUIManager.cs 使用 UserControl API 替代直接元素访问
- 更新相关代码文件以使用新的 UserControl API
- 构建通过（0 错误）
---
 Ink Canvas/Helpers/PPTUIManager.cs            |  208 +-
 Ink Canvas/MainWindow.xaml                    | 2269 +----------------
 Ink Canvas/MainWindow.xaml.cs                 |  198 +-
 .../HighlighterColorPalette.xaml              |  548 ++--
 .../HighlighterColorPalette.xaml.cs           |  146 +-
 .../ImageResizeHandles.xaml                   |   36 +-
 .../ImageResizeHandles.xaml.cs                |  103 +-
 .../ImageSelectionToolbar.xaml                |    2 +-
 .../ImageSelectionToolbar.xaml.cs             |   41 +-
 .../PPTNavigationBottomLeft.xaml              |   21 +-
 .../PPTNavigationBottomLeft.xaml.cs           |   61 +-
 .../PPTNavigationBottomRight.xaml             |   21 +-
 .../PPTNavigationBottomRight.xaml.cs          |   62 +-
 .../PPTNavigationSideLeft.xaml.cs             |   48 +
 .../PPTNavigationSideRight.xaml.cs            |   66 +-
 .../MainWindow_controls/PenColorPalette.xaml  |    8 +-
 .../PenColorPalette.xaml.cs                   |  262 +-
 .../MainWindow_controls/PenSettingsPanel.xaml |  402 +--
 .../PenSettingsPanel.xaml.cs                  |  326 ++-
 .../StrokeSelectionToolbar.xaml               |    1 -
 .../StrokeSelectionToolbar.xaml.cs            |   48 +-
 Ink Canvas/MainWindow_cs/MW_AutoFold.cs       |   12 +-
 Ink Canvas/MainWindow_cs/MW_AutoTheme.cs      |   12 +-
 Ink Canvas/MainWindow_cs/MW_Colors.cs         |  308 +--
 .../MainWindow_cs/MW_ElementsControls.cs      |   42 +-
 .../MainWindow_cs/MW_FloatingBarIcons.cs      |   12 +-
 Ink Canvas/MainWindow_cs/MW_PPT.cs            |  215 +-
 .../MainWindow_cs/MW_SelectionGestures.cs     |    4 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  150 +-
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |   48 +-
 30 files changed, 2313 insertions(+), 3367 deletions(-)

diff --git a/Ink Canvas/Helpers/PPTUIManager.cs b/Ink Canvas/Helpers/PPTUIManager.cs
index d500fd32..f6e0c525 100644
--- a/Ink Canvas/Helpers/PPTUIManager.cs	
+++ b/Ink Canvas/Helpers/PPTUIManager.cs	
@@ -89,14 +89,22 @@ public void UpdateSlideShowStatus(bool isInSlideShow, int currentSlide = 0, int
                         // 只有在页数有效时才更新页码显示
                         if (currentSlide > 0 && totalSlides > 0)
                         {
-                            _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                            _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                            _mainWindow.LeftSidePanelForPPTNavigation.SetPageDisplay(currentSlide.ToString(), totalSlides.ToString());
+                            _mainWindow.RightSidePanelForPPTNavigation.SetPageDisplay(currentSlide.ToString(), totalSlides.ToString());
+                            _mainWindow.BorderPPTNavBottomLeft.CurrentPage = currentSlide.ToString();
+                            _mainWindow.BorderPPTNavBottomLeft.TotalPages = totalSlides.ToString();
+                            _mainWindow.BorderPPTNavBottomRight.CurrentPage = currentSlide.ToString();
+                            _mainWindow.BorderPPTNavBottomRight.TotalPages = totalSlides.ToString();
                         }
                         else
                         {
                             // 页数无效时清空页码显示
-                            _mainWindow.PPTBtnPageNow.Text = "?";
-                            _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                            _mainWindow.LeftSidePanelForPPTNavigation.SetPageDisplay("?", "?");
+                            _mainWindow.RightSidePanelForPPTNavigation.SetPageDisplay("?", "?");
+                            _mainWindow.BorderPPTNavBottomLeft.CurrentPage = "?";
+                            _mainWindow.BorderPPTNavBottomLeft.TotalPages = "?";
+                            _mainWindow.BorderPPTNavBottomRight.CurrentPage = "?";
+                            _mainWindow.BorderPPTNavBottomRight.TotalPages = "?";
                         }
 
                         UpdateNavigationPanelsVisibility();
@@ -161,14 +169,22 @@ public void UpdateCurrentSlideNumber(int currentSlide, int totalSlides)
                     // 只有在页数有效时才更新页码显示
                     if (currentSlide > 0 && totalSlides > 0)
                     {
-                        _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                        _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                        _mainWindow.LeftSidePanelForPPTNavigation.SetPageDisplay(currentSlide.ToString(), totalSlides.ToString());
+                        _mainWindow.RightSidePanelForPPTNavigation.SetPageDisplay(currentSlide.ToString(), totalSlides.ToString());
+                        _mainWindow.BorderPPTNavBottomLeft.CurrentPage = currentSlide.ToString();
+                        _mainWindow.BorderPPTNavBottomLeft.TotalPages = totalSlides.ToString();
+                        _mainWindow.BorderPPTNavBottomRight.CurrentPage = currentSlide.ToString();
+                        _mainWindow.BorderPPTNavBottomRight.TotalPages = totalSlides.ToString();
                     }
                     else
                     {
                         // 页数无效时清空页码显示
-                        _mainWindow.PPTBtnPageNow.Text = "?";
-                        _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                        _mainWindow.LeftSidePanelForPPTNavigation.SetPageDisplay("?", "?");
+                        _mainWindow.RightSidePanelForPPTNavigation.SetPageDisplay("?", "?");
+                        _mainWindow.BorderPPTNavBottomLeft.CurrentPage = "?";
+                        _mainWindow.BorderPPTNavBottomLeft.TotalPages = "?";
+                        _mainWindow.BorderPPTNavBottomRight.CurrentPage = "?";
+                        _mainWindow.BorderPPTNavBottomRight.TotalPages = "?";
                     }
                 }
                 catch (Exception ex)
@@ -228,12 +244,12 @@ public void UpdateNavigationPanelsVisibility()
                     }
 
                     // 设置侧边按钮位置
-                    _mainWindow.LeftSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTLSButtonPosition * 2);
-                    _mainWindow.RightSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTRSButtonPosition * 2);
+                    _mainWindow.LeftSidePanelForPPTNavigation.ControlMargin = new Thickness(0, 0, 0, PPTLSButtonPosition * 2);
+                    _mainWindow.RightSidePanelForPPTNavigation.ControlMargin = new Thickness(0, 0, 0, PPTRSButtonPosition * 2);
 
                     // 设置底部按钮水平位置
-                    _mainWindow.LeftBottomPanelForPPTNavigation.Margin = new Thickness(6 + PPTLBButtonPosition, 0, 0, 6);
-                    _mainWindow.RightBottomPanelForPPTNavigation.Margin = new Thickness(0, 0, 6 + PPTRBButtonPosition, 6);
+                    _mainWindow.BorderPPTNavBottomLeft.ControlMargin = new Thickness(6 + PPTLBButtonPosition, 0, 0, 6);
+                    _mainWindow.BorderPPTNavBottomRight.ControlMargin = new Thickness(0, 0, 6 + PPTRBButtonPosition, 6);
 
                     // 根据显示选项设置面板可见性
                     var displayOption = PPTButtonsDisplayOption.ToString();
@@ -243,15 +259,15 @@ public void UpdateNavigationPanelsVisibility()
 
                         // 左下角面板
                         if (options[0] == '2')
-                            AnimationsHelper.ShowWithFadeIn(_mainWindow.LeftBottomPanelForPPTNavigation);
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.BorderPPTNavBottomLeft);
                         else
-                            _mainWindow.LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                            _mainWindow.BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
 
                         // 右下角面板
                         if (options[1] == '2')
-                            AnimationsHelper.ShowWithFadeIn(_mainWindow.RightBottomPanelForPPTNavigation);
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.BorderPPTNavBottomRight);
                         else
-                            _mainWindow.RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                            _mainWindow.BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
 
                         // 左侧面板
                         if (options[2] == '2')
@@ -301,8 +317,8 @@ public void HideAllNavigationPanels()
             {
                 try
                 {
-                    _mainWindow.LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                    _mainWindow.RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    _mainWindow.BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
+                    _mainWindow.BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
                     _mainWindow.LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                     _mainWindow.RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 }
@@ -386,16 +402,16 @@ private void UpdateSideButtonStyles()
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.LeftSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
+                _mainWindow.RightSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
 
                 // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
-                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
+                _mainWindow.LeftSidePanelForPPTNavigation.SetContainerOpacity(PPTLSButtonOpacity);
+                _mainWindow.RightSidePanelForPPTNavigation.SetContainerOpacity(PPTRSButtonOpacity);
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLSBorder, _mainWindow.PPTBtnRSBorder, isDarkTheme, true);
+                ApplySideButtonTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
@@ -414,16 +430,16 @@ private void UpdateBottomButtonStyles()
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBPageButton.Visibility = pageButtonVisibility;
 
                 // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
-                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
+                _mainWindow.BorderPPTNavBottomLeft.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
+                _mainWindow.BorderPPTNavBottomRight.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLBBorder, _mainWindow.PPTBtnRBBorder, isDarkTheme, false);
+                ApplyBottomButtonTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
@@ -431,48 +447,14 @@ private void UpdateBottomButtonStyles()
             }
         }
 
-        private void ApplyButtonTheme(Border leftBorder, Border rightBorder, bool isDarkTheme, bool isSideButton)
+        private void ApplySideButtonTheme(bool isDarkTheme)
         {
             try
             {
-                Color backgroundColor, borderColor, foregroundColor, feedbackColor;
+                GetThemeBrushes(isDarkTheme, out var backgroundBrush, out var borderBrush, out var foregroundBrush, out var feedbackBrush);
 
-                if (isDarkTheme)
-                {
-                    backgroundColor = Color.FromRgb(39, 39, 42);
-                    borderColor = Color.FromRgb(82, 82, 91);
-                    foregroundColor = Colors.White;
-                    feedbackColor = Colors.White;
-                }
-                else
-                {
-                    backgroundColor = Color.FromRgb(244, 244, 245);
-                    borderColor = Color.FromRgb(161, 161, 170);
-                    foregroundColor = Color.FromRgb(39, 39, 42);
-                    feedbackColor = Color.FromRgb(24, 24, 27);
-                }
-
-                // 应用背景和边框颜色
-                var backgroundBrush = new SolidColorBrush(backgroundColor);
-                var borderBrush = new SolidColorBrush(borderColor);
-
-                leftBorder.Background = backgroundBrush;
-                leftBorder.BorderBrush = borderBrush;
-                rightBorder.Background = backgroundBrush;
-                rightBorder.BorderBrush = borderBrush;
-
-                // 应用图标和文字颜色
-                var foregroundBrush = new SolidColorBrush(foregroundColor);
-                var feedbackBrush = new SolidColorBrush(feedbackColor);
-
-                if (isSideButton)
-                {
-                    ApplySideButtonColors(foregroundBrush, feedbackBrush);
-                }
-                else
-                {
-                    ApplyBottomButtonColors(foregroundBrush, feedbackBrush);
-                }
+                _mainWindow.LeftSidePanelForPPTNavigation.ApplyTheme(backgroundBrush, borderBrush, foregroundBrush, feedbackBrush);
+                _mainWindow.RightSidePanelForPPTNavigation.ApplyTheme(backgroundBrush, borderBrush, foregroundBrush, feedbackBrush);
             }
             catch (Exception ex)
             {
@@ -480,46 +462,68 @@ private void ApplyButtonTheme(Border leftBorder, Border rightBorder, bool isDark
             }
         }
 
-        private void ApplySideButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
+        private void ApplyBottomButtonTheme(bool isDarkTheme)
         {
-            // 图标颜色
-            _mainWindow.PPTLSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLSNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLSPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRSPageButton, foregroundBrush);
+            try
+            {
+                GetThemeBrushes(isDarkTheme, out var backgroundBrush, out var borderBrush, out var foregroundBrush, out var feedbackBrush);
+
+                _mainWindow.BorderPPTNavBottomLeft.PPTBtnLBBorder.Background = backgroundBrush;
+                _mainWindow.BorderPPTNavBottomLeft.PPTBtnLBBorder.BorderBrush = borderBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTBtnRBBorder.Background = backgroundBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTBtnRBBorder.BorderBrush = borderBrush;
+
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBPreviousButtonGeometry.Brush = foregroundBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBPreviousButtonGeometry.Brush = foregroundBrush;
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBNextButtonGeometry.Brush = foregroundBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBNextButtonGeometry.Brush = foregroundBrush;
+
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBPreviousButtonFeedbackBorder.Background = feedbackBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBPreviousButtonFeedbackBorder.Background = feedbackBrush;
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBPageButtonFeedbackBorder.Background = feedbackBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBPageButtonFeedbackBorder.Background = feedbackBrush;
+                _mainWindow.BorderPPTNavBottomLeft.PPTLBNextButtonFeedbackBorder.Background = feedbackBrush;
+                _mainWindow.BorderPPTNavBottomRight.PPTRBNextButtonFeedbackBorder.Background = feedbackBrush;
+
+                TextBlock.SetForeground(_mainWindow.BorderPPTNavBottomLeft.PPTLBPageButton, foregroundBrush);
+                TextBlock.SetForeground(_mainWindow.BorderPPTNavBottomRight.PPTRBPageButton, foregroundBrush);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用按钮主题失败: {ex}", LogHelper.LogType.Error);
+            }
         }
 
-        private void ApplyBottomButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
+        private static void GetThemeBrushes(bool isDarkTheme,
+            out SolidColorBrush backgroundBrush,
+            out SolidColorBrush borderBrush,
+            out SolidColorBrush foregroundBrush,
+            out SolidColorBrush feedbackBrush)
         {
-            // 图标颜色
-            _mainWindow.PPTLBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLBNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLBPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRBPageButton, foregroundBrush);
+            Color backgroundColor;
+            Color borderColor;
+            Color foregroundColor;
+            Color feedbackColor;
+
+            if (isDarkTheme)
+            {
+                backgroundColor = Color.FromRgb(39, 39, 42);
+                borderColor = Color.FromRgb(82, 82, 91);
+                foregroundColor = Colors.White;
+                feedbackColor = Colors.White;
+            }
+            else
+            {
+                backgroundColor = Color.FromRgb(244, 244, 245);
+                borderColor = Color.FromRgb(161, 161, 170);
+                foregroundColor = Color.FromRgb(39, 39, 42);
+                feedbackColor = Color.FromRgb(24, 24, 27);
+            }
+
+            backgroundBrush = new SolidColorBrush(backgroundColor);
+            borderBrush = new SolidColorBrush(borderColor);
+            foregroundBrush = new SolidColorBrush(foregroundColor);
+            feedbackBrush = new SolidColorBrush(feedbackColor);
         }
         #endregion
     }
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index ed6b7c07..54fc9685 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -4668,223 +4668,14 @@
                                TouchDown="SelectionHandle_TouchDown" TouchMove="SelectionHandle_TouchMove" TouchUp="SelectionHandle_TouchUp" />
                 </Canvas>
             </Grid>
-            <Border Name="BorderStrokeSelectionControl"
+            <mwcontrols:StrokeSelectionToolbar x:Name="BorderStrokeSelectionControl"
                     HorizontalAlignment="Left" VerticalAlignment="Top" Margin="800,900,0,0"
-                    CornerRadius="5" Height="80"
-                    Background="{DynamicResource FloatBarBackground}"
-                    Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}"
-                    BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
-                <Viewbox Margin="0,-2.5">
-                    <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
-                        <Border Name="BorderStrokeSelectionClone" Margin="0,2,-9,2" Background="Transparent"
-                                CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionClone_MouseUp">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource StrokeSelectionCloneIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                <TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Name="BorderStrokeSelectionCloneToNewBoard" Margin="0,2,-9,2" Background="Transparent"
-                                CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Width="40" MouseDown="Border_MouseDown"
-                                MouseUp="BorderStrokeSelectionCloneToNewBoard_MouseUp"
-                                Visibility="{Binding Visibility, ElementName=GridBackgroundCover}">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource StrokeSelectionCloneToNewBoardIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                <TextBlock Text="克隆至新页" FontSize="8" Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Height="40">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
-                                    <Image Source="{DynamicResource Rotate45DrawingImage}" Height="22"
-                                           MouseDown="Border_MouseDown" MouseUp="ImageRotate45_MouseUp" />
-                                    <Image Source="{DynamicResource Rotate90DrawingImage}" Height="22"
-                                           MouseDown="Border_MouseDown" MouseUp="ImageRotate90_MouseUp" />
-                                </ikw:SimpleStackPanel>
-                                <TextBlock Text="旋转" FontSize="10" HorizontalAlignment="Center"
-                                           Foreground="{DynamicResource FloatBarForeground}" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Height="40">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Margin="0,-10">
-                                <ikw:SimpleStackPanel Orientation="Horizontal">
-                                    <Image MouseDown="Border_MouseDown" MouseUp="ImageFlipHorizontal_MouseUp"
-                                           Source="{DynamicResource StrokeSelectionFlipHorizontalIcon}"
-                                           RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30" />
-                                    <Image MouseDown="Border_MouseDown" MouseUp="ImageFlipVertical_MouseUp"
-                                           Source="{DynamicResource StrokeSelectionFlipVerticalIcon}"
-                                           RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30" />
-                                </ikw:SimpleStackPanel>
-                                <TextBlock Text="翻转" FontSize="10" HorizontalAlignment="Center"
-                                           Foreground="{DynamicResource FloatBarForeground}" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Height="40">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="5">
-                                    <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthDecrease_MouseUp">
-                                        <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
-                                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                        <TextBlock Text="-" Foreground="{DynamicResource FloatBarForeground}"
-                                                   VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                                                   Margin="0,0,-2,-7" FontSize="15" />
-                                    </Grid>
-                                    <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthIncrease_MouseUp">
-                                        <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
-                                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                        <TextBlock Text="+" Foreground="{DynamicResource FloatBarForeground}"
-                                                   VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                                                   Margin="0,0,-3,-4" FontSize="11" />
-                                    </Grid>
-                                    <Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthRestore_MouseUp">
-                                        <Image Source="{DynamicResource StrokeSelectionPenWidthIcon}"
-                                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                        <Image Source="{DynamicResource AndroidRefreshDrawingImage}"
-                                               VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                                               Margin="0,0,-2,-2" Width="8" />
-                                    </Grid>
-                                </ikw:SimpleStackPanel>
-                                <TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center"
-                                           Foreground="{DynamicResource FloatBarForeground}" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border Margin="-8,0,0,0"
-                                CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
-                                Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionDelete_MouseUp">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource StrokeSelectionDeleteIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                <TextBlock Margin="0,5,0,0" Text="删除" FontSize="10"
-                                           Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                    </ikw:SimpleStackPanel>
-                </Viewbox>
-            </Border>
+                    Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}" />
 
             <!-- 图片选择工具栏 -->
-            <Border Name="BorderImageSelectionControl"
+            <mwcontrols:ImageSelectionToolbar x:Name="BorderImageSelectionControl"
                     HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,0"
-                    CornerRadius="5" Height="80"
-                    Background="{DynamicResource FloatBarBackground}"
-                    Visibility="Collapsed"
-                    BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
-                <Viewbox Margin="0,-2.5">
-                    <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
-                        <Border Name="BorderImageClone" Margin="0,2,-9,2" Background="Transparent"
-                                CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
-                                Width="40" MouseDown="Border_MouseDown" MouseUp="BorderImageClone_MouseUp">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource ImageSelectionCloneIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                <TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Name="BorderImageCloneToNewBoard"
-                                Margin="0,2,-9,2"
-                                Background="Transparent"
-                                CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
-                                Width="40"
-                                MouseDown="Border_MouseDown" 
-                                MouseUp="BorderImageCloneToNewBoard_MouseUp"
-                                Visibility="{Binding Visibility, ElementName=GridBackgroundCover}">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center"
-                                                 HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource ImageSelectionCloneToNewBoardIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality"
-                                       Height="25"
-                                       Width="25" />
-                                <TextBlock Text="克隆至新页"
-                                           FontSize="8"
-                                           Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" 
-                                Height="45" 
-                                BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
-                                Height="40">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" 
-                                                 Spacing="5" 
-                                                 Margin="0,-10">
-                                <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                     Spacing="10">
-                                    <Image Source="{DynamicResource Rotate45DrawingImage}"
-                                           Height="22"
-                                           MouseDown="Border_MouseDown"
-                                           MouseUp="BorderImageRotateLeft_MouseUp" />
-                                    <Image Source="{DynamicResource Rotate90DrawingImage}"
-                                           Height="22"
-                                           MouseDown="Border_MouseDown"
-                                           MouseUp="BorderImageRotateRight_MouseUp" />
-                                </ikw:SimpleStackPanel>
-                                <TextBlock Text="旋转"
-                                           FontSize="10"
-                                           HorizontalAlignment="Center"
-                                           Foreground="{DynamicResource FloatBarForeground}" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
-                                Height="40">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
-                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
-                                    <Grid MouseDown="Border_MouseDown" MouseUp="GridImageScaleDecrease_MouseUp">
-                                        <Image Source="{DynamicResource ImageSelectionScaleIcon1}"
-                                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                        <TextBlock Text="-" Foreground="{DynamicResource FloatBarForeground}"
-                                                   VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                                                   Margin="0,0,-2,-7" FontSize="15" />
-                                    </Grid>
-                                    <Grid MouseDown="Border_MouseDown" MouseUp="GridImageScaleIncrease_MouseUp">
-                                        <Image Source="{DynamicResource ImageSelectionScaleIcon2}"
-                                               RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                        <TextBlock Text="+" Foreground="{DynamicResource FloatBarForeground}"
-                                                   VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                                                   Margin="0,0,-3,-4" FontSize="11" />
-                                    </Grid>
-                                </ikw:SimpleStackPanel>
-                                <TextBlock Text="缩放" FontSize="10" HorizontalAlignment="Center"
-                                           Foreground="{DynamicResource FloatBarForeground}" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                        <Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}"
-                                Background="{DynamicResource FloatBarForeground}" />
-                        <Border Margin="-8,0,0,0"
-                                CornerRadius="{Binding ElementName=BorderImageSelectionControl, Path=CornerRadius}"
-                                Width="40" MouseDown="Border_MouseDown" MouseUp="BorderImageDelete_MouseUp">
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Image Source="{DynamicResource ImageSelectionDeleteIcon}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" />
-                                <TextBlock Margin="0,5,0,0" Text="删除" FontSize="10"
-                                           Foreground="{DynamicResource FloatBarForeground}"
-                                           HorizontalAlignment="Center" />
-                            </ikw:SimpleStackPanel>
-                        </Border>
-                    </ikw:SimpleStackPanel>
-                </Viewbox>
-            </Border>
+                    Visibility="Collapsed" />
 
             <Border Name="BorderPdfPageSidebar"
                     HorizontalAlignment="Left"
@@ -4988,45 +4779,12 @@
             </Border>
 
             <!-- 图片缩放选择点 -->
-            <Canvas Name="ImageResizeHandlesCanvas" 
-                    Visibility="Collapsed" 
-                    Panel.ZIndex="1000">
-                <!-- 四个角控制点 -->
-                <Ellipse Name="ImageTopLeftHandle" Style="{StaticResource ImageResizeHandleNWSE}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageTopRightHandle" Style="{StaticResource ImageResizeHandleNESW}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomLeftHandle" Style="{StaticResource ImageResizeHandleNESW}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomRightHandle" Style="{StaticResource ImageResizeHandleNWSE}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                
-                <!-- 四个边控制点 -->
-                <Ellipse Name="ImageTopHandle" Style="{StaticResource ImageResizeHandleNS}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageBottomHandle" Style="{StaticResource ImageResizeHandleNS}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageLeftHandle" Style="{StaticResource ImageResizeHandleWE}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-                <Ellipse Name="ImageRightHandle" Style="{StaticResource ImageResizeHandleWE}"
-                         MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                         MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                         MouseMove="ImageResizeHandle_MouseMove" />
-            </Canvas>
+            <mwcontrols:ImageResizeHandles x:Name="ImageResizeHandlesCanvas"
+                    Visibility="Collapsed"
+                    Panel.ZIndex="1000"
+                    MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
+                    MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
+                    MouseMove="ImageResizeHandle_MouseMove" />
 
         </Grid>
 
@@ -5517,869 +5275,26 @@
                                                         Opacity="1" BorderBrush="#2563eb"
                                                         BorderThickness="1" CornerRadius="8">
                                                     <ikw:SimpleStackPanel Margin="0,-20,0,0">
-                                                        <Border BorderBrush="#1e3a8a" Height="32"
-                                                                BorderThickness="0,0,0,1"
-                                                                CornerRadius="8,8,0,0" Background="#2563eb"
-                                                                Margin="-1,-1,-1,0"
-                                                                Padding="1,1,1,0">
-                                                            <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                VerticalAlignment="Center">
-                                                                <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                    HorizontalAlignment="Stretch"
-                                                                    Margin="8,0,0,0" Spacing="2">
-                                                                    <Border x:Name="BoardDefaultPenTabButton" Style="{StaticResource BoardDefaultPenTabButton}"
-                                                                            MouseDown="SwitchToDefaultPen"
-                                                                            Background="#48dbeafe" Height="20"
-                                                                            Width="36"
-                                                                            CornerRadius="3">
-                                                                        <Canvas>
-                                                                            <ikw:SimpleStackPanel
-                                                                                x:Name="BoardDefaultPenTabButtonIndicator"
-                                                                                Visibility="Visible"
-                                                                                Orientation="Horizontal"
-                                                                                Canvas.Left="9" Canvas.Right="9"
-                                                                                Canvas.Bottom="0">
-                                                                                <Border Width="18" Height="2"
-                                                                                    Background="{DynamicResource FloatBarBackground}"
-                                                                                    CornerRadius="1" />
-                                                                            </ikw:SimpleStackPanel>
-                                                                            <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                                Height="20" Width="36">
-                                                                                <ikw:SimpleStackPanel
-                                                                                    VerticalAlignment="Center"
-                                                                                    Orientation="Horizontal"
-                                                                                    HorizontalAlignment="Center"
-                                                                                    Margin="0,3">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/pen-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        Height="13" Width="13" />
-                                                                                    <TextBlock
-                                                                                        x:Name="BoardDefaultPenTabButtonText"
-                                                                                        Foreground="White"
-                                                                                        FontWeight="Medium"
-                                                                                        FontSize="9"
-                                                                                        TextAlignment="Center"
-                                                                                        Text="{i18n:I18n Key=Board_Pen}" Margin="2,1,0,0" />
-                                                                                </ikw:SimpleStackPanel>
-                                                                            </ikw:SimpleStackPanel>
-                                                                        </Canvas>
-                                                                    </Border>
-                                                                    <Border x:Name="BoardHighlightPenTabButton" Style="{StaticResource BoardHighlightPenTabButton}"
-                                                                            MouseDown="SwitchToHighlighterPen"
-                                                                            Background="Transparent" Height="20"
-                                                                            Width="52"
-                                                                            CornerRadius="3">
-                                                                        <Canvas>
-                                                                            <ikw:SimpleStackPanel Visibility="Collapsed"
-                                                                                x:Name="BoardHighlightPenTabButtonIndicator"
-                                                                                Orientation="Horizontal"
-                                                                                Canvas.Left="14"
-                                                                                Canvas.Right="14" Canvas.Bottom="0">
-                                                                                <Border Width="24" Height="2"
-                                                                                    Background="{DynamicResource FloatBarBackground}"
-                                                                                    CornerRadius="1" />
-                                                                            </ikw:SimpleStackPanel>
-                                                                            <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                                Height="20" Width="52">
-                                                                                <ikw:SimpleStackPanel
-                                                                                    VerticalAlignment="Center"
-                                                                                    Orientation="Horizontal"
-                                                                                    HorizontalAlignment="Center"
-                                                                                    Margin="0,3">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/highlighter-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        Height="13" Width="13" />
-                                                                                    <TextBlock
-                                                                                        x:Name="BoardHighlightPenTabButtonText"
-                                                                                        Foreground="White"
-                                                                                        FontWeight="Medium"
-                                                                                        FontSize="9"
-                                                                                        TextAlignment="Center"
-                                                                                        Text="{i18n:I18n Key=Board_Highlighter}" Margin="2,1,0,0"
-                                                                                        Width="35"
-                                                                                        Style="{StaticResource AutoFitPenTabLabel9}" />
-                                                                                </ikw:SimpleStackPanel>
-                                                                            </ikw:SimpleStackPanel>
-                                                                        </Canvas>
-                                                                    </Border>
-                                                                    <Image Margin="66,0,0,0"
-                                                                           Source="/Resources/new-icons/close-white.png"
-                                                                           RenderOptions.BitmapScalingMode="HighQuality"
-                                                                           Height="16" Width="16"
-                                                                           MouseDown="Border_MouseDown"
-                                                                           MouseUp="CloseBordertools_MouseUp" />
-                                                                </ikw:SimpleStackPanel>
-                                                            </ikw:SimpleStackPanel>
-
-                                                        </Border>
-                                                        <Viewbox Name="BoardDefaultPenPropsPanel"
-                                                                 Visibility="Collapsed"
-                                                                 Margin="12,8,12,0" HorizontalAlignment="Center"
-                                                                 VerticalAlignment="Center" Stretch="Fill">
-                                                            <ikw:SimpleStackPanel>
-                                                                <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                    Height="35" Margin="0,0,0,8">
-                                                                    <Label Content="笔锋" Margin="0,0,6,0"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="16" FontWeight="Bold"
-                                                                           VerticalAlignment="Center" />
-                                                                    <ComboBox Height="30"
-                                                                        VerticalAlignment="Center"
-                                                                        Name="BoardComboBoxPenStyle"
-                                                                        FontFamily="Microsoft YaHei UI"
-                                                                        SelectedIndex="1"
-                                                                        SelectionChanged="ComboBoxPenStyle_SelectionChanged">
-                                                                        <ComboBoxItem Content="实时笔锋"
-                                                                            FontFamily="Microsoft YaHei UI" />
-                                                                        <ComboBoxItem Content="基于点集"
-                                                                            FontFamily="Microsoft YaHei UI" />
-                                                                        <ComboBoxItem Content="基于速率"
-                                                                            FontFamily="Microsoft YaHei UI" />
-                                                                        <ComboBoxItem Content="关闭笔锋"
-                                                                            FontFamily="Microsoft YaHei UI" />
-                                                                    </ComboBox>
-                                                                </ikw:SimpleStackPanel>
-                                                                <Controls:UniformGrid Columns="3" Width="300"
-                                                                    Height="55">
-                                                                    <ikw:SimpleStackPanel
-                                                                        x:Name="BoardNibModeSimpleStackPanel"
-                                                                        Orientation="Horizontal" Width="100">
-                                                                        <Label Content="笔尖模式" FontSize="12"
-                                                                            VerticalAlignment="Center" />
-                                                                        <ui:ToggleSwitch
-                                                                            x:Name="BoardToggleSwitchEnableNibMode"
-                                                                            MinWidth="0"
-                                                                            FontFamily="Microsoft YaHei UI"
-                                                                            Width="80" Margin="10,0,0,0"
-                                                                            Toggled="ToggleSwitchEnableNibMode_Toggled"
-                                                                            IsOn="True" />
-                                                                    </ikw:SimpleStackPanel>
-                                                                    <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                        Width="100">
-                                                                        <Label Margin="0,0,10,0" Content="墨迹纠正"
-                                                                            Foreground="{DynamicResource FloatBarForeground}"
-                                                                            FontSize="12"
-                                                                            VerticalAlignment="Center" />
-                                                                        <ui:ToggleSwitch
-                                                                            Foreground="{DynamicResource FloatBarForeground}"
-                                                                            FontFamily="Microsoft YaHei UI"
-                                                                            Width="80"
-                                                                            Toggled="ToggleSwitchEnableInkToShape_Toggled"
-                                                                            MinWidth="0"
-                                                                            IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
-                                                                    </ikw:SimpleStackPanel>
-                                                                    <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                        Width="100" x:Name="InkFadeControlPanel1">
-                                                                        <Label Margin="0,0,10,0" Content="墨迹渐隐"
-                                                                            Foreground="{DynamicResource FloatBarForeground}"
-                                                                            FontSize="12"
-                                                                            VerticalAlignment="Center" />
-                                                                        <ui:ToggleSwitch
-                                                                            x:Name="ToggleSwitchInkFadeInPanel"
-                                                                            Foreground="{DynamicResource FloatBarForeground}"
-                                                                            FontFamily="Microsoft YaHei UI"
-                                                                            Width="90"
-                                                                            Toggled="ToggleSwitchInkFadeInPanel_Toggled"
-                                                                            MinWidth="0"
-                                                                            IsOn="False" />
-                                                                    </ikw:SimpleStackPanel>
-                                                                </Controls:UniformGrid>
-
-                                                                <StackPanel Orientation="Horizontal" Height="30">
-                                                                    <Label Margin="0,0,10,0" Content="粗细"
-                                                                           FontWeight="Bold"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="17" VerticalAlignment="Center" />
-                                                                    <Slider x:Name="BoardInkWidthSlider" Minimum="1"
-                                                                            Maximum="20"
-                                                                            Width="208" FontFamily="Microsoft YaHei UI"
-                                                                            FontSize="20" IsSnapToTickEnabled="True"
-                                                                            Value="5"
-                                                                            TickFrequency="0.1" TickPlacement="None"
-                                                                            ValueChanged="InkWidthSlider_ValueChanged" />
-                                                                    <TextBlock
-                                                                        Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
-                                                                        FontFamily="Consolas"
-                                                                        VerticalAlignment="Bottom"
-                                                                        Margin="10,0,0,4.5" FontSize="15" />
-                                                                </StackPanel>
-                                                                <StackPanel Orientation="Horizontal" Height="30">
-                                                                    <Label Margin="0,0,10,0" Content="透明"
-                                                                           FontWeight="Bold"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="17" VerticalAlignment="Center" />
-                                                                    <Slider x:Name="BoardInkAlphaSlider"
-                                                                            Margin="0,0,0,0"
-                                                                            Minimum="1" Maximum="255" Width="208"
-                                                                            FontFamily="Microsoft YaHei UI"
-                                                                            FontSize="20"
-                                                                            IsSnapToTickEnabled="True" Value="255"
-                                                                            TickFrequency="1"
-                                                                            TickPlacement="None"
-                                                                            ValueChanged="InkAlphaSlider_ValueChanged" />
-                                                                    <TextBlock
-                                                                        Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}"
-                                                                        FontFamily="Consolas"
-                                                                        VerticalAlignment="Bottom"
-                                                                        Margin="10,0,0,4.5" FontSize="15" />
-                                                                </StackPanel>
-                                                            </ikw:SimpleStackPanel>
-                                                        </Viewbox>
-                                                        <Viewbox Name="BoardHighlighterPenPropsPanel"
-                                                                 Margin="12,8,12,0"
-                                                                 HorizontalAlignment="Center"
-                                                                 VerticalAlignment="Center"
-                                                                 Stretch="Fill">
-                                                            <ikw:SimpleStackPanel>
-                                                                <StackPanel Orientation="Horizontal" Height="30">
-                                                                    <Label Margin="0,0,10,0" Content="粗细"
-                                                                           FontWeight="Bold"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="17" VerticalAlignment="Center" />
-                                                                    <Slider x:Name="BoardHighlighterWidthSlider"
-                                                                            Minimum="15"
-                                                                            Maximum="45" Width="208"
-                                                                            FontFamily="Microsoft YaHei UI"
-                                                                            FontSize="20"
-                                                                            IsSnapToTickEnabled="True" Value="20"
-                                                                            TickFrequency="1" TickPlacement="None"
-                                                                            ValueChanged="HighlighterWidthSlider_ValueChanged" />
-                                                                    <TextBlock
-                                                                        Text="{Binding Value, ElementName=BoardHighlighterWidthSlider, Mode=OneWay}"
-                                                                        FontFamily="Consolas"
-                                                                        VerticalAlignment="Bottom"
-                                                                        Margin="10,0,0,4.5" FontSize="15" />
-                                                                </StackPanel>
-                                                            </ikw:SimpleStackPanel>
-                                                        </Viewbox>
-                                                        <Viewbox x:Name="BoardDefaultPenColorsPanel"
-                                                                 Visibility="Collapsed"
-                                                                 Margin="0,8,0,0" Stretch="Fill">
-                                                            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
-                                                                <!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
-                                                                <Border Width="300" Height="100" BorderBrush="{DynamicResource IconForeground}"
-                                                                        BorderThickness="0" CornerRadius="5">
-                                                                    <Controls:UniformGrid Rows="2" Height="100">
-                                                                        <ikw:SimpleStackPanel Height="45"
-                                                                            Orientation="Horizontal" Width="270">
-                                                                            <Controls:UniformGrid Columns="5"
-                                                                                Width="270"
-                                                                                Margin="0">
-                                                                                <Border BorderBrush="{DynamicResource FloatBarBorderBrush}"
-                                                                                    BorderThickness="1"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseDown="Border_MouseDown"
-                                                                                    MouseUp="ColorThemeSwitch_MouseUp">
-                                                                                    <Grid Margin="3">
-                                                                                        <Image
-                                                                                            x:Name="BoardColorThemeSwitchIcon"
-                                                                                            Source="{StaticResource BoardColorThemeSwitchIcon}"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="23"
-                                                                                            Height="23"
-                                                                                            Margin="0,0,0,0" />
-                                                                                        <TextBlock Margin="0,0,0,2"
-                                                                                            x:Name="BoardColorThemeSwitchTextBlock"
-                                                                                            Text="亮系"
-                                                                                            Foreground="{DynamicResource FloatBarForeground}"
-                                                                                            VerticalAlignment="Bottom"
-                                                                                            HorizontalAlignment="Center"
-                                                                                            FontSize="11" />
-                                                                                    </Grid>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorBlack" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="Black"
-                                                                                    BorderBrush="#D3D3D3"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorBlack_Click">
-                                                                                    <Viewbox
-                                                                                        Name="BoardViewboxBtnColorBlackContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorWhite" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="White"
-                                                                                    BorderBrush="#71717a"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorWhite_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorWhiteContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-black.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border x:Name="BoardBorderPenColorRed" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#dc2626"
-                                                                                    BorderBrush="#7f1d1d"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorRed_Click">
-                                                                                    <Viewbox
-                                                                                        Name="BoardViewboxBtnColorRedContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorYellow" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#eab308"
-                                                                                    BorderBrush="#713f12"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorYellow_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorYellowContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                            </Controls:UniformGrid>
-                                                                        </ikw:SimpleStackPanel>
-                                                                        <ikw:SimpleStackPanel Height="45"
-                                                                            Orientation="Horizontal" Width="270">
-                                                                            <Controls:UniformGrid Columns="5"
-                                                                                Width="270"
-                                                                                Margin="0">
-
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorGreen" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#16a34a"
-                                                                                    BorderBrush="#14532d"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorGreen_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorGreenContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorBlue" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#2563eb"
-                                                                                    BorderBrush="#1e3a8a"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorBlue_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorBlueContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorPink" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#db2777"
-                                                                                    BorderBrush="#831843"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorPink_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorPinkContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorTeal" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#0d9488"
-                                                                                    BorderBrush="#134e4a"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorTeal_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorTealContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardBorderPenColorOrange" Style="{StaticResource BoardBorderPenColor}"
-                                                                                    Background="#ea580c"
-                                                                                    BorderBrush="#7c2d12"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnColorOrange_Click">
-                                                                                    <Viewbox
-                                                                                        x:Name="BoardViewboxBtnColorOrangeContent"
-                                                                                        Visibility="Collapsed"
-                                                                                        Margin="8">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24"
-                                                                                            Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Border>
-                                                                            </Controls:UniformGrid>
-                                                                        </ikw:SimpleStackPanel>
-                                                                    </Controls:UniformGrid>
-                                                                </Border>
-                                                            </ikw:SimpleStackPanel>
-                                                        </Viewbox>
-                                                        <Viewbox x:Name="BoardHighlighterPenColorsPanel"
-                                                                 Visibility="Visible"
-                                                                 Margin="0,8,0,0" Stretch="Fill">
-                                                            <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
-                                                                <!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
-                                                                <Border Width="300" Height="110" BorderBrush="Black"
-                                                                        BorderThickness="0" CornerRadius="5">
-                                                                    <Controls:UniformGrid Rows="2" Height="110">
-                                                                        <ikw:SimpleStackPanel Height="45"
-                                                                            Orientation="Horizontal" Width="270">
-                                                                            <Controls:UniformGrid Columns="5"
-                                                                                Width="270"
-                                                                                Margin="0">
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorBlack"
-                                                                                    BorderBrush="#e4e4e7"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorBlack_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="Black"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorBlackContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorWhite"
-                                                                                    Background="White"
-                                                                                    BorderBrush="#dddddd"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100"
-                                                                                    Width="45"
-                                                                                    MouseUp="BtnHighlighterColorWhite_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="White"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorWhiteContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-black.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorRed"
-                                                                                    BorderBrush="#fecaca"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorRed_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#ef4444"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorRedContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorYellow"
-                                                                                    BorderBrush="#fef08a"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorYellow_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#eab308"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorYellowContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-black.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorGreen"
-                                                                                    BorderBrush="#bbf7d0"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorGreen_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#22c55e"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorGreenContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-black.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                            </Controls:UniformGrid>
-                                                                        </ikw:SimpleStackPanel>
-                                                                        <ikw:SimpleStackPanel Height="45"
-                                                                            Orientation="Horizontal" Width="270">
-                                                                            <Controls:UniformGrid Columns="5"
-                                                                                Width="270"
-                                                                                Margin="0">
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorZinc"
-                                                                                    BorderBrush="#e4e4e7"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorZinc_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#71717a"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorZincContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorBlue"
-                                                                                    BorderBrush="#bfdbfe"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorBlue_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#3b82f6"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorBlueContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenPenColorPurple"
-                                                                                    BorderBrush="#e9d5ff"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorPurple_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#a855f7"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorPurpleContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorTeal"
-                                                                                    BorderBrush="#99f6e4"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorTeal_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#14b8a6"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorTealContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-black.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                                <Border
-                                                                                    x:Name="BoardHighlighterPenColorOrange"
-                                                                                    BorderBrush="#fed7aa"
-                                                                                    BorderThickness="1.5"
-                                                                                    CornerRadius="100" Width="45"
-                                                                                    MouseUp="BtnHighlighterColorOrange_Click">
-                                                                                    <Canvas>
-                                                                                        <Image
-                                                                                            Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                            Width="42" Height="42">
-                                                                                            <Image.Clip>
-                                                                                                <EllipseGeometry
-                                                                                                    Center="21,21"
-                                                                                                    RadiusX="21"
-                                                                                                    RadiusY="21" />
-                                                                                            </Image.Clip>
-                                                                                        </Image>
-                                                                                        <Border Background="#f97316"
-                                                                                            Width="42"
-                                                                                            Height="42"
-                                                                                            CornerRadius="21"
-                                                                                            Opacity="0.75" />
-                                                                                        <Viewbox
-                                                                                            Name="BoardHighlighterPenViewboxBtnColorOrangeContent"
-                                                                                            Visibility="Visible"
-                                                                                            Canvas.Top="9"
-                                                                                            Canvas.Left="9">
-                                                                                            <Image
-                                                                                                Source="/Resources/new-icons/checked-white.png"
-                                                                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                                VerticalAlignment="Top"
-                                                                                                Width="24" Height="24"
-                                                                                                Margin="0,0,0,0" />
-                                                                                        </Viewbox>
-                                                                                    </Canvas>
-                                                                                </Border>
-                                                                            </Controls:UniformGrid>
-                                                                        </ikw:SimpleStackPanel>
-                                                                    </Controls:UniformGrid>
-                                                                </Border>
-                                                            </ikw:SimpleStackPanel>
-                                                        </Viewbox>
+                                                        <mwcontrols:PenSettingsPanel x:Name="BoardPenSettingsControl"
+                                                                                    IsBoardMode="True"
+                                                                                    PenTypeChanged="BoardPenSettingsControl_PenTypeChanged"
+                                                                                    PenStyleChanged="BoardPenSettingsControl_PenStyleChanged"
+                                                                                    WidthChanged="BoardPenSettingsControl_WidthChanged"
+                                                                                    AlphaChanged="BoardPenSettingsControl_AlphaChanged"
+                                                                                    NibModeChanged="BoardPenSettingsControl_NibModeChanged"
+                                                                                    InkFadeChanged="BoardPenSettingsControl_InkFadeChanged"
+                                                                                    InkToShapeChanged="BoardPenSettingsControl_InkToShapeChanged"
+                                                                                    BrushModeClicked="BoardPenSettingsControl_BrushModeClicked"
+                                                                                    CloseRequested="BoardPenSettingsControl_CloseRequested" />
+                                                        <mwcontrols:PenColorPalette x:Name="BoardBorderPenColorPaletteControl"
+                                                                                    IsBoardMode="True"
+                                                                                    Visibility="Collapsed"
+                                                                                    ColorSelected="PenColorPalette_ColorSelected"
+                                                                                    ThemeSwitchClicked="ColorThemeSwitch_MouseUp" />
+                                                        <mwcontrols:HighlighterColorPalette x:Name="BoardHighlighterPenColorsPanel"
+                                                                                           IsBoardMode="True"
+                                                                                           Visibility="Visible"
+                                                                                           ColorSelected="HighlighterColorPalette_ColorSelected" />
                                                     </ikw:SimpleStackPanel>
                                                 </Border>
                                             </Grid>
@@ -7607,285 +6522,51 @@
         <!--// PPT 工具栏 //-->
         <Grid>
             <Grid Visibility="Visible">
-                <Viewbox x:Name="LeftBottomPanelForPPTNavigation" Visibility="Collapsed" Margin="6,0,0,6" Height="50"
-                         HorizontalAlignment="Left" VerticalAlignment="Bottom">
-                    <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLBBorder"
-                            Background="#f4f4f5" Opacity="1" CornerRadius="6">
-                        <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                                    Name="PPTLBPreviousButtonBorder"
-                                    MouseDown="GridPPTControlPrevious_MouseDown"
-                                    MouseLeave="GridPPTControlPrevious_MouseLeave"
-                                    CornerRadius="5 5 0 0" Background="Transparent">
-                                <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <Image Height="28" Width="28">
-                                        <Image.Source>
-                                            <DrawingImage>
-                                                <DrawingImage.Drawing>
-                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                        <GeometryDrawing Brush="#27272a"
-                                                                         x:Name="PPTLBPreviousButtonGeometry"
-                                                                         Geometry="{StaticResource PPTLBPreviousButtonGeometry}" />
-                                                    </DrawingGroup>
-                                                </DrawingImage.Drawing>
-                                            </DrawingImage>
-                                        </Image.Source>
-                                    </Image>
-                                </Grid>
-                            </Border>
-                            <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
-                                    MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
-                                    MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
-                                    Background="Transparent">
-                                <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
-                                                         Spacing="0.5" Margin="12,0">
-                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                   FontSize="17" FontWeight="Bold"
-                                                   Text="{Binding ElementName=PPTBtnPageNow, Path=Text}" />
-                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                   FontSize="10"
-                                                   Text="{Binding ElementName=PPTBtnPageTotal, Path=Text}" />
-                                    </ikw:SimpleStackPanel>
-
-                                </Grid>
-                            </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
-                                    MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                                    CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLBNextButtonBorder">
-                                <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
-                                           Width="28">
-                                        <Image.Source>
-                                            <DrawingImage>
-                                                <DrawingImage.Drawing>
-                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                        <GeometryDrawing Brush="#27272a"
-                                                                         x:Name="PPTLBNextButtonGeometry"
-                                                                         Geometry="{StaticResource PPTLBNextButtonGeometry}" />
-                                                    </DrawingGroup>
-                                                </DrawingImage.Drawing>
-                                            </DrawingImage>
-                                        </Image.Source>
-                                    </Image>
-                                </Grid>
-                            </Border>
-                        </ikw:SimpleStackPanel>
-                    </Border>
-                </Viewbox>
-                <Viewbox x:Name="RightBottomPanelForPPTNavigation" Visibility="Collapsed" Margin="0,0,6,6" Height="50"
-                         HorizontalAlignment="Right" VerticalAlignment="Bottom">
-                    <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRBBorder"
-                            Background="#f4f4f5" Opacity="1" CornerRadius="6">
-                        <ikw:SimpleStackPanel Orientation="Horizontal">
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                                    Name="PPTRBPreviousButtonBorder"
-                                    MouseDown="GridPPTControlPrevious_MouseDown"
-                                    MouseLeave="GridPPTControlPrevious_MouseLeave"
-                                    CornerRadius="5 5 0 0" Background="Transparent">
-                                <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <Image Height="28" Width="28">
-                                        <Image.Source>
-                                            <DrawingImage>
-                                                <DrawingImage.Drawing>
-                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                        <GeometryDrawing Brush="#27272a"
-                                                                         x:Name="PPTRBPreviousButtonGeometry"
-                                                                         Geometry="{StaticResource PPTRBPreviousButtonGeometry}" />
-                                                    </DrawingGroup>
-                                                </DrawingImage.Drawing>
-                                            </DrawingImage>
-                                        </Image.Source>
-                                    </Image>
-                                </Grid>
-                            </Border>
-                            <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
-                                    MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
-                                    MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
-                                    Background="Transparent">
-                                <Grid>
-                                    <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
-                                                         Spacing="0.5" Margin="12,0">
-                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                   FontSize="17" FontWeight="Bold"
-                                                   Text="{Binding ElementName=PPTBtnPageNow, Path=Text}" />
-                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                   FontSize="10"
-                                                   Text="{Binding ElementName=PPTBtnPageTotal, Path=Text}" />
-                                    </ikw:SimpleStackPanel>
-
-                                </Grid>
-                            </Border>
-                            <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
-                                    MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                                    CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRBNextButtonBorder">
-                                <Grid>
-                                    <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                            Background="#18181b" Opacity="0" />
-                                    <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
-                                           Width="28">
-                                        <Image.Source>
-                                            <DrawingImage>
-                                                <DrawingImage.Drawing>
-                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                        <GeometryDrawing Brush="#27272a"
-                                                                         x:Name="PPTRBNextButtonGeometry"
-                                                                         Geometry="{StaticResource PPTRBNextButtonGeometry}" />
-                                                    </DrawingGroup>
-                                                </DrawingImage.Drawing>
-                                            </DrawingImage>
-                                        </Image.Source>
-                                    </Image>
-                                </Grid>
-                            </Border>
-                        </ikw:SimpleStackPanel>
-                    </Border>
-                </Viewbox>
+                <mwcontrols:PPTNavigationBottomLeft x:Name="BorderPPTNavBottomLeft"
+                                                     Visibility="Collapsed"
+                                                     Margin="6,0,0,6"
+                                                     Height="50"
+                                                     HorizontalAlignment="Left"
+                                                     VerticalAlignment="Bottom"
+                                                     CurrentPage="999"
+                                                     TotalPages="999"
+                                                     PreviousClicked="PPTNavigationBottomLeft_PreviousClicked"
+                                                     NextClicked="PPTNavigationBottomLeft_NextClicked"
+                                                     PageClicked="PPTNavigationBottomLeft_PageClicked" />
+                <mwcontrols:PPTNavigationBottomRight x:Name="BorderPPTNavBottomRight"
+                                                     Visibility="Collapsed"
+                                                     Margin="0,0,6,6"
+                                                     Height="50"
+                                                     HorizontalAlignment="Right"
+                                                     VerticalAlignment="Bottom"
+                                                     CurrentPage="999"
+                                                     TotalPages="999"
+                                                     PreviousClicked="PPTNavigationBottomRight_PreviousClicked"
+                                                     NextClicked="PPTNavigationBottomRight_NextClicked"
+                                                     PageClicked="PPTNavigationBottomRight_PageClicked" />
             </Grid>
         </Grid>
 
         <!--// PPT 侧边翻页按钮 //-->
-        <Viewbox x:Name="LeftSidePanelForPPTNavigation" Visibility="Visible"  Width="56"
-                 HorizontalAlignment="Left" VerticalAlignment="Center">
-            <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLSBorder"
-                    Background="#f4f4f5" Opacity="1" CornerRadius="6" Margin="6,0,0,0">
-                <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                            Name="PPTLSPreviousButtonBorder"
-                            MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
-                            CornerRadius="5 5 0 0" Background="Transparent">
-                        <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <Image Height="28" Width="28">
-                                <Image.Source>
-                                    <DrawingImage>
-                                        <DrawingImage.Drawing>
-                                            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                <GeometryDrawing Brush="#27272a" x:Name="PPTLSPreviousButtonGeometry"
-                                                                 Geometry="{StaticResource PPTLSPreviousButtonGeometry}" />
-                                            </DrawingGroup>
-                                        </DrawingImage.Drawing>
-                                    </DrawingImage>
-                                </Image.Source>
-                            </Image>
-                        </Grid>
-                    </Border>
-                    <Border Visibility="Visible" Name="PPTLSPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
-                            MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
-                            MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
-                            Background="Transparent">
-                        <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTLSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                           FontSize="17" FontWeight="Bold"
-                                           Text="999" Name="PPTBtnPageNow" />
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                           FontSize="10" Text="/ 999" Name="PPTBtnPageTotal" />
-                            </ikw:SimpleStackPanel>
-                        </Grid>
-                    </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
-                            MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                            CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLSNextButtonBorder">
-                        <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTLSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
-                                <Image.Source>
-                                    <DrawingImage>
-                                        <DrawingImage.Drawing>
-                                            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                <GeometryDrawing Brush="#27272a" x:Name="PPTLSNextButtonGeometry"
-                                                                 Geometry="{StaticResource PPTLSNextButtonGeometry}" />
-                                            </DrawingGroup>
-                                        </DrawingImage.Drawing>
-                                    </DrawingImage>
-                                </Image.Source>
-                            </Image>
-                        </Grid>
-                    </Border>
-                </ikw:SimpleStackPanel>
-            </Border>
-        </Viewbox>
-        <Viewbox x:Name="RightSidePanelForPPTNavigation" Visibility="Visible" Width="56"
-                 HorizontalAlignment="Right" VerticalAlignment="Center">
-            <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRSBorder"
-                    Background="#f4f4f5" Opacity="1" CornerRadius="6"  Margin="0,0,6,0">
-                <ikw:SimpleStackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                            Name="PPTRSPreviousButtonBorder"
-                            MouseDown="GridPPTControlPrevious_MouseDown" MouseLeave="GridPPTControlPrevious_MouseLeave"
-                            CornerRadius="5 5 0 0" Background="Transparent">
-                        <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <Image Height="28" Width="28">
-                                <Image.Source>
-                                    <DrawingImage>
-                                        <DrawingImage.Drawing>
-                                            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                <GeometryDrawing Brush="#27272a" x:Name="PPTRSPreviousButtonGeometry"
-                                                                 Geometry="{StaticResource PPTRSPreviousButtonGeometry}" />
-                                            </DrawingGroup>
-                                        </DrawingImage.Drawing>
-                                    </DrawingImage>
-                                </Image.Source>
-                            </Image>
-                        </Grid>
-                    </Border>
-                    <Border Visibility="Visible" Name="PPTRSPageButton" Style="{StaticResource PPTPageButtonBase}"
-                            MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
-                            MouseLeave="PPTNavigationBtn_MouseLeave" Width="50" Height="50"
-                            Background="Transparent" TextBlock.Foreground="#171717">
-                        <Grid>
-                            <Border Margin="3,0" CornerRadius="5" Name="PPTRSPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical" Spacing="0.5">
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                           FontSize="17" FontWeight="Bold"
-                                           Text="{Binding ElementName=PPTBtnPageNow, Path=Text}" />
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                                           FontSize="10"
-                                           Text="{Binding ElementName=PPTBtnPageTotal, Path=Text}" />
-                            </ikw:SimpleStackPanel>
-                        </Grid>
-                    </Border>
-                    <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
-                            MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                            CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRSNextButtonBorder">
-                        <Grid>
-                            <Border Margin="3" CornerRadius="5" Name="PPTRSNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
-                                    Background="#18181b" Opacity="0" />
-                            <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
-                                <Image.Source>
-                                    <DrawingImage>
-                                        <DrawingImage.Drawing>
-                                            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                <GeometryDrawing Brush="#27272a" x:Name="PPTRSNextButtonGeometry"
-                                                                 Geometry="{StaticResource PPTRSNextButtonGeometry}" />
-                                            </DrawingGroup>
-                                        </DrawingImage.Drawing>
-                                    </DrawingImage>
-                                </Image.Source>
-                            </Image>
-                        </Grid>
-                    </Border>
-                </ikw:SimpleStackPanel>
-            </Border>
-        </Viewbox>
+        <mwcontrols:PPTNavigationSideLeft x:Name="LeftSidePanelForPPTNavigation"
+                                          Visibility="Visible"
+                                          Width="56"
+                                          HorizontalAlignment="Left"
+                                          VerticalAlignment="Center"
+                                          CurrentPage="999"
+                                          TotalPages="999"
+                                          PreviousClicked="PPTNavigationSideLeft_PreviousClicked"
+                                          NextClicked="PPTNavigationSideLeft_NextClicked"
+                                          PageClicked="PPTNavigationSideLeft_PageClicked" />
+        <mwcontrols:PPTNavigationSideRight x:Name="RightSidePanelForPPTNavigation"
+                                           Visibility="Visible"
+                                           HorizontalAlignment="Right"
+                                           VerticalAlignment="Center"
+                                           CurrentPage="999"
+                                           TotalPages="999"
+                                           PreviousClicked="PPTNavigationSideRight_PreviousClicked"
+                                           NextClicked="PPTNavigationSideRight_NextClicked"
+                                           PageClicked="PPTNavigationSideRight_PageClicked" />
 
         <Grid Name="FloatingbarUIForInkReplay">
             <Viewbox Name="ViewboxFloatingBar" Margin="100,5,0,0" Cursor="Arrow"
@@ -8576,797 +7257,23 @@
                                                     Opacity="1" BorderBrush="#2563eb"
                                                     BorderThickness="1" CornerRadius="8" Margin="-160,-200,-33,32">
                                                 <ikw:SimpleStackPanel Margin="0,-20,0,0">
-                                                    <Border BorderBrush="#1e3a8a" Height="32" BorderThickness="0,0,0,1"
-                                                            CornerRadius="8,8,0,0" Background="#2563eb"
-                                                            Margin="-1,-1,-1,0"
-                                                            Padding="1,1,1,0">
-                                                        <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                             VerticalAlignment="Center">
-                                                            <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                HorizontalAlignment="Stretch"
-                                                                Margin="8,0,0,0" Spacing="2">
-                                                                <Border x:Name="DefaultPenTabButton"
-                                                                        MouseDown="SwitchToDefaultPen"
-                                                                        Background="#48dbeafe" Height="20" Width="36"
-                                                                        CornerRadius="3">
-                                                                    <Canvas>
-                                                                        <ikw:SimpleStackPanel
-                                                                            x:Name="DefaultPenTabButtonIndicator"
-                                                                            Visibility="Visible"
-                                                                            Orientation="Horizontal"
-                                                                            Canvas.Left="9" Canvas.Right="9"
-                                                                            Canvas.Bottom="0">
-                                                                            <Border Width="18" Height="2"
-                                                                                Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
-                                                                        </ikw:SimpleStackPanel>
-                                                                        <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                            Height="20" Width="36">
-                                                                            <ikw:SimpleStackPanel
-                                                                                VerticalAlignment="Center"
-                                                                                Orientation="Horizontal"
-                                                                                HorizontalAlignment="Center"
-                                                                                Margin="0,3">
-                                                                                <Image
-                                                                                    Source="/Resources/new-icons/pen-white.png"
-                                                                                    RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                    Height="13" Width="13" />
-                                                                                <TextBlock
-                                                                                    x:Name="DefaultPenTabButtonText"
-                                                                                    Foreground="White"
-                                                                                    FontWeight="Medium"
-                                                                                    FontSize="9" TextAlignment="Center"
-                                                                                    Text="{i18n:I18n Key=Board_Pen}" Margin="2,1,0,0" />
-                                                                            </ikw:SimpleStackPanel>
-                                                                        </ikw:SimpleStackPanel>
-                                                                    </Canvas>
-                                                                </Border>
-                                                                <Border x:Name="HighlightPenTabButton"
-                                                                        MouseDown="SwitchToHighlighterPen"
-                                                                        Background="Transparent" Height="20" Width="52"
-                                                                        CornerRadius="3">
-                                                                    <Canvas>
-                                                                        <ikw:SimpleStackPanel Visibility="Collapsed"
-                                                                            x:Name="HighlightPenTabButtonIndicator"
-                                                                            Orientation="Horizontal" Canvas.Left="14"
-                                                                            Canvas.Right="14" Canvas.Bottom="0">
-                                                                            <Border Width="24" Height="2"
-                                                                                Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
-                                                                        </ikw:SimpleStackPanel>
-                                                                        <ikw:SimpleStackPanel Orientation="Vertical"
-                                                                            Height="20" Width="52">
-                                                                            <ikw:SimpleStackPanel
-                                                                                VerticalAlignment="Center"
-                                                                                Orientation="Horizontal"
-                                                                                HorizontalAlignment="Center"
-                                                                                Margin="0,3">
-                                                                                <Image
-                                                                                    Source="/Resources/new-icons/highlighter-white.png"
-                                                                                    RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                    Height="13" Width="13" />
-                                                                                <TextBlock
-                                                                                    x:Name="HighlightPenTabButtonText"
-                                                                                    Foreground="White"
-                                                                                    FontWeight="Medium"
-                                                                                    FontSize="9" TextAlignment="Center"
-                                                                                    Text="{i18n:I18n Key=Board_Highlighter}" Margin="2,1,0,0"
-                                                                                    Width="35"
-                                                                                    Style="{StaticResource AutoFitPenTabLabel9}" />
-                                                                            </ikw:SimpleStackPanel>
-                                                                        </ikw:SimpleStackPanel>
-                                                                    </Canvas>
-                                                                </Border>
-                                                                <Image Margin="66,0,0,0"
-                                                                       Source="/Resources/new-icons/close-white.png"
-                                                                       RenderOptions.BitmapScalingMode="HighQuality"
-                                                                       Height="16" Width="16"
-                                                                       MouseDown="Border_MouseDown"
-                                                                       MouseUp="CloseBordertools_MouseUp" />
-                                                            </ikw:SimpleStackPanel>
-                                                        </ikw:SimpleStackPanel>
-
-                                                    </Border>
-                                                    <Viewbox Name="DefaultPenPropsPanel" Visibility="Collapsed"
-                                                             Margin="12,8,12,0" HorizontalAlignment="Center"
-                                                             VerticalAlignment="Center" Stretch="Fill">
-                                                        <ikw:SimpleStackPanel>
-                                                            <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                Height="35" Margin="0,0,0,8">
-                                                                <Label Content="笔锋" Margin="0,0,6,0"
-                                                                       Foreground="{DynamicResource FloatBarForeground}"
-                                                                       FontSize="16" FontWeight="Bold"
-                                                                       VerticalAlignment="Center" />
-                                                                <ComboBox Height="30" VerticalAlignment="Center"
-                                                                          Name="ComboBoxPenStyle"
-                                                                          FontFamily="Microsoft YaHei UI"
-                                                                          SelectedIndex="1"
-                                                                          SelectionChanged="ComboBoxPenStyle_SelectionChanged">
-                                                                    <ComboBoxItem Content="实时笔锋"
-                                                                        FontFamily="Microsoft YaHei UI" />
-                                                                    <ComboBoxItem Content="基于点集"
-                                                                        FontFamily="Microsoft YaHei UI" />
-                                                                    <ComboBoxItem Content="基于速率"
-                                                                        FontFamily="Microsoft YaHei UI" />
-                                                                    <ComboBoxItem Content="关闭笔锋"
-                                                                        FontFamily="Microsoft YaHei UI" />
-                                                                </ComboBox>
-                                                            </ikw:SimpleStackPanel>
-                                                            <Controls:UniformGrid Columns="3" Width="300" Height="55">
-                                                                <ikw:SimpleStackPanel
-                                                                    x:Name="NibModeSimpleStackPanel"
-                                                                    Orientation="Horizontal" Width="100">
-                                                                    <Label Content="笔尖模式" FontSize="12"
-                                                                           VerticalAlignment="Center" />
-                                                                    <ui:ToggleSwitch
-                                                                        x:Name="ToggleSwitchEnableNibMode"
-                                                                        MinWidth="0"
-                                                                        FontFamily="Microsoft YaHei UI"
-                                                                        Width="80" Margin="10,0,0,0"
-                                                                        Toggled="ToggleSwitchEnableNibMode_Toggled"
-                                                                        IsOn="True" />
-                                                                </ikw:SimpleStackPanel>
-                                                                <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                    Width="100">
-                                                                    <Label Margin="0,0,10,0" Content="墨迹纠正"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="12" VerticalAlignment="Center" />
-                                                                    <ui:ToggleSwitch
-                                                                        Foreground="{DynamicResource FloatBarForeground}"
-                                                                        FontFamily="Microsoft YaHei UI" Width="80"
-                                                                        Toggled="ToggleSwitchEnableInkToShape_Toggled"
-                                                                        MinWidth="0"
-                                                                        IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
-                                                                </ikw:SimpleStackPanel>
-                                                                <ikw:SimpleStackPanel Orientation="Horizontal"
-                                                                    Width="100" x:Name="InkFadeControlPanel2">
-                                                                    <Label Margin="0,0,10,0" Content="墨迹渐隐"
-                                                                           Foreground="{DynamicResource FloatBarForeground}"
-                                                                           FontSize="12" VerticalAlignment="Center" />
-                                                                    <ui:ToggleSwitch
-                                                                        x:Name="ToggleSwitchInkFadeInPanel2"
-                                                                        Foreground="{DynamicResource FloatBarForeground}"
-                                                                        FontFamily="Microsoft YaHei UI" Width="90"
-                                                                        Toggled="ToggleSwitchInkFadeInPanel_Toggled"
-                                                                        MinWidth="0"
-                                                                        IsOn="{Binding ElementName=ToggleSwitchInkFadeInPanel, Path=IsOn}" />
-                                                                </ikw:SimpleStackPanel>
-                                                            </Controls:UniformGrid>
-
-                                                            <StackPanel Orientation="Horizontal" Height="30">
-                                                                <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
-                                                                       Foreground="{DynamicResource FloatBarForeground}"
-                                                                       FontSize="17" VerticalAlignment="Center" />
-                                                                <Slider x:Name="InkWidthSlider" Minimum="1"
-                                                                        Maximum="20"
-                                                                        Width="200" FontFamily="Microsoft YaHei UI"
-                                                                        FontSize="20" IsSnapToTickEnabled="True"
-                                                                        Value="5"
-                                                                        TickFrequency="0.1" TickPlacement="None"
-                                                                        ValueChanged="InkWidthSlider_ValueChanged" />
-                                                                <TextBlock Width="36" TextAlignment="Right"
-                                                                    Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
-                                                                    FontFamily="Consolas" VerticalAlignment="Center"
-                                                                    Margin="10,0,0,0" FontSize="15" />
-                                                                <Button x:Name="BoardBrushModeButton" Width="24" Height="24" Margin="8,0,0,0"
-                                                                        Style="{StaticResource NavButton}"
-                                                                        VerticalAlignment="Center"
-                                                                        Click="BoardBrushModeButton_Click"
-                                                                        ToolTip="板刷模式">
-                                                                    <Viewbox Margin="4" Stretch="Uniform">
-                                                                        <Path x:Name="BoardBrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill">
-                                                                            <Path.Data>
-                                                                                <PathGeometry Figures="M6.7812 6.9375C6.81411 7.06468 6.87172 7.18413 6.95081 7.28903C7.0299 7.39392 7.12891 7.4822 7.24213 7.54882C7.47058 7.68347 7.74313 7.72187 7.99989 7.65557C8.25664 7.58928 8.47657 7.42372 8.61128 7.19531L11.9238 1.57031C12.0584 1.34186 12.0968 1.06928 12.0305 0.812526C11.9642 0.555772 11.7987 0.335869 11.5703 0.201167C11.3418 0.0665197 11.0693 0.028121 10.8125 0.0944166C10.5558 0.160712 10.3358 0.326268 10.2011 0.554683L6.88862 6.17968C6.82183 6.29276 6.77796 6.41788 6.75953 6.54791C6.7411 6.67793 6.74847 6.81031 6.7812 6.9375Z M5.21875 5.09375L10.1662 8.14759C10.7697 8.46231 10.9861 9.26072 10.3308 9.74464L9.70892 9.96117L3.6897 6.43971L3.7074 5.53239C3.99623 4.94715 4.46209 4.71653 5.21875 5.09375Z M3.05377 7.48846L9.04364 10.9631L7.99908 12.5052C7.77811 12.7482 7.86648 13.0797 8.08746 13.2123L9.03766 14.0298H3.66809C1.47755 14.0298 0.471255 11.9653 1.52466 10.1408L3.05377 7.48846Z" />
-                                                                            </Path.Data>
-                                                                        </Path>
-                                                                    </Viewbox>
-                                                                </Button>
-                                                            </StackPanel>
-                                                            <StackPanel Orientation="Horizontal" Height="30">
-                                                                <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold"
-                                                                       Foreground="{DynamicResource FloatBarForeground}"
-                                                                       FontSize="17" VerticalAlignment="Center" />
-                                                                <Slider x:Name="InkAlphaSlider" Margin="0,0,0,0"
-                                                                        Minimum="1" Maximum="255" Width="200"
-                                                                        FontFamily="Microsoft YaHei UI" FontSize="20"
-                                                                        IsSnapToTickEnabled="True" Value="255"
-                                                                        TickFrequency="1"
-                                                                        TickPlacement="None"
-                                                                        ValueChanged="InkAlphaSlider_ValueChanged" />
-                                                                <TextBlock Width="36" TextAlignment="Right"
-                                                                    Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}"
-                                                                    FontFamily="Consolas" VerticalAlignment="Center"
-                                                                    Margin="10,0,0,0" FontSize="15" />
-                                                            </StackPanel>
-                                                        </ikw:SimpleStackPanel>
-                                                    </Viewbox>
-                                                    <Viewbox Name="HighlighterPenPropsPanel" Margin="12,8,12,0"
-                                                             HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                             Stretch="Fill">
-                                                        <ikw:SimpleStackPanel>
-                                                            <StackPanel Orientation="Horizontal" Height="30">
-                                                                <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
-                                                                       Foreground="{DynamicResource FloatBarForeground}"
-                                                                       FontSize="17" VerticalAlignment="Center" />
-                                                                <Slider x:Name="HighlighterWidthSlider" Minimum="15"
-                                                                        Maximum="45" Width="208"
-                                                                        FontFamily="Microsoft YaHei UI" FontSize="20"
-                                                                        IsSnapToTickEnabled="True" Value="20"
-                                                                        TickFrequency="1" TickPlacement="None"
-                                                                        ValueChanged="HighlighterWidthSlider_ValueChanged" />
-                                                                <TextBlock
-                                                                    Text="{Binding Value, ElementName=HighlighterWidthSlider, Mode=OneWay}"
-                                                                    FontFamily="Consolas" VerticalAlignment="Bottom"
-                                                                    Margin="10,0,0,4.5" FontSize="15" />
-                                                            </StackPanel>
-                                                        </ikw:SimpleStackPanel>
-                                                    </Viewbox>
-                                                    <Viewbox x:Name="DefaultPenColorsPanel" Visibility="Collapsed"
-                                                             Margin="0,8,0,0" Stretch="Fill">
-                                                        <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
-                                                            <!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
-                                                            <Border Width="300" Height="100" BorderBrush="Black"
-                                                                    BorderThickness="0" CornerRadius="5">
-                                                                <Controls:UniformGrid Rows="2" Height="100">
-                                                                    <ikw:SimpleStackPanel Height="45"
-                                                                        Orientation="Horizontal" Width="270">
-                                                                        <Controls:UniformGrid Columns="5" Width="270"
-                                                                            Margin="0">
-                                                                            <Border BorderBrush="{DynamicResource FloatBarBorderBrush}"
-                                                                                BorderThickness="1"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseDown="Border_MouseDown"
-                                                                                MouseUp="ColorThemeSwitch_MouseUp">
-                                                                                <Grid Margin="3">
-                                                                                    <Image
-                                                                                        x:Name="ColorThemeSwitchIcon"
-                                                                                        Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="23"
-                                                                                        Height="23" Margin="0,0,0,0" />
-                                                                                    <TextBlock Margin="0,0,0,2"
-                                                                                        x:Name="ColorThemeSwitchTextBlock"
-                                                                                        Text="亮系" Foreground="{DynamicResource FloatBarForeground}"
-                                                                                        VerticalAlignment="Bottom"
-                                                                                        HorizontalAlignment="Center"
-                                                                                        FontSize="11" />
-                                                                                </Grid>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorBlack"
-                                                                                Background="Black" BorderBrush="#D3D3D3"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnColorBlack_Click">
-                                                                                <Viewbox
-                                                                                    Name="ViewboxBtnColorBlackContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorWhite"
-                                                                                Background="White"
-                                                                                BorderBrush="#71717a"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnColorWhite_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorWhiteContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-black.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorRed"
-                                                                                Background="#dc2626"
-                                                                                BorderBrush="#7f1d1d"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45" MouseUp="BtnColorRed_Click">
-                                                                                <Viewbox
-                                                                                    Name="ViewboxBtnColorRedContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorYellow"
-                                                                                Background="#eab308"
-                                                                                BorderBrush="#713f12"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnColorYellow_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorYellowContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                        </Controls:UniformGrid>
-                                                                    </ikw:SimpleStackPanel>
-                                                                    <ikw:SimpleStackPanel Height="45"
-                                                                        Orientation="Horizontal" Width="270">
-                                                                        <Controls:UniformGrid Columns="5" Width="270"
-                                                                            Margin="0">
-
-                                                                            <Border x:Name="BorderPenColorGreen"
-                                                                                Background="#16a34a"
-                                                                                BorderBrush="#14532d"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnColorGreen_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorGreenContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorBlue"
-                                                                                Background="#2563eb"
-                                                                                BorderBrush="#1e3a8a"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45" MouseUp="BtnColorBlue_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorBlueContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorPink"
-                                                                                Background="#db2777"
-                                                                                BorderBrush="#831843"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45" MouseUp="BtnColorPink_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorPinkContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorTeal"
-                                                                                Background="#0d9488"
-                                                                                BorderBrush="#134e4a"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45" MouseUp="BtnColorTeal_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorTealContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                            <Border x:Name="BorderPenColorOrange"
-                                                                                Background="#ea580c"
-                                                                                BorderBrush="#7c2d12"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnColorOrange_Click">
-                                                                                <Viewbox
-                                                                                    x:Name="ViewboxBtnColorOrangeContent"
-                                                                                    Visibility="Collapsed" Margin="8">
-                                                                                    <Image
-                                                                                        Source="/Resources/new-icons/checked-white.png"
-                                                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                        VerticalAlignment="Top"
-                                                                                        Width="24"
-                                                                                        Height="24" Margin="0,0,0,0" />
-                                                                                </Viewbox>
-                                                                            </Border>
-                                                                        </Controls:UniformGrid>
-                                                                    </ikw:SimpleStackPanel>
-                                                                </Controls:UniformGrid>
-                                                            </Border>
-                                                        </ikw:SimpleStackPanel>
-                                                    </Viewbox>
-                                                    <Viewbox x:Name="HighlighterPenColorsPanel" Visibility="Visible"
-                                                             Margin="0,8,0,0" Stretch="Fill">
-                                                        <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
-                                                            <!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
-                                                            <Border Width="300" Height="110" BorderBrush="Black"
-                                                                    BorderThickness="0" CornerRadius="5">
-                                                                <Controls:UniformGrid Rows="2" Height="110">
-                                                                    <ikw:SimpleStackPanel Height="45"
-                                                                        Orientation="Horizontal" Width="270">
-                                                                        <Controls:UniformGrid Columns="5" Width="270"
-                                                                            Margin="0">
-                                                                            <Border x:Name="HighlighterPenColorBlack"
-                                                                                BorderBrush="#e4e4e7"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorBlack_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="Black"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorBlackContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorWhite"
-                                                                                Background="White"
-                                                                                BorderBrush="#dddddd"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100"
-                                                                                Width="45"
-                                                                                MouseUp="BtnHighlighterColorWhite_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="White"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorWhiteContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-black.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorRed"
-                                                                                BorderBrush="#fecaca"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorRed_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#ef4444"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorRedContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorYellow"
-                                                                                BorderBrush="#fef08a"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorYellow_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#eab308"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorYellowContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-black.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorGreen"
-                                                                                BorderBrush="#bbf7d0"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorGreen_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#22c55e"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorGreenContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-black.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                        </Controls:UniformGrid>
-                                                                    </ikw:SimpleStackPanel>
-                                                                    <ikw:SimpleStackPanel Height="45"
-                                                                        Orientation="Horizontal" Width="270">
-                                                                        <Controls:UniformGrid Columns="5" Width="270"
-                                                                            Margin="0">
-                                                                            <Border x:Name="HighlighterPenColorZinc"
-                                                                                BorderBrush="#e4e4e7"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorZinc_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#71717a"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorZincContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorBlue"
-                                                                                BorderBrush="#bfdbfe"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorBlue_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#3b82f6"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorBlueContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border
-                                                                                x:Name="HighlighterPenPenColorPurple"
-                                                                                BorderBrush="#e9d5ff"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorPurple_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#a855f7"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorPurpleContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorTeal"
-                                                                                BorderBrush="#99f6e4"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorTeal_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#14b8a6"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorTealContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-black.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                            <Border x:Name="HighlighterPenColorOrange"
-                                                                                BorderBrush="#fed7aa"
-                                                                                BorderThickness="1.5"
-                                                                                CornerRadius="100" Width="45"
-                                                                                MouseUp="BtnHighlighterColorOrange_Click">
-                                                                                <Canvas>
-                                                                                    <Image
-                                                                                        Source="/Resources/Icons-png/transparent-grid.png"
-                                                                                        Width="42" Height="42">
-                                                                                        <Image.Clip>
-                                                                                            <EllipseGeometry
-                                                                                                Center="21,21"
-                                                                                                RadiusX="21"
-                                                                                                RadiusY="21" />
-                                                                                        </Image.Clip>
-                                                                                    </Image>
-                                                                                    <Border Background="#f97316"
-                                                                                        Width="42"
-                                                                                        Height="42" CornerRadius="21"
-                                                                                        Opacity="0.75" />
-                                                                                    <Viewbox
-                                                                                        Name="HighlighterPenViewboxBtnColorOrangeContent"
-                                                                                        Visibility="Visible"
-                                                                                        Canvas.Top="9"
-                                                                                        Canvas.Left="9">
-                                                                                        <Image
-                                                                                            Source="/Resources/new-icons/checked-white.png"
-                                                                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                                                                            VerticalAlignment="Top"
-                                                                                            Width="24" Height="24"
-                                                                                            Margin="0,0,0,0" />
-                                                                                    </Viewbox>
-                                                                                </Canvas>
-                                                                            </Border>
-                                                                        </Controls:UniformGrid>
-                                                                    </ikw:SimpleStackPanel>
-                                                                </Controls:UniformGrid>
-                                                            </Border>
-                                                        </ikw:SimpleStackPanel>
-                                                    </Viewbox>
+                                                    <mwcontrols:PenSettingsPanel x:Name="BorderPenSettingsControl"
+                                                                                PenTypeChanged="BorderPenSettingsControl_PenTypeChanged"
+                                                                                PenStyleChanged="BorderPenSettingsControl_PenStyleChanged"
+                                                                                WidthChanged="BorderPenSettingsControl_WidthChanged"
+                                                                                AlphaChanged="BorderPenSettingsControl_AlphaChanged"
+                                                                                NibModeChanged="BorderPenSettingsControl_NibModeChanged"
+                                                                                InkFadeChanged="BorderPenSettingsControl_InkFadeChanged"
+                                                                                InkToShapeChanged="BorderPenSettingsControl_InkToShapeChanged"
+                                                                                BrushModeClicked="BorderPenSettingsControl_BrushModeClicked"
+                                                                                CloseRequested="BorderPenSettingsControl_CloseRequested" />
+                                                    <mwcontrols:PenColorPalette x:Name="BorderPenColorPaletteControl"
+                                                                                Visibility="Collapsed"
+                                                                                ColorSelected="PenColorPalette_ColorSelected"
+                                                                                ThemeSwitchClicked="ColorThemeSwitch_MouseUp" />
+                                                    <mwcontrols:HighlighterColorPalette x:Name="HighlighterPenColorsPanel"
+                                                                                       Visibility="Visible"
+                                                                                       ColorSelected="HighlighterColorPalette_ColorSelected" />
                                                 </ikw:SimpleStackPanel>
                                             </Border>
                                         </Grid>
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index af1e63d1..d0bb5900 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -747,10 +747,10 @@ private void SetBrushAttributesDirectly(Color color, double width, double height
                     Settings.Canvas.InkAlpha = (int)color.A;
                 }
 
-                if (InkWidthSlider != null) InkWidthSlider.Value = width * 2;
-                if (InkAlphaSlider != null) InkAlphaSlider.Value = color.A;
-                if (BoardInkWidthSlider != null) BoardInkWidthSlider.Value = width * 2;
-                if (BoardInkAlphaSlider != null) BoardInkAlphaSlider.Value = color.A;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.PenWidth = width * 2;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.PenAlpha = color.A;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenWidth = width * 2;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenAlpha = color.A;
 
                 if (penType != 1)
                 {
@@ -786,7 +786,7 @@ private void BoardBrushModeButton_Click(object sender, RoutedEventArgs e)
 
                 if (_isBoardBrushMode)
                 {
-                    _savedInkWidthBeforeBoardBrush = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : drawingAttributes.Width;
+                    _savedInkWidthBeforeBoardBrush = BorderPenSettingsControl != null ? BorderPenSettingsControl.PenWidth / 2.0 : drawingAttributes.Width;
                     if (_savedInkWidthBeforeBoardBrush < 0.5) _savedInkWidthBeforeBoardBrush = 2.5;
 
                     drawingAttributes.Width = BoardBrushInkWidth;
@@ -798,12 +798,11 @@ private void BoardBrushModeButton_Click(object sender, RoutedEventArgs e)
                     drawingAttributes.IgnorePressure = true;
                     inkCanvas.DefaultDrawingAttributes.IgnorePressure = true;
 
-                    if (BoardBrushModeButton != null)
-                        BoardBrushModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
+                    BorderPenSettingsControl?.SetBrushModeActive(true);
                 }
                 else
                 {
-                    double w = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : _savedInkWidthBeforeBoardBrush;
+                    double w = BorderPenSettingsControl != null ? BorderPenSettingsControl.PenWidth / 2.0 : _savedInkWidthBeforeBoardBrush;
                     if (w < 0.5) w = 2.5;
 
                     drawingAttributes.Width = w;
@@ -815,11 +814,10 @@ private void BoardBrushModeButton_Click(object sender, RoutedEventArgs e)
                     drawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
                     inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
 
-                    if (BoardInkWidthSlider != null) BoardInkWidthSlider.Value = w * 2;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenWidth = w * 2;
                     if (Settings?.Canvas != null) Settings.Canvas.InkWidth = w;
 
-                    if (BoardBrushModeButton != null)
-                        BoardBrushModeButton.ClearValue(BackgroundProperty);
+                    BorderPenSettingsControl?.SetBrushModeActive(false);
                 }
             }
             catch (Exception ex)
@@ -840,8 +838,8 @@ private void BoardBrushModeButton_Click(object sender, RoutedEventArgs e)
         /// </remarks>
         private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            if (sender != BoardBrushModeButton) return;
-            if (lastBorderMouseDownObject != BoardBrushModeButton) return;
+            if (sender != BorderPenSettingsControl) return;
+            if (lastBorderMouseDownObject != BorderPenSettingsControl) return;
 
             _isBoardBrushMode = !_isBoardBrushMode;
 
@@ -854,7 +852,7 @@ private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e)
 
                 if (_isBoardBrushMode)
                 {
-                    _savedInkWidthBeforeBoardBrush = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : drawingAttributes.Width;
+                    _savedInkWidthBeforeBoardBrush = BorderPenSettingsControl != null ? BorderPenSettingsControl.PenWidth / 2.0 : drawingAttributes.Width;
                     if (_savedInkWidthBeforeBoardBrush < 0.5) _savedInkWidthBeforeBoardBrush = 2.5;
 
                     drawingAttributes.Width = BoardBrushInkWidth;
@@ -866,12 +864,11 @@ private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e)
                     drawingAttributes.IgnorePressure = true;
                     inkCanvas.DefaultDrawingAttributes.IgnorePressure = true;
 
-                    if (BoardBrushModeButton != null)
-                        BoardBrushModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
+                    BorderPenSettingsControl?.SetBrushModeActive(true);
                 }
                 else
                 {
-                    double w = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : _savedInkWidthBeforeBoardBrush;
+                    double w = BorderPenSettingsControl != null ? BorderPenSettingsControl.PenWidth / 2.0 : _savedInkWidthBeforeBoardBrush;
                     if (w < 0.5) w = 2.5;
 
                     drawingAttributes.Width = w;
@@ -883,11 +880,10 @@ private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e)
                     drawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
                     inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
 
-                    if (BoardInkWidthSlider != null) BoardInkWidthSlider.Value = w * 2;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenWidth = w * 2;
                     if (Settings?.Canvas != null) Settings.Canvas.InkWidth = w;
 
-                    if (BoardBrushModeButton != null)
-                        BoardBrushModeButton.ClearValue(BackgroundProperty);
+                    BorderPenSettingsControl?.SetBrushModeActive(false);
                 }
             }
             catch (Exception ex)
@@ -3443,15 +3439,20 @@ private void ToggleSwitchEnableInkFade_Toggled(object sender, RoutedEventArgs e)
                 _inkFadeManager.IsEnabled = Settings.Canvas.EnableInkFade;
 
                 // 同步批注子面板中的开关状态
-                if (ToggleSwitchInkFadeInPanel != null)
+                if (BoardPenSettingsControl != null)
                 {
-                    ToggleSwitchInkFadeInPanel.IsOn = Settings.Canvas.EnableInkFade;
+                    BoardPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
                 }
 
                 // 同步普通画笔面板中的开关状态
-                if (ToggleSwitchInkFadeInPanel2 != null)
+                if (BorderPenSettingsControl != null)
                 {
-                    ToggleSwitchInkFadeInPanel2.IsOn = Settings.Canvas.EnableInkFade;
+                    BorderPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
+                }
+
+                if (BoardPenSettingsControl != null)
+                {
+                    BoardPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
                 }
 
             }
@@ -3490,7 +3491,11 @@ private void ToggleSwitchInkFadeInPanel_Toggled(object sender, RoutedEventArgs e
         {
             try
             {
-                Settings.Canvas.EnableInkFade = ToggleSwitchInkFadeInPanel.IsOn;
+                bool isInkFadeEnabled = sender == BorderPenSettingsControl
+                    ? BorderPenSettingsControl.IsInkFadeEnabled
+                    : BoardPenSettingsControl != null && BoardPenSettingsControl.IsInkFadeEnabled;
+
+                Settings.Canvas.EnableInkFade = isInkFadeEnabled;
                 _inkFadeManager.IsEnabled = Settings.Canvas.EnableInkFade;
 
                 // 同步设置面板中的开关状态
@@ -3499,10 +3504,15 @@ private void ToggleSwitchInkFadeInPanel_Toggled(object sender, RoutedEventArgs e
                     ToggleSwitchEnableInkFade.IsOn = Settings.Canvas.EnableInkFade;
                 }
 
+                if (BoardPenSettingsControl != null)
+                {
+                    BoardPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
+                }
+
                 // 同步普通画笔面板中的开关状态
-                if (ToggleSwitchInkFadeInPanel2 != null)
+                if (BorderPenSettingsControl != null)
                 {
-                    ToggleSwitchInkFadeInPanel2.IsOn = Settings.Canvas.EnableInkFade;
+                    BorderPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
                 }
 
             }
@@ -3726,16 +3736,14 @@ private void UpdateInkFadeControlVisibility()
             {
                 bool isHidden = Settings.Canvas.HideInkFadeControlInPenMenu;
 
-                // 控制 InkFadeControlPanel1（批注子面板中）的可见性
-                if (InkFadeControlPanel1 != null)
+                if (BoardPenSettingsControl != null)
                 {
-                    InkFadeControlPanel1.Visibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
+                    BoardPenSettingsControl.InkFadePanelVisibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
                 }
 
-                // 控制 InkFadeControlPanel2（普通画笔面板中）的可见性
-                if (InkFadeControlPanel2 != null)
+                if (BorderPenSettingsControl != null)
                 {
-                    InkFadeControlPanel2.Visibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
+                    BorderPenSettingsControl.InkFadePanelVisibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
                 }
             }
             catch (Exception ex)
@@ -3744,6 +3752,118 @@ private void UpdateInkFadeControlVisibility()
             }
         }
 
+        private void BoardPenSettingsControl_PenTypeChanged(object sender, RoutedEventArgs e)
+        {
+            if (BoardPenSettingsControl == null) return;
+
+            if (BoardPenSettingsControl.SelectedPenType == 1)
+                SwitchToHighlighterPen(null, null);
+            else
+                SwitchToDefaultPen(null, null);
+        }
+
+        private void BoardPenSettingsControl_PenStyleChanged(object sender, RoutedEventArgs e)
+        {
+            ComboBoxPenStyle_SelectionChanged(BoardPenSettingsControl, null);
+        }
+
+        private void BoardPenSettingsControl_WidthChanged(object sender, RoutedEventArgs e)
+        {
+            if (BoardPenSettingsControl == null) return;
+
+            if (BoardPenSettingsControl.SelectedPenType == 1)
+                HighlighterWidthSlider_ValueChanged(BoardPenSettingsControl.HighlighterWidthSliderControl, null);
+            else
+                InkWidthSlider_ValueChanged(BoardPenSettingsControl.InkWidthSliderControl, null);
+        }
+
+        private void BoardPenSettingsControl_AlphaChanged(object sender, RoutedEventArgs e)
+        {
+            if (BoardPenSettingsControl == null) return;
+            InkAlphaSlider_ValueChanged(BoardPenSettingsControl.InkAlphaSliderControl, null);
+        }
+
+        private void BoardPenSettingsControl_NibModeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchEnableNibMode_Toggled(BoardPenSettingsControl, e);
+        }
+
+        private void BoardPenSettingsControl_InkFadeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchInkFadeInPanel_Toggled(BoardPenSettingsControl, e);
+        }
+
+        private void BoardPenSettingsControl_InkToShapeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchEnableInkToShape_Toggled(BoardPenSettingsControl, e);
+        }
+
+        private void BoardPenSettingsControl_BrushModeClicked(object sender, RoutedEventArgs e)
+        {
+            BoardBrushModeButton_Click(BoardPenSettingsControl, e);
+        }
+
+        private void BoardPenSettingsControl_CloseRequested(object sender, RoutedEventArgs e)
+        {
+            HideSubPanels();
+        }
+
+        private void BorderPenSettingsControl_PenTypeChanged(object sender, RoutedEventArgs e)
+        {
+            if (BorderPenSettingsControl == null) return;
+
+            if (BorderPenSettingsControl.SelectedPenType == 1)
+                SwitchToHighlighterPen(null, null);
+            else
+                SwitchToDefaultPen(null, null);
+        }
+
+        private void BorderPenSettingsControl_PenStyleChanged(object sender, RoutedEventArgs e)
+        {
+            ComboBoxPenStyle_SelectionChanged(BorderPenSettingsControl, null);
+        }
+
+        private void BorderPenSettingsControl_WidthChanged(object sender, RoutedEventArgs e)
+        {
+            if (BorderPenSettingsControl == null) return;
+
+            if (BorderPenSettingsControl.SelectedPenType == 1)
+                HighlighterWidthSlider_ValueChanged(BorderPenSettingsControl.HighlighterWidthSliderControl, null);
+            else
+                InkWidthSlider_ValueChanged(BorderPenSettingsControl.InkWidthSliderControl, null);
+        }
+
+        private void BorderPenSettingsControl_AlphaChanged(object sender, RoutedEventArgs e)
+        {
+            if (BorderPenSettingsControl == null) return;
+            InkAlphaSlider_ValueChanged(BorderPenSettingsControl.InkAlphaSliderControl, null);
+        }
+
+        private void BorderPenSettingsControl_NibModeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchEnableNibMode_Toggled(BorderPenSettingsControl, e);
+        }
+
+        private void BorderPenSettingsControl_InkFadeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchInkFadeInPanel_Toggled(BorderPenSettingsControl, e);
+        }
+
+        private void BorderPenSettingsControl_InkToShapeChanged(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitchEnableInkToShape_Toggled(BorderPenSettingsControl, e);
+        }
+
+        private void BorderPenSettingsControl_BrushModeClicked(object sender, RoutedEventArgs e)
+        {
+            BoardBrushModeButton_Click(BorderPenSettingsControl, e);
+        }
+
+        private void BorderPenSettingsControl_CloseRequested(object sender, RoutedEventArgs e)
+        {
+            HideSubPanels();
+        }
+
         /// <summary>
         /// PPT放映模式显示手势按钮开关切换事件处理
         /// </summary>
@@ -4085,12 +4205,12 @@ private void AddTouchSupportToSliders()
                     RandWindowOnceMaxStudentsSlider,
                     TimerVolumeSlider,
                     ProgressiveReminderVolumeSlider,
-                    BoardInkWidthSlider,
-                    BoardInkAlphaSlider,
-                    BoardHighlighterWidthSlider,
-                    InkWidthSlider,
-                    InkAlphaSlider,
-                    HighlighterWidthSlider,
+                    BoardPenSettingsControl?.InkWidthSliderControl,
+                    BoardPenSettingsControl?.InkAlphaSliderControl,
+                    BoardPenSettingsControl?.HighlighterWidthSliderControl,
+                    BorderPenSettingsControl?.InkWidthSliderControl,
+                    BorderPenSettingsControl?.InkAlphaSliderControl,
+                    BorderPenSettingsControl?.HighlighterWidthSliderControl,
                     MLAvoidanceHistorySlider,
                     MLAvoidanceWeightSlider,
                     BrushAutoRestoreWidthSlider,
diff --git a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml
index 5ccac6dd..d2870220 100644
--- a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml	
+++ b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml	
@@ -5,161 +5,277 @@
              xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
              x:Name="Root">
     <Grid>
-        <!-- Board Version -->
-        <Viewbox x:Name="BoardHighlighterPenColorsPanel"
-                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource BoolToVisibilityConverter}}"
-                Margin="0,8,0,0" Stretch="Fill">
+        <Viewbox Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource BoolToVisibilityConverter}}"
+                 Margin="0,8,0,0"
+                 Stretch="Fill">
             <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
                 <Border Width="300" Height="110" BorderBrush="Black"
                         BorderThickness="0" CornerRadius="5">
                     <Controls:UniformGrid Rows="2" Height="110">
-                        <ikw:SimpleStackPanel Height="45"
-                            Orientation="Horizontal" Width="270">
-                            <Controls:UniformGrid Columns="5"
-                                Width="270"
-                                Margin="0">
+                        <ikw:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
+                            <Controls:UniformGrid Columns="5" Width="270" Margin="0">
                                 <Border x:Name="BoardHighlighterPenColorBlack"
-                                    BorderBrush="#e4e4e7"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorBlack_Click">
+                                        BorderBrush="#e4e4e7"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorBlack_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="Black" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorBlackContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-white.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="BoardHighlighterPenColorWhite"
-                                    Background="White"
-                                    BorderBrush="#dddddd"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100"
-                                    Width="45"
-                                    MouseUp="BtnHighlighterColorWhite_Click">
+                                        Background="White"
+                                        BorderBrush="#dddddd"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorWhite_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="White" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorWhiteContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="BoardHighlighterPenColorRed"
-                                    BorderBrush="#fecaca"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorRed_Click">
+                                        BorderBrush="#fecaca"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorRed_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#ef4444" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorRedContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-white.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="BoardHighlighterPenColorYellow"
-                                    BorderBrush="#fef08a"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorYellow_Click">
+                                        BorderBrush="#fef08a"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorYellow_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#eab308" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorYellowContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="BoardHighlighterPenColorGreen"
-                                    BorderBrush="#bbf7d0"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorGreen_Click">
+                                        BorderBrush="#bbf7d0"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorGreen_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#22c55e" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorGreenContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                             </Controls:UniformGrid>
                         </ikw:SimpleStackPanel>
-                        <ikw:SimpleStackPanel Height="45"
-                            Orientation="Horizontal" Width="270">
+                        <ikw:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
                             <Controls:UniformGrid Columns="5" Width="270" Margin="0">
+                                <Border x:Name="BoardHighlighterPenColorZinc"
+                                        BorderBrush="#e4e4e7"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorZinc_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#71717a" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorZincContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorBlue"
+                                        BorderBrush="#bfdbfe"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorBlue_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#3b82f6" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorBlueContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenPenColorPurple"
+                                        BorderBrush="#e9d5ff"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorPurple_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#a855f7" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorPurpleContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="BoardHighlighterPenColorTeal"
+                                        BorderBrush="#99f6e4"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorTeal_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#14b8a6" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorTealContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
                                 <Border x:Name="BoardHighlighterPenColorOrange"
-                                    BorderBrush="#fed7aa"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorOrange_Click">
+                                        BorderBrush="#fed7aa"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorOrange_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#f97316" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="BoardHighlighterPenViewboxBtnColorOrangeContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
-                                            <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
@@ -170,159 +286,277 @@
             </ikw:SimpleStackPanel>
         </Viewbox>
 
-        <!-- Non-Board Version -->
-        <Viewbox x:Name="HighlighterPenColorsPanel"
-                Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource InverseBoolToVisibilityConverter}}"
-                Margin="0,8,0,0" Stretch="Fill">
+        <Viewbox Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                 Margin="0,8,0,0"
+                 Stretch="Fill">
             <ikw:SimpleStackPanel Width="300" Margin="0,0,0,0">
                 <Border Width="300" Height="110" BorderBrush="Black"
                         BorderThickness="0" CornerRadius="5">
                     <Controls:UniformGrid Rows="2" Height="110">
-                        <ikw:SimpleStackPanel Height="45"
-                            Orientation="Horizontal" Width="270">
+                        <ikw:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
                             <Controls:UniformGrid Columns="5" Width="270" Margin="0">
                                 <Border x:Name="HighlighterPenColorBlack"
-                                    BorderBrush="#e4e4e7"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorBlack_Click">
+                                        BorderBrush="#e4e4e7"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorBlack_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="Black" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorBlackContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-white.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="HighlighterPenColorWhite"
-                                    Background="White"
-                                    BorderBrush="#dddddd"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100"
-                                    Width="45"
-                                    MouseUp="BtnHighlighterColorWhite_Click">
+                                        Background="White"
+                                        BorderBrush="#dddddd"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorWhite_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="White" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorWhiteContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="HighlighterPenColorRed"
-                                    BorderBrush="#fecaca"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorRed_Click">
+                                        BorderBrush="#fecaca"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorRed_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#ef4444" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorRedContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-white.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="HighlighterPenColorYellow"
-                                    BorderBrush="#fef08a"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorYellow_Click">
+                                        BorderBrush="#fef08a"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorYellow_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#eab308" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorYellowContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                                 <Border x:Name="HighlighterPenColorGreen"
-                                    BorderBrush="#bbf7d0"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorGreen_Click">
+                                        BorderBrush="#bbf7d0"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorGreen_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#22c55e" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorGreenContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
                                             <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
                             </Controls:UniformGrid>
                         </ikw:SimpleStackPanel>
-                        <ikw:SimpleStackPanel Height="45"
-                            Orientation="Horizontal" Width="270">
+                        <ikw:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
                             <Controls:UniformGrid Columns="5" Width="270" Margin="0">
+                                <Border x:Name="HighlighterPenColorZinc"
+                                        BorderBrush="#e4e4e7"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorZinc_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#71717a" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorZincContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorBlue"
+                                        BorderBrush="#bfdbfe"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorBlue_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#3b82f6" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorBlueContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenPenColorPurple"
+                                        BorderBrush="#e9d5ff"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorPurple_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#a855f7" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorPurpleContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
+                                <Border x:Name="HighlighterPenColorTeal"
+                                        BorderBrush="#99f6e4"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorTeal_Click">
+                                    <Canvas>
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
+                                            <Image.Clip>
+                                                <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
+                                            </Image.Clip>
+                                        </Image>
+                                        <Border Background="#14b8a6" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
+                                        <Viewbox x:Name="HighlighterPenViewboxBtnColorTealContent"
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-black.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
+                                        </Viewbox>
+                                    </Canvas>
+                                </Border>
                                 <Border x:Name="HighlighterPenColorOrange"
-                                    BorderBrush="#fed7aa"
-                                    BorderThickness="1.5"
-                                    CornerRadius="100" Width="45"
-                                    MouseUp="BtnHighlighterColorOrange_Click">
+                                        BorderBrush="#fed7aa"
+                                        BorderThickness="1.5"
+                                        CornerRadius="100"
+                                        Width="45"
+                                        MouseUp="BtnHighlighterColorOrange_Click">
                                     <Canvas>
-                                        <Image Source="/Resources/Icons-png/transparent-grid.png"
-                                            Width="42" Height="42">
+                                        <Image Source="/Resources/Icons-png/transparent-grid.png" Width="42" Height="42">
                                             <Image.Clip>
                                                 <EllipseGeometry Center="21,21" RadiusX="21" RadiusY="21" />
                                             </Image.Clip>
                                         </Image>
                                         <Border Background="#f97316" Width="42" Height="42" CornerRadius="21" Opacity="0.75" />
                                         <Viewbox x:Name="HighlighterPenViewboxBtnColorOrangeContent"
-                                            Visibility="Visible"
-                                            Canvas.Top="9"
-                                            Canvas.Left="9">
-                                            <Image Source="/Resources/new-icons/checked-black.png"
-                                                RenderOptions.BitmapScalingMode="HighQuality"
-                                                VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0" />
+                                                 Visibility="Visible"
+                                                 Canvas.Top="9"
+                                                 Canvas.Left="9">
+                                            <Image Source="/Resources/new-icons/checked-white.png"
+                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                   VerticalAlignment="Top"
+                                                   Width="24"
+                                                   Height="24"
+                                                   Margin="0,0,0,0" />
                                         </Viewbox>
                                     </Canvas>
                                 </Border>
diff --git a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs
index e3d139a6..535afa8b 100644
--- a/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/HighlighterColorPalette.xaml.cs	
@@ -11,6 +11,10 @@ public partial class HighlighterColorPalette : UserControl
         public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(
             nameof(SelectedColor), typeof(Color), typeof(HighlighterColorPalette), new PropertyMetadata(Colors.Black));
 
+        public static readonly DependencyProperty SelectedColorCodeProperty = DependencyProperty.Register(
+            nameof(SelectedColorCode), typeof(int), typeof(HighlighterColorPalette),
+            new PropertyMetadata(100, OnSelectedColorCodeChanged));
+
         public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
             nameof(IsBoardMode), typeof(bool), typeof(HighlighterColorPalette), new PropertyMetadata(false));
 
@@ -29,6 +33,12 @@ public bool IsBoardMode
             set => SetValue(IsBoardModeProperty, value);
         }
 
+        public int SelectedColorCode
+        {
+            get => (int)GetValue(SelectedColorCodeProperty);
+            set => SetValue(SelectedColorCodeProperty, value);
+        }
+
         public event RoutedEventHandler ColorSelected
         {
             add => AddHandler(ColorSelectedEvent, value);
@@ -38,42 +48,156 @@ public event RoutedEventHandler ColorSelected
         public HighlighterColorPalette()
         {
             InitializeComponent();
+            UpdateSelectionIndicators(SelectedColorCode);
         }
 
         private void BtnHighlighterColorBlack_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = Colors.Black;
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(100, Colors.Black);
         }
 
         private void BtnHighlighterColorWhite_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = Colors.White;
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(101, Colors.White);
         }
 
         private void BtnHighlighterColorRed_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#ef4444");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(102, (Color)ColorConverter.ConvertFromString("#ef4444"));
         }
 
         private void BtnHighlighterColorYellow_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#eab308");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(103, (Color)ColorConverter.ConvertFromString("#eab308"));
         }
 
         private void BtnHighlighterColorGreen_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#22c55e");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(104, (Color)ColorConverter.ConvertFromString("#22c55e"));
+        }
+
+        private void BtnHighlighterColorZinc_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectColor(105, (Color)ColorConverter.ConvertFromString("#71717a"));
+        }
+
+        private void BtnHighlighterColorBlue_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectColor(106, (Color)ColorConverter.ConvertFromString("#3b82f6"));
+        }
+
+        private void BtnHighlighterColorPurple_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectColor(107, (Color)ColorConverter.ConvertFromString("#a855f7"));
+        }
+
+        private void BtnHighlighterColorTeal_Click(object sender, MouseButtonEventArgs e)
+        {
+            SelectColor(108, (Color)ColorConverter.ConvertFromString("#14b8a6"));
         }
 
         private void BtnHighlighterColorOrange_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#f97316");
+            SelectColor(109, (Color)ColorConverter.ConvertFromString("#f97316"));
+        }
+
+        public void SetSelectedColorCode(int colorCode)
+        {
+            SelectedColorCode = colorCode;
+        }
+
+        private static void OnSelectedColorCodeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is HighlighterColorPalette palette)
+            {
+                palette.UpdateSelectionIndicators((int)e.NewValue);
+            }
+        }
+
+        private void SelectColor(int colorCode, Color color)
+        {
+            SelectedColor = color;
+            SelectedColorCode = colorCode;
             RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
         }
+
+        private void UpdateSelectionIndicators(int colorCode)
+        {
+            foreach (var indicator in GetAllIndicators())
+            {
+                indicator.Visibility = Visibility.Collapsed;
+            }
+
+            switch (colorCode)
+            {
+                case 100:
+                    HighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    break;
+                case 101:
+                    HighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    break;
+                case 102:
+                    HighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    break;
+                case 103:
+                    HighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    break;
+                case 104:
+                    HighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    break;
+                case 105:
+                    HighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
+                    break;
+                case 106:
+                    HighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    break;
+                case 107:
+                    HighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
+                    break;
+                case 108:
+                    HighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    break;
+                case 109:
+                    HighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    BoardHighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    break;
+            }
+        }
+
+        private Viewbox[] GetAllIndicators()
+        {
+            return new[]
+            {
+                HighlighterPenViewboxBtnColorBlackContent,
+                HighlighterPenViewboxBtnColorWhiteContent,
+                HighlighterPenViewboxBtnColorRedContent,
+                HighlighterPenViewboxBtnColorYellowContent,
+                HighlighterPenViewboxBtnColorGreenContent,
+                HighlighterPenViewboxBtnColorZincContent,
+                HighlighterPenViewboxBtnColorBlueContent,
+                HighlighterPenViewboxBtnColorPurpleContent,
+                HighlighterPenViewboxBtnColorTealContent,
+                HighlighterPenViewboxBtnColorOrangeContent,
+                BoardHighlighterPenViewboxBtnColorBlackContent,
+                BoardHighlighterPenViewboxBtnColorWhiteContent,
+                BoardHighlighterPenViewboxBtnColorRedContent,
+                BoardHighlighterPenViewboxBtnColorYellowContent,
+                BoardHighlighterPenViewboxBtnColorGreenContent,
+                BoardHighlighterPenViewboxBtnColorZincContent,
+                BoardHighlighterPenViewboxBtnColorBlueContent,
+                BoardHighlighterPenViewboxBtnColorPurpleContent,
+                BoardHighlighterPenViewboxBtnColorTealContent,
+                BoardHighlighterPenViewboxBtnColorOrangeContent,
+            };
+        }
     }
 }
diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
index 098dd122..11dd334d 100644
--- a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
@@ -2,43 +2,27 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Name="Root">
-    <Canvas Name="ImageResizeHandlesCanvas" 
-            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" 
+    <Canvas Name="ImageResizeHandlesCanvas"
+            Visibility="Collapsed"
             Panel.ZIndex="1000">
         <!-- 四个角控制点 -->
         <Ellipse Name="ImageTopLeftHandle" Style="{StaticResource ImageResizeHandleNWSE}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageTopRightHandle" Style="{StaticResource ImageResizeHandleNESW}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageBottomLeftHandle" Style="{StaticResource ImageResizeHandleNESW}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageBottomRightHandle" Style="{StaticResource ImageResizeHandleNWSE}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         
         <!-- 四个边控制点 -->
         <Ellipse Name="ImageTopHandle" Style="{StaticResource ImageResizeHandleNS}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageBottomHandle" Style="{StaticResource ImageResizeHandleNS}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageLeftHandle" Style="{StaticResource ImageResizeHandleWE}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
         <Ellipse Name="ImageRightHandle" Style="{StaticResource ImageResizeHandleWE}"
-                 MouseLeftButtonDown="ImageResizeHandle_MouseLeftButtonDown"
-                 MouseLeftButtonUp="ImageResizeHandle_MouseLeftButtonUp"
-                 MouseMove="ImageResizeHandle_MouseMove" />
+                 />
     </Canvas>
 </UserControl>
diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs
index 820d3d53..57042f48 100644
--- a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml.cs	
@@ -1,79 +1,90 @@
-using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
+using System.Windows.Shapes;
 
 namespace Ink_Canvas.MainWindow_controls
 {
     public partial class ImageResizeHandles : UserControl
     {
-        public static readonly DependencyProperty TargetBoundsProperty = DependencyProperty.Register(
-            nameof(TargetBounds), typeof(Rect), typeof(ImageResizeHandles), new PropertyMetadata(new Rect(0, 0, 0, 0)));
+        private const double HandleOffset = 4d;
 
-        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
-            nameof(IsVisible), typeof(Visibility), typeof(ImageResizeHandles), new PropertyMetadata(Visibility.Collapsed));
+        private FrameworkElement ResizeHandlesCanvasElement => (FrameworkElement)FindName("ImageResizeHandlesCanvas");
+        private Ellipse TopLeftHandle => (Ellipse)FindName("ImageTopLeftHandle");
+        private Ellipse TopRightHandle => (Ellipse)FindName("ImageTopRightHandle");
+        private Ellipse BottomLeftHandle => (Ellipse)FindName("ImageBottomLeftHandle");
+        private Ellipse BottomRightHandle => (Ellipse)FindName("ImageBottomRightHandle");
+        private Ellipse TopHandle => (Ellipse)FindName("ImageTopHandle");
+        private Ellipse BottomHandle => (Ellipse)FindName("ImageBottomHandle");
+        private Ellipse LeftHandle => (Ellipse)FindName("ImageLeftHandle");
+        private Ellipse RightHandle => (Ellipse)FindName("ImageRightHandle");
 
-        public static readonly RoutedEvent ResizeStartedEvent = EventManager.RegisterRoutedEvent(
-            nameof(ResizeStarted), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
+        public static new readonly DependencyProperty VisibilityProperty = DependencyProperty.Register(
+            nameof(Visibility),
+            typeof(Visibility),
+            typeof(ImageResizeHandles),
+            new FrameworkPropertyMetadata(Visibility.Collapsed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnVisibilityChanged));
 
-        public static readonly RoutedEvent ResizeCompletedEvent = EventManager.RegisterRoutedEvent(
-            nameof(ResizeCompleted), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
-
-        public static readonly RoutedEvent BoundsChangedEvent = EventManager.RegisterRoutedEvent(
-            nameof(BoundsChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageResizeHandles));
-
-        public Rect TargetBounds
+        public new Visibility Visibility
         {
-            get => (Rect)GetValue(TargetBoundsProperty);
-            set => SetValue(TargetBoundsProperty, value);
+            get => (Visibility)GetValue(VisibilityProperty);
+            set => SetValue(VisibilityProperty, value);
         }
 
-        public new Visibility IsVisible
+        public Thickness ControlMargin
         {
-            get => (Visibility)GetValue(IsVisibleProperty);
-            set => SetValue(IsVisibleProperty, value);
+            get => ResizeHandlesCanvasElement.Margin;
+            set => ResizeHandlesCanvasElement.Margin = value;
         }
 
-        public event RoutedEventHandler ResizeStarted
+        public ImageResizeHandles()
         {
-            add => AddHandler(ResizeStartedEvent, value);
-            remove => RemoveHandler(ResizeStartedEvent, value);
+            InitializeComponent();
         }
 
-        public event RoutedEventHandler ResizeCompleted
+        public void UpdateHandlePositions(Rect elementBounds)
         {
-            add => AddHandler(ResizeCompletedEvent, value);
-            remove => RemoveHandler(ResizeCompletedEvent, value);
-        }
+            ControlMargin = new Thickness(elementBounds.Left, elementBounds.Top, 0, 0);
 
-        public event RoutedEventHandler BoundsChanged
-        {
-            add => AddHandler(BoundsChangedEvent, value);
-            remove => RemoveHandler(BoundsChangedEvent, value);
-        }
+            System.Windows.Controls.Canvas.SetLeft(TopLeftHandle, -HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(TopLeftHandle, -HandleOffset);
 
-        public ImageResizeHandles()
-        {
-            InitializeComponent();
-        }
+            System.Windows.Controls.Canvas.SetLeft(TopRightHandle, elementBounds.Width - HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(TopRightHandle, -HandleOffset);
 
-        private void ImageResizeHandle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            RaiseEvent(new RoutedEventArgs(ResizeStartedEvent, this));
-            e.Handled = true;
+            System.Windows.Controls.Canvas.SetLeft(BottomLeftHandle, -HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(BottomLeftHandle, elementBounds.Height - HandleOffset);
+
+            System.Windows.Controls.Canvas.SetLeft(BottomRightHandle, elementBounds.Width - HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(BottomRightHandle, elementBounds.Height - HandleOffset);
+
+            System.Windows.Controls.Canvas.SetLeft(TopHandle, elementBounds.Width / 2 - HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(TopHandle, -HandleOffset);
+
+            System.Windows.Controls.Canvas.SetLeft(BottomHandle, elementBounds.Width / 2 - HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(BottomHandle, elementBounds.Height - HandleOffset);
+
+            System.Windows.Controls.Canvas.SetLeft(LeftHandle, -HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(LeftHandle, elementBounds.Height / 2 - HandleOffset);
+
+            System.Windows.Controls.Canvas.SetLeft(RightHandle, elementBounds.Width - HandleOffset);
+            System.Windows.Controls.Canvas.SetTop(RightHandle, elementBounds.Height / 2 - HandleOffset);
         }
 
-        private void ImageResizeHandle_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            RaiseEvent(new RoutedEventArgs(ResizeCompletedEvent, this));
-            e.Handled = true;
+            if (d is ImageResizeHandles handles)
+            {
+                var visibility = (Visibility)e.NewValue;
+                handles.SetCurrentValue(UIElement.VisibilityProperty, visibility);
+                ResizeHandlesVisibility(handles, visibility);
+            }
         }
 
-        private void ImageResizeHandle_MouseMove(object sender, MouseEventArgs e)
+        private static void ResizeHandlesVisibility(ImageResizeHandles handles, Visibility visibility)
         {
-            if (e.LeftButton == MouseButtonState.Pressed)
+            if (handles.ResizeHandlesCanvasElement is UIElement resizeHandlesCanvas)
             {
-                RaiseEvent(new RoutedEventArgs(BoundsChangedEvent, this));
+                resizeHandlesCanvas.Visibility = visibility;
             }
         }
     }
diff --git a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml
index f04f9f08..95220b42 100644
--- a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml	
+++ b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml	
@@ -7,7 +7,7 @@
             HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,0"
             CornerRadius="5" Height="80"
             Background="{DynamicResource FloatBarBackground}"
-            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}"
+            Visibility="{Binding Visibility, ElementName=BorderImageSelectionControl, Mode=TwoWay}"
             BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
         <Viewbox Margin="0,-2.5">
             <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
diff --git a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs
index 97c121df..01168b55 100644
--- a/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/ImageSelectionToolbar.xaml.cs	
@@ -10,8 +10,9 @@ public partial class ImageSelectionToolbar : UserControl
         public static readonly DependencyProperty SelectedImageProperty = DependencyProperty.Register(
             nameof(SelectedImage), typeof(object), typeof(ImageSelectionToolbar), new PropertyMetadata(null));
 
-        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
-            nameof(IsVisible), typeof(Visibility), typeof(ImageSelectionToolbar), new PropertyMetadata(Visibility.Collapsed));
+        public static new readonly DependencyProperty VisibilityProperty = DependencyProperty.Register(
+            nameof(Visibility), typeof(Visibility), typeof(ImageSelectionToolbar), 
+            new FrameworkPropertyMetadata(Visibility.Collapsed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnVisibilityChanged));
 
         public static readonly RoutedEvent CloneRequestedEvent = EventManager.RegisterRoutedEvent(
             nameof(CloneRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
@@ -28,16 +29,46 @@ public partial class ImageSelectionToolbar : UserControl
         public static readonly RoutedEvent ScaleChangedEvent = EventManager.RegisterRoutedEvent(
             nameof(ScaleChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ImageSelectionToolbar));
 
+        // 用于向后兼容 - 暴露内部 Border 以便 partial class 访问
+        public Border BorderSelectionControl => BorderImageSelectionControl;
+
+        // 暴露 Margin 属性以便 MW_ElementsControls.cs 设置位置
+        public Thickness ControlMargin
+        {
+            get => BorderImageSelectionControl.Margin;
+            set => BorderImageSelectionControl.Margin = value;
+        }
+
+        // 暴露 Child 属性以便 MW_AutoTheme.cs 访问
+        public UIElement ControlChild
+        {
+            get => BorderImageSelectionControl.Child;
+        }
+
+        // 暴露 InvalidateVisual 方法以便 MW_AutoTheme.cs 调用
+        public void InvalidateVisualOnControl()
+        {
+            BorderImageSelectionControl.InvalidateVisual();
+        }
+
         public object SelectedImage
         {
             get => GetValue(SelectedImageProperty);
             set => SetValue(SelectedImageProperty, value);
         }
 
-        public new Visibility IsVisible
+        public new Visibility Visibility
+        {
+            get => (Visibility)GetValue(VisibilityProperty);
+            set => SetValue(VisibilityProperty, value);
+        }
+
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            get => (Visibility)GetValue(IsVisibleProperty);
-            set => SetValue(IsVisibleProperty, value);
+            if (d is ImageSelectionToolbar toolbar)
+            {
+                toolbar.BorderImageSelectionControl.Visibility = (Visibility)e.NewValue;
+            }
         }
 
         public event RoutedEventHandler CloneRequested
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml
index 4e6c5b53..47d79971 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml	
@@ -3,18 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              x:Name="Root">
-    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Margin="6,0,0,6" Height="50"
-             HorizontalAlignment="Left" VerticalAlignment="Bottom">
-        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnLBBorder"
+    <Viewbox x:Name="ViewboxPPTNavigationBottomLeft" Height="50">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" x:Name="PPTBtnLBBorderElement"
                 Background="#f4f4f5" Opacity="1" CornerRadius="6">
             <ikw:SimpleStackPanel Orientation="Horizontal">
                 <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                        Name="PPTLBPreviousButtonBorder"
+                        x:Name="PPTLBPreviousButtonBorderElement"
                         MouseDown="GridPPTControlPrevious_MouseDown"
                         MouseLeave="GridPPTControlPrevious_MouseLeave"
                         CornerRadius="5 5 0 0" Background="Transparent">
                     <Grid>
-                        <Border Margin="3" CornerRadius="5" Name="PPTLBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="3" CornerRadius="5" x:Name="PPTLBPreviousButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <Image Height="28" Width="28">
                             <Image.Source>
@@ -22,7 +21,7 @@
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                             <GeometryDrawing Brush="#27272a"
-                                                             x:Name="PPTLBPreviousButtonGeometry"
+                                                             x:Name="PPTLBPreviousButtonGeometryElement"
                                                              Geometry="{StaticResource PPTLBPreviousButtonGeometry}" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
@@ -31,12 +30,12 @@
                         </Image>
                     </Grid>
                 </Border>
-                <Border Visibility="Visible" Name="PPTLBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
+                <Border Visibility="Visible" x:Name="PPTLBPageButtonElement" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                         MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                         MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                         Background="Transparent">
                     <Grid>
-                        <Border Margin="0,3" CornerRadius="5" Name="PPTLBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="0,3" CornerRadius="5" x:Name="PPTLBPageButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                              Spacing="0.5" Margin="12,0">
@@ -51,9 +50,9 @@
                 </Border>
                 <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                         MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTLBNextButtonBorder">
+                        CornerRadius="0 0 5 5" Background="Transparent" x:Name="PPTLBNextButtonBorderElement">
                     <Grid>
-                        <Border Margin="3" CornerRadius="5" Name="PPTLBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="3" CornerRadius="5" x:Name="PPTLBNextButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                Width="28">
@@ -62,7 +61,7 @@
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                             <GeometryDrawing Brush="#27272a"
-                                                             x:Name="PPTLBNextButtonGeometry"
+                                                             x:Name="PPTLBNextButtonGeometryElement"
                                                              Geometry="{StaticResource PPTLBNextButtonGeometry}" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs
index d8286160..56149b6f 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomLeft.xaml.cs	
@@ -9,10 +9,10 @@ namespace Ink_Canvas.MainWindow_controls
     public partial class PPTNavigationBottomLeft : UserControl
     {
         public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
-            nameof(CurrentPage), typeof(int), typeof(PPTNavigationBottomLeft), new PropertyMetadata(1));
+            nameof(CurrentPage), typeof(string), typeof(PPTNavigationBottomLeft), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
-            nameof(TotalPages), typeof(int), typeof(PPTNavigationBottomLeft), new PropertyMetadata(1));
+            nameof(TotalPages), typeof(string), typeof(PPTNavigationBottomLeft), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
             nameof(IsVisible), typeof(bool), typeof(PPTNavigationBottomLeft), new PropertyMetadata(true));
@@ -26,15 +26,46 @@ public partial class PPTNavigationBottomLeft : UserControl
         public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
             nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomLeft));
 
-        public int CurrentPage
+        public Border BorderSelectionControl => PPTBtnLBBorderElement;
+
+        public Thickness ControlMargin
+        {
+            get => Margin;
+            set => Margin = value;
+        }
+
+        public UIElement ControlChild => ViewboxPPTNavigationBottomLeft;
+
+        public void InvalidateVisualOnControl()
+        {
+            PPTBtnLBBorderElement.InvalidateVisual();
+        }
+
+        public new Visibility Visibility
+        {
+            get => base.Visibility;
+            set => base.Visibility = value;
+        }
+
+        public Border PPTBtnLBBorder => PPTBtnLBBorderElement;
+        public Border PPTLBPreviousButtonBorder => PPTLBPreviousButtonBorderElement;
+        public Border PPTLBPreviousButtonFeedbackBorder => PPTLBPreviousButtonFeedbackBorderElement;
+        public GeometryDrawing PPTLBPreviousButtonGeometry => PPTLBPreviousButtonGeometryElement;
+        public Border PPTLBPageButton => PPTLBPageButtonElement;
+        public Border PPTLBPageButtonFeedbackBorder => PPTLBPageButtonFeedbackBorderElement;
+        public Border PPTLBNextButtonBorder => PPTLBNextButtonBorderElement;
+        public Border PPTLBNextButtonFeedbackBorder => PPTLBNextButtonFeedbackBorderElement;
+        public GeometryDrawing PPTLBNextButtonGeometry => PPTLBNextButtonGeometryElement;
+
+        public string CurrentPage
         {
-            get => (int)GetValue(CurrentPageProperty);
+            get => (string)GetValue(CurrentPageProperty);
             set => SetValue(CurrentPageProperty, value);
         }
 
-        public int TotalPages
+        public string TotalPages
         {
-            get => (int)GetValue(TotalPagesProperty);
+            get => (string)GetValue(TotalPagesProperty);
             set => SetValue(TotalPagesProperty, value);
         }
 
@@ -69,49 +100,49 @@ public PPTNavigationBottomLeft()
 
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTLBPreviousButtonFeedbackBorder.Opacity = 1;
+            PPTLBPreviousButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
+            PPTLBPreviousButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
+            PPTLBPreviousButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
         }
 
         private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTLBPageButtonFeedbackBorder.Opacity = 1;
+            PPTLBPageButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            PPTLBPageButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            PPTLBPageButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
         }
 
         private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTLBNextButtonFeedbackBorder.Opacity = 1;
+            PPTLBNextButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTLBNextButtonFeedbackBorder.Opacity = 0;
+            PPTLBNextButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTLBNextButtonFeedbackBorder.Opacity = 0;
+            PPTLBNextButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
         }
     }
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml
index 88df2feb..e4ae0b92 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml	
@@ -3,18 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              x:Name="Root">
-    <Viewbox Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}" Margin="0,0,6,6" Height="50"
-             HorizontalAlignment="Right" VerticalAlignment="Bottom">
-        <Border BorderThickness="1" BorderBrush="#a1a1aa" Name="PPTBtnRBBorder"
+    <Viewbox x:Name="ViewboxPPTNavigationBottomRight" Height="50">
+        <Border BorderThickness="1" BorderBrush="#a1a1aa" x:Name="PPTBtnRBBorderElement"
                 Background="#f4f4f5" Opacity="1" CornerRadius="6">
             <ikw:SimpleStackPanel Orientation="Horizontal">
                 <Border Width="50" Height="50" MouseUp="GridPPTControlPrevious_MouseUp" Style="{StaticResource PPTPreviousButtonBorderBase}"
-                        Name="PPTRBPreviousButtonBorder"
+                        x:Name="PPTRBPreviousButtonBorderElement"
                         MouseDown="GridPPTControlPrevious_MouseDown"
                         MouseLeave="GridPPTControlPrevious_MouseLeave"
                         CornerRadius="5 5 0 0" Background="Transparent">
                     <Grid>
-                        <Border Margin="3" CornerRadius="5" Name="PPTRBPreviousButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="3" CornerRadius="5" x:Name="PPTRBPreviousButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <Image Height="28" Width="28">
                             <Image.Source>
@@ -22,7 +21,7 @@
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                             <GeometryDrawing Brush="#27272a"
-                                                             x:Name="PPTRBPreviousButtonGeometry"
+                                                             x:Name="PPTRBPreviousButtonGeometryElement"
                                                              Geometry="{StaticResource PPTRBPreviousButtonGeometry}" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
@@ -31,12 +30,12 @@
                         </Image>
                     </Grid>
                 </Border>
-                <Border Visibility="Visible" Name="PPTRBPageButton" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
+                <Border Visibility="Visible" x:Name="PPTRBPageButtonElement" TextBlock.Foreground="#171717" Style="{StaticResource PPTPageButtonBase}"
                         MouseUp="PPTNavigationBtn_MouseUp" MouseDown="PPTNavigationBtn_MouseDown"
                         MouseLeave="PPTNavigationBtn_MouseLeave" Width="auto" MinWidth="50" Height="50"
                         Background="Transparent">
                     <Grid>
-                        <Border Margin="0,3" CornerRadius="5" Name="PPTRBPageButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="0,3" CornerRadius="5" x:Name="PPTRBPageButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
                                              Spacing="0.5" Margin="12,0">
@@ -51,9 +50,9 @@
                 </Border>
                 <Border Width="50" Height="50" MouseUp="GridPPTControlNext_MouseUp" Style="{StaticResource PPTNextButtonBorderBase}"
                         MouseDown="GridPPTControlNext_MouseDown" MouseLeave="GridPPTControlNext_MouseLeave"
-                        CornerRadius="0 0 5 5" Background="Transparent" Name="PPTRBNextButtonBorder">
+                        CornerRadius="0 0 5 5" Background="Transparent" x:Name="PPTRBNextButtonBorderElement">
                     <Grid>
-                        <Border Margin="3" CornerRadius="5" Name="PPTRBNextButtonFeedbackBorder" Style="{StaticResource PPTButtonFeedbackBorderBase}"
+                        <Border Margin="3" CornerRadius="5" x:Name="PPTRBNextButtonFeedbackBorderElement" Style="{StaticResource PPTButtonFeedbackBorderBase}"
                                 Background="#18181b" Opacity="0" />
                         <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28"
                                Width="28">
@@ -62,7 +61,7 @@
                                     <DrawingImage.Drawing>
                                         <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
                                             <GeometryDrawing Brush="#27272a"
-                                                             x:Name="PPTRBNextButtonGeometry"
+                                                             x:Name="PPTRBNextButtonGeometryElement"
                                                              Geometry="{StaticResource PPTRBNextButtonGeometry}" />
                                         </DrawingGroup>
                                     </DrawingImage.Drawing>
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs
index 8915dc9e..f0dd6907 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationBottomRight.xaml.cs	
@@ -2,16 +2,17 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Ink_Canvas.MainWindow_controls
 {
     public partial class PPTNavigationBottomRight : UserControl
     {
         public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
-            nameof(CurrentPage), typeof(int), typeof(PPTNavigationBottomRight), new PropertyMetadata(1));
+            nameof(CurrentPage), typeof(string), typeof(PPTNavigationBottomRight), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
-            nameof(TotalPages), typeof(int), typeof(PPTNavigationBottomRight), new PropertyMetadata(1));
+            nameof(TotalPages), typeof(string), typeof(PPTNavigationBottomRight), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
             nameof(IsVisible), typeof(bool), typeof(PPTNavigationBottomRight), new PropertyMetadata(true));
@@ -25,15 +26,46 @@ public partial class PPTNavigationBottomRight : UserControl
         public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
             nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationBottomRight));
 
-        public int CurrentPage
+        public Border BorderSelectionControl => PPTBtnRBBorderElement;
+
+        public Thickness ControlMargin
+        {
+            get => Margin;
+            set => Margin = value;
+        }
+
+        public UIElement ControlChild => ViewboxPPTNavigationBottomRight;
+
+        public void InvalidateVisualOnControl()
+        {
+            PPTBtnRBBorderElement.InvalidateVisual();
+        }
+
+        public new Visibility Visibility
+        {
+            get => base.Visibility;
+            set => base.Visibility = value;
+        }
+
+        public Border PPTBtnRBBorder => PPTBtnRBBorderElement;
+        public Border PPTRBPreviousButtonBorder => PPTRBPreviousButtonBorderElement;
+        public Border PPTRBPreviousButtonFeedbackBorder => PPTRBPreviousButtonFeedbackBorderElement;
+        public GeometryDrawing PPTRBPreviousButtonGeometry => PPTRBPreviousButtonGeometryElement;
+        public Border PPTRBPageButton => PPTRBPageButtonElement;
+        public Border PPTRBPageButtonFeedbackBorder => PPTRBPageButtonFeedbackBorderElement;
+        public Border PPTRBNextButtonBorder => PPTRBNextButtonBorderElement;
+        public Border PPTRBNextButtonFeedbackBorder => PPTRBNextButtonFeedbackBorderElement;
+        public GeometryDrawing PPTRBNextButtonGeometry => PPTRBNextButtonGeometryElement;
+
+        public string CurrentPage
         {
-            get => (int)GetValue(CurrentPageProperty);
+            get => (string)GetValue(CurrentPageProperty);
             set => SetValue(CurrentPageProperty, value);
         }
 
-        public int TotalPages
+        public string TotalPages
         {
-            get => (int)GetValue(TotalPagesProperty);
+            get => (string)GetValue(TotalPagesProperty);
             set => SetValue(TotalPagesProperty, value);
         }
 
@@ -68,49 +100,49 @@ public PPTNavigationBottomRight()
 
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTRBPreviousButtonFeedbackBorder.Opacity = 1;
+            PPTRBPreviousButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
+            PPTRBPreviousButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
+            PPTRBPreviousButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(PreviousClickedEvent, this));
         }
 
         private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTRBPageButtonFeedbackBorder.Opacity = 1;
+            PPTRBPageButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTRBPageButtonFeedbackBorder.Opacity = 0;
+            PPTRBPageButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTRBPageButtonFeedbackBorder.Opacity = 0;
+            PPTRBPageButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(PageClickedEvent, this));
         }
 
         private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PPTRBNextButtonFeedbackBorder.Opacity = 1;
+            PPTRBNextButtonFeedbackBorderElement.Opacity = 1;
         }
 
         private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
         {
-            PPTRBNextButtonFeedbackBorder.Opacity = 0;
+            PPTRBNextButtonFeedbackBorderElement.Opacity = 0;
         }
 
         private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PPTRBNextButtonFeedbackBorder.Opacity = 0;
+            PPTRBNextButtonFeedbackBorderElement.Opacity = 0;
             RaiseEvent(new RoutedEventArgs(NextClickedEvent, this));
         }
     }
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs
index 5a58437b..2b1c84e0 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideLeft.xaml.cs	
@@ -2,6 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Ink_Canvas.MainWindow_controls
 {
@@ -66,6 +67,53 @@ public PPTNavigationSideLeft()
             InitializeComponent();
         }
 
+        private Border ContainerBorderElement => (Border)FindName("PPTBtnLSBorder");
+        private Border PreviousButtonFeedbackBorderElement => (Border)FindName("PPTLSPreviousButtonFeedbackBorder");
+        private GeometryDrawing PreviousButtonGeometryElement => (GeometryDrawing)FindName("PPTLSPreviousButtonGeometry");
+        private Border PageButtonElement => (Border)FindName("PPTLSPageButton");
+        private Border PageButtonFeedbackBorderElement => (Border)FindName("PPTLSPageButtonFeedbackBorder");
+        private Border NextButtonFeedbackBorderElement => (Border)FindName("PPTLSNextButtonFeedbackBorder");
+        private GeometryDrawing NextButtonGeometryElement => (GeometryDrawing)FindName("PPTLSNextButtonGeometry");
+        private TextBlock CurrentPageTextElement => (TextBlock)FindName("PPTBtnPageNow");
+        private TextBlock TotalPagesTextElement => (TextBlock)FindName("PPTBtnPageTotal");
+
+        public Thickness ControlMargin
+        {
+            get => Margin;
+            set => Margin = value;
+        }
+
+        public void SetPageDisplay(string currentPage, string totalPages)
+        {
+            CurrentPageTextElement.Text = currentPage;
+            TotalPagesTextElement.Text = $"/ {totalPages}";
+        }
+
+        public void SetPageButtonVisibility(Visibility visibility)
+        {
+            PageButtonElement.Visibility = visibility;
+        }
+
+        public void SetContainerOpacity(double opacity)
+        {
+            ContainerBorderElement.Opacity = opacity;
+        }
+
+        public void ApplyTheme(Brush backgroundBrush, Brush borderBrush, Brush foregroundBrush, Brush feedbackBrush)
+        {
+            ContainerBorderElement.Background = backgroundBrush;
+            ContainerBorderElement.BorderBrush = borderBrush;
+
+            PreviousButtonGeometryElement.Brush = foregroundBrush;
+            NextButtonGeometryElement.Brush = foregroundBrush;
+
+            PreviousButtonFeedbackBorderElement.Background = feedbackBrush;
+            PageButtonFeedbackBorderElement.Background = feedbackBrush;
+            NextButtonFeedbackBorderElement.Background = feedbackBrush;
+
+            TextBlock.SetForeground(PageButtonElement, foregroundBrush);
+        }
+
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
         {
             PPTLSPreviousButtonFeedbackBorder.Opacity = 1;
diff --git a/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs
index 750b9d97..0d28644d 100644
--- a/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PPTNavigationSideRight.xaml.cs	
@@ -2,16 +2,17 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Ink_Canvas.MainWindow_controls
 {
     public partial class PPTNavigationSideRight : UserControl
     {
         public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register(
-            nameof(CurrentPage), typeof(int), typeof(PPTNavigationSideRight), new PropertyMetadata(1));
+            nameof(CurrentPage), typeof(string), typeof(PPTNavigationSideRight), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty TotalPagesProperty = DependencyProperty.Register(
-            nameof(TotalPages), typeof(int), typeof(PPTNavigationSideRight), new PropertyMetadata(1));
+            nameof(TotalPages), typeof(string), typeof(PPTNavigationSideRight), new PropertyMetadata("1"));
 
         public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
             nameof(IsVisible), typeof(bool), typeof(PPTNavigationSideRight), new PropertyMetadata(true));
@@ -25,15 +26,68 @@ public partial class PPTNavigationSideRight : UserControl
         public static readonly RoutedEvent PageClickedEvent = EventManager.RegisterRoutedEvent(
             nameof(PageClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PPTNavigationSideRight));
 
-        public int CurrentPage
+        private Border ContainerBorderElement => (Border)FindName("PPTBtnRSBorder");
+        private Border PreviousButtonFeedbackBorderElement => (Border)FindName("PPTRSPreviousButtonFeedbackBorder");
+        private GeometryDrawing PreviousButtonGeometryElement => (GeometryDrawing)FindName("PPTRSPreviousButtonGeometry");
+        private Border PageButtonElement => (Border)FindName("PPTRSPageButton");
+        private Border PageButtonFeedbackBorderElement => (Border)FindName("PPTRSPageButtonFeedbackBorder");
+        private Border NextButtonFeedbackBorderElement => (Border)FindName("PPTRSNextButtonFeedbackBorder");
+        private GeometryDrawing NextButtonGeometryElement => (GeometryDrawing)FindName("PPTRSNextButtonGeometry");
+
+        public Border ContainerBorder => ContainerBorderElement;
+        public Border PreviousButtonFeedbackBorder => PreviousButtonFeedbackBorderElement;
+        public GeometryDrawing PreviousButtonGeometry => PreviousButtonGeometryElement;
+        public Border PageButton => PageButtonElement;
+        public Border PageButtonFeedbackBorder => PageButtonFeedbackBorderElement;
+        public Border NextButtonFeedbackBorder => NextButtonFeedbackBorderElement;
+        public GeometryDrawing NextButtonGeometry => NextButtonGeometryElement;
+
+        public Thickness ControlMargin
+        {
+            get => Margin;
+            set => Margin = value;
+        }
+
+        public void SetPageDisplay(string currentPage, string totalPages)
+        {
+            CurrentPage = currentPage;
+            TotalPages = totalPages;
+        }
+
+        public void SetPageButtonVisibility(Visibility visibility)
+        {
+            PageButtonElement.Visibility = visibility;
+        }
+
+        public void SetContainerOpacity(double opacity)
+        {
+            ContainerBorderElement.Opacity = opacity;
+        }
+
+        public void ApplyTheme(Brush backgroundBrush, Brush borderBrush, Brush foregroundBrush, Brush feedbackBrush)
+        {
+            ContainerBorderElement.Background = backgroundBrush;
+            ContainerBorderElement.BorderBrush = borderBrush;
+
+            PreviousButtonGeometryElement.Brush = foregroundBrush;
+            NextButtonGeometryElement.Brush = foregroundBrush;
+
+            PreviousButtonFeedbackBorderElement.Background = feedbackBrush;
+            PageButtonFeedbackBorderElement.Background = feedbackBrush;
+            NextButtonFeedbackBorderElement.Background = feedbackBrush;
+
+            TextBlock.SetForeground(PageButtonElement, foregroundBrush);
+        }
+
+        public string CurrentPage
         {
-            get => (int)GetValue(CurrentPageProperty);
+            get => (string)GetValue(CurrentPageProperty);
             set => SetValue(CurrentPageProperty, value);
         }
 
-        public int TotalPages
+        public string TotalPages
         {
-            get => (int)GetValue(TotalPagesProperty);
+            get => (string)GetValue(TotalPagesProperty);
             set => SetValue(TotalPagesProperty, value);
         }
 
diff --git a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml
index 12fa1663..d31f14c8 100644
--- a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml	
+++ b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml	
@@ -4,7 +4,10 @@
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
              x:Name="Root">
-    <Grid>
+    <Border x:Name="BorderPenColorPaletteSelectionControl"
+            Background="Transparent"
+            BorderThickness="0">
+        <Grid>
         <!-- Board Version -->
         <Viewbox x:Name="BoardDefaultPenColorsPanel"
                 Visibility="{Binding IsBoardMode, ElementName=Root, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Collapsed}"
@@ -401,5 +404,6 @@
                 </Border>
             </ikw:SimpleStackPanel>
         </Viewbox>
-    </Grid>
+        </Grid>
+    </Border>
 </UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs
index ded2efa6..05c460e7 100644
--- a/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PenColorPalette.xaml.cs	
@@ -12,6 +12,9 @@ public partial class PenColorPalette : UserControl
         public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(
             nameof(SelectedColor), typeof(Color), typeof(PenColorPalette), new PropertyMetadata(Colors.Black));
 
+        public static readonly DependencyProperty SelectedColorCodeProperty = DependencyProperty.Register(
+            nameof(SelectedColorCode), typeof(int), typeof(PenColorPalette), new PropertyMetadata(0, OnSelectedColorCodeChanged));
+
         public static readonly DependencyProperty ColorPaletteProperty = DependencyProperty.Register(
             nameof(ColorPalette), typeof(ObservableCollection<Color>), typeof(PenColorPalette), 
             new PropertyMetadata(new ObservableCollection<Color>()));
@@ -19,6 +22,13 @@ public partial class PenColorPalette : UserControl
         public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
             nameof(IsBoardMode), typeof(bool), typeof(PenColorPalette), new PropertyMetadata(false));
 
+        public static readonly DependencyProperty UseLightThemeColorsProperty = DependencyProperty.Register(
+            nameof(UseLightThemeColors), typeof(bool), typeof(PenColorPalette), new PropertyMetadata(false, OnUseLightThemeColorsChanged));
+
+        public static new readonly DependencyProperty VisibilityProperty = DependencyProperty.Register(
+            nameof(Visibility), typeof(Visibility), typeof(PenColorPalette),
+            new FrameworkPropertyMetadata(Visibility.Visible, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnVisibilityChanged));
+
         public static readonly RoutedEvent ColorSelectedEvent = EventManager.RegisterRoutedEvent(
             nameof(ColorSelected), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenColorPalette));
 
@@ -31,6 +41,12 @@ public Color SelectedColor
             set => SetValue(SelectedColorProperty, value);
         }
 
+        public int SelectedColorCode
+        {
+            get => (int)GetValue(SelectedColorCodeProperty);
+            set => SetValue(SelectedColorCodeProperty, value);
+        }
+
         public ObservableCollection<Color> ColorPalette
         {
             get => (ObservableCollection<Color>)GetValue(ColorPaletteProperty);
@@ -43,6 +59,28 @@ public bool IsBoardMode
             set => SetValue(IsBoardModeProperty, value);
         }
 
+        public bool UseLightThemeColors
+        {
+            get => (bool)GetValue(UseLightThemeColorsProperty);
+            set => SetValue(UseLightThemeColorsProperty, value);
+        }
+
+        public Border BorderSelectionControl => BorderPenColorPaletteSelectionControl;
+
+        public Thickness ControlMargin
+        {
+            get => BorderPenColorPaletteSelectionControl.Margin;
+            set => BorderPenColorPaletteSelectionControl.Margin = value;
+        }
+
+        public UIElement ControlChild => BorderPenColorPaletteSelectionControl.Child;
+
+        public new Visibility Visibility
+        {
+            get => (Visibility)GetValue(VisibilityProperty);
+            set => SetValue(VisibilityProperty, value);
+        }
+
         public event RoutedEventHandler ColorSelected
         {
             add => AddHandler(ColorSelectedEvent, value);
@@ -58,6 +96,47 @@ public event RoutedEventHandler ThemeSwitchClicked
         public PenColorPalette()
         {
             InitializeComponent();
+            UpdateThemeVisuals(UseLightThemeColors);
+            UpdateSelectionIndicators(SelectedColorCode);
+        }
+
+        public void InvalidateVisualOnControl()
+        {
+            BorderPenColorPaletteSelectionControl.InvalidateVisual();
+        }
+
+        public void SetSelectedColorCode(int colorCode)
+        {
+            SelectedColorCode = colorCode;
+        }
+
+        public void SetUseLightThemeColors(bool useLightThemeColors)
+        {
+            UseLightThemeColors = useLightThemeColors;
+        }
+
+        private static void OnSelectedColorCodeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenColorPalette palette)
+            {
+                palette.UpdateSelectionIndicators((int)e.NewValue);
+            }
+        }
+
+        private static void OnUseLightThemeColorsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenColorPalette palette)
+            {
+                palette.UpdateThemeVisuals((bool)e.NewValue);
+            }
+        }
+
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenColorPalette palette)
+            {
+                palette.BorderPenColorPaletteSelectionControl.Visibility = (Visibility)e.NewValue;
+            }
         }
 
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)
@@ -71,56 +150,205 @@ private void ColorThemeSwitch_MouseUp(object sender, MouseButtonEventArgs e)
 
         private void BtnColorBlack_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = Colors.Black;
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(0, Colors.Black);
         }
 
         private void BtnColorWhite_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = Colors.White;
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(5, Colors.White);
         }
 
         private void BtnColorRed_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#dc2626");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(1, GetCurrentPaletteColor(PaletteColor.Red));
         }
 
         private void BtnColorYellow_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#eab308");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(4, GetCurrentPaletteColor(PaletteColor.Yellow));
         }
 
         private void BtnColorGreen_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#16a34a");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(2, GetCurrentPaletteColor(PaletteColor.Green));
         }
 
         private void BtnColorBlue_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#2563eb");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(3, GetCurrentPaletteColor(PaletteColor.Blue));
         }
 
         private void BtnColorPink_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#db2777");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(6, GetCurrentPaletteColor(PaletteColor.Pink));
         }
 
         private void BtnColorTeal_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#0d9488");
-            RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
+            SelectColor(7, GetCurrentPaletteColor(PaletteColor.Teal));
         }
 
         private void BtnColorOrange_Click(object sender, MouseButtonEventArgs e)
         {
-            SelectedColor = (Color)ColorConverter.ConvertFromString("#ea580c");
+            SelectColor(8, GetCurrentPaletteColor(PaletteColor.Orange));
+        }
+
+        private void SelectColor(int colorCode, Color color)
+        {
+            SelectedColor = color;
+            SelectedColorCode = colorCode;
             RaiseEvent(new RoutedEventArgs(ColorSelectedEvent, this));
         }
+
+        private void UpdateThemeVisuals(bool useLightThemeColors)
+        {
+            ColorThemeSwitchIcon.Source = CreateThemeIcon(useLightThemeColors);
+            BoardColorThemeSwitchIcon.Source = CreateThemeIcon(useLightThemeColors);
+
+            string switchText = useLightThemeColors ? "暗系" : "亮系";
+            ColorThemeSwitchTextBlock.Text = switchText;
+            BoardColorThemeSwitchTextBlock.Text = switchText;
+
+            ApplyPaletteColor(BorderPenColorRed, BoardBorderPenColorRed, PaletteColor.Red, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorGreen, BoardBorderPenColorGreen, PaletteColor.Green, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorBlue, BoardBorderPenColorBlue, PaletteColor.Blue, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorYellow, BoardBorderPenColorYellow, PaletteColor.Yellow, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorPink, BoardBorderPenColorPink, PaletteColor.Pink, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorTeal, BoardBorderPenColorTeal, PaletteColor.Teal, useLightThemeColors);
+            ApplyPaletteColor(BorderPenColorOrange, BoardBorderPenColorOrange, PaletteColor.Orange, useLightThemeColors);
+        }
+
+        private void UpdateSelectionIndicators(int colorCode)
+        {
+            foreach (var indicator in GetAllIndicators())
+            {
+                indicator.Visibility = Visibility.Collapsed;
+            }
+
+            switch (colorCode)
+            {
+                case 0:
+                    ViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    break;
+                case 1:
+                    ViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    break;
+                case 2:
+                    ViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    break;
+                case 3:
+                    ViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    break;
+                case 4:
+                    ViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    break;
+                case 5:
+                    ViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    break;
+                case 6:
+                    ViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
+                    break;
+                case 7:
+                    ViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    break;
+                case 8:
+                    ViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    BoardViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    break;
+            }
+        }
+
+        private Viewbox[] GetAllIndicators()
+        {
+            return new[]
+            {
+                ViewboxBtnColorBlackContent,
+                ViewboxBtnColorWhiteContent,
+                ViewboxBtnColorRedContent,
+                ViewboxBtnColorYellowContent,
+                ViewboxBtnColorGreenContent,
+                ViewboxBtnColorBlueContent,
+                ViewboxBtnColorPinkContent,
+                ViewboxBtnColorTealContent,
+                ViewboxBtnColorOrangeContent,
+                BoardViewboxBtnColorBlackContent,
+                BoardViewboxBtnColorWhiteContent,
+                BoardViewboxBtnColorRedContent,
+                BoardViewboxBtnColorYellowContent,
+                BoardViewboxBtnColorGreenContent,
+                BoardViewboxBtnColorBlueContent,
+                BoardViewboxBtnColorPinkContent,
+                BoardViewboxBtnColorTealContent,
+                BoardViewboxBtnColorOrangeContent,
+            };
+        }
+
+        private static ImageSource CreateThemeIcon(bool useLightThemeColors)
+        {
+            string uri = useLightThemeColors
+                ? "/Resources/Icons-Fluent/ic_fluent_weather_moon_24_regular.png"
+                : "/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png";
+
+            var imageSource = new System.Windows.Media.Imaging.BitmapImage();
+            imageSource.BeginInit();
+            imageSource.UriSource = new Uri(uri, UriKind.RelativeOrAbsolute);
+            imageSource.EndInit();
+            return imageSource;
+        }
+
+        private void ApplyPaletteColor(Border desktopBorder, Border boardBorder, PaletteColor paletteColor, bool useLightThemeColors)
+        {
+            Color color = GetPaletteColor(paletteColor, useLightThemeColors);
+            var brush = new SolidColorBrush(color);
+            desktopBorder.Background = brush;
+            boardBorder.Background = brush.Clone();
+        }
+
+        private Color GetCurrentPaletteColor(PaletteColor paletteColor)
+        {
+            return GetPaletteColor(paletteColor, UseLightThemeColors);
+        }
+
+        private static Color GetPaletteColor(PaletteColor paletteColor, bool useLightThemeColors)
+        {
+            switch (paletteColor)
+            {
+                case PaletteColor.Red:
+                    return useLightThemeColors ? Color.FromRgb(239, 68, 68) : Color.FromRgb(220, 38, 38);
+                case PaletteColor.Green:
+                    return useLightThemeColors ? Color.FromRgb(34, 197, 94) : Color.FromRgb(22, 163, 74);
+                case PaletteColor.Blue:
+                    return useLightThemeColors ? Color.FromRgb(59, 130, 246) : Color.FromRgb(37, 99, 235);
+                case PaletteColor.Yellow:
+                    return useLightThemeColors ? Color.FromRgb(250, 204, 21) : Color.FromRgb(234, 179, 8);
+                case PaletteColor.Pink:
+                    return useLightThemeColors ? Color.FromRgb(236, 72, 153) : Color.FromRgb(147, 51, 234);
+                case PaletteColor.Teal:
+                    return useLightThemeColors ? Color.FromRgb(20, 184, 166) : Color.FromRgb(13, 148, 136);
+                case PaletteColor.Orange:
+                    return useLightThemeColors ? Color.FromRgb(249, 115, 22) : Color.FromRgb(234, 88, 12);
+                default:
+                    return Colors.Black;
+            }
+        }
+
+        private enum PaletteColor
+        {
+            Red,
+            Green,
+            Blue,
+            Yellow,
+            Pink,
+            Teal,
+            Orange,
+        }
     }
 }
diff --git a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml
index 9d237525..8c4f192c 100644
--- a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml	
+++ b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml	
@@ -4,202 +4,224 @@
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
              xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
+             xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
              x:Name="Root">
-    <Border Background="{DynamicResource FloatBarBackground}"
-            Opacity="1" BorderBrush="#2563eb"
-            BorderThickness="1" CornerRadius="8"
-            Margin="-160,-200,-33,32">
-        <ikw:SimpleStackPanel Margin="0,-20,0,0">
-            <!-- Header with tab buttons -->
-            <Border BorderBrush="#1e3a8a" Height="32" BorderThickness="0,0,0,1"
-                    CornerRadius="8,8,0,0" Background="#2563eb"
-                    Margin="-1,-1,-1,0" Padding="1,1,1,0">
-                <ikw:SimpleStackPanel Orientation="Vertical" VerticalAlignment="Center">
-                    <ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="8,0,0,0" Spacing="2">
-                        <!-- Default Pen Tab -->
-                        <Border x:Name="DefaultPenTabButton"
-                                MouseDown="SwitchToDefaultPen"
-                                Background="#48dbeafe" Height="20" Width="36"
-                                CornerRadius="3">
-                            <Canvas>
-                                <ikw:SimpleStackPanel x:Name="DefaultPenTabButtonIndicator"
-                                    Visibility="Visible"
-                                    Orientation="Horizontal"
-                                    Canvas.Left="9" Canvas.Right="9" Canvas.Bottom="0">
-                                    <Border Width="18" Height="2"
-                                        Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
+    <ikw:SimpleStackPanel>
+        <Border BorderBrush="#1e3a8a" Height="32" BorderThickness="0,0,0,1"
+                CornerRadius="8,8,0,0" Background="#2563eb"
+                Margin="-1,-1,-1,0" Padding="1,1,1,0">
+            <ikw:SimpleStackPanel Orientation="Vertical" VerticalAlignment="Center">
+                <ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="8,0,0,0" Spacing="2">
+                    <Border x:Name="DefaultPenTabButton"
+                            MouseDown="SwitchToDefaultPen"
+                            Background="#48dbeafe" Height="20" Width="36"
+                            CornerRadius="3">
+                        <Canvas>
+                            <ikw:SimpleStackPanel x:Name="DefaultPenTabButtonIndicator"
+                                Visibility="Visible"
+                                Orientation="Horizontal"
+                                Canvas.Left="9" Canvas.Right="9" Canvas.Bottom="0">
+                                <Border Width="18" Height="2"
+                                    Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
+                            </ikw:SimpleStackPanel>
+                            <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="36">
+                                <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
+                                    HorizontalAlignment="Center" Margin="0,3">
+                                    <Image Source="/Resources/new-icons/pen-white.png"
+                                        RenderOptions.BitmapScalingMode="HighQuality"
+                                        Height="13" Width="13" />
+                                    <TextBlock x:Name="DefaultPenTabButtonText"
+                                        Foreground="White" FontWeight="Medium"
+                                        FontSize="9" TextAlignment="Center"
+                                        Text="{i18n:I18n Key=Board_Pen}" Margin="2,1,0,0" />
                                 </ikw:SimpleStackPanel>
-                                <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="36">
-                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
-                                        HorizontalAlignment="Center" Margin="0,3">
-                                        <Image Source="/Resources/new-icons/pen-white.png"
-                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                            Height="13" Width="13" />
-                                        <TextBlock x:Name="DefaultPenTabButtonText"
-                                            Foreground="White" FontWeight="Medium"
-                                            FontSize="9" TextAlignment="Center"
-                                            Text="画笔" Margin="2,1,0,0" />
-                                    </ikw:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </Canvas>
+                    </Border>
+                    <Border x:Name="HighlightPenTabButton"
+                            MouseDown="SwitchToHighlighterPen"
+                            Background="Transparent" Height="20" Width="52"
+                            CornerRadius="3">
+                        <Canvas>
+                            <ikw:SimpleStackPanel Visibility="Collapsed"
+                                x:Name="HighlightPenTabButtonIndicator"
+                                Orientation="Horizontal" Canvas.Left="14" Canvas.Right="14" Canvas.Bottom="0">
+                                <Border Width="24" Height="2"
+                                    Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
+                            </ikw:SimpleStackPanel>
+                            <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="52">
+                                <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
+                                    HorizontalAlignment="Center" Margin="0,3">
+                                    <Image Source="/Resources/new-icons/highlighter-white.png"
+                                        RenderOptions.BitmapScalingMode="HighQuality"
+                                        Height="13" Width="13" />
+                                    <TextBlock x:Name="HighlightPenTabButtonText"
+                                        Foreground="White" FontWeight="Medium"
+                                        FontSize="9" TextAlignment="Center"
+                                        Text="{i18n:I18n Key=Board_Highlighter}" Margin="2,1,0,0" Width="35"
+                                        Style="{StaticResource AutoFitPenTabLabel9}" />
                                 </ikw:SimpleStackPanel>
-                            </Canvas>
-                        </Border>
-                        <!-- Highlighter Pen Tab -->
-                        <Border x:Name="HighlightPenTabButton"
-                                MouseDown="SwitchToHighlighterPen"
-                                Background="Transparent" Height="20" Width="52"
-                                CornerRadius="3">
-                            <Canvas>
-                                <ikw:SimpleStackPanel Visibility="Collapsed"
-                                    x:Name="HighlightPenTabButtonIndicator"
-                                    Orientation="Horizontal" Canvas.Left="14" Canvas.Right="14" Canvas.Bottom="0">
-                                    <Border Width="24" Height="2"
-                                        Background="{DynamicResource FloatBarBackground}" CornerRadius="1" />
-                                </ikw:SimpleStackPanel>
-                                <ikw:SimpleStackPanel Orientation="Vertical" Height="20" Width="52">
-                                    <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Horizontal"
-                                        HorizontalAlignment="Center" Margin="0,3">
-                                        <Image Source="/Resources/new-icons/highlighter-white.png"
-                                            RenderOptions.BitmapScalingMode="HighQuality"
-                                            Height="13" Width="13" />
-                                        <TextBlock x:Name="HighlightPenTabButtonText"
-                                            Foreground="White" FontWeight="Medium"
-                                            FontSize="9" TextAlignment="Center"
-                                            Text="荧光笔" Margin="2,1,0,0" Width="35" />
-                                    </ikw:SimpleStackPanel>
-                                </ikw:SimpleStackPanel>
-                            </Canvas>
-                        </Border>
-                        <!-- Close button -->
-                        <Image Margin="66,0,0,0"
-                               Source="/Resources/new-icons/close-white.png"
-                               RenderOptions.BitmapScalingMode="HighQuality"
-                               Height="16" Width="16"
-                               MouseDown="Border_MouseDown"
-                               MouseUp="CloseBordertools_MouseUp" />
-                    </ikw:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </Canvas>
+                    </Border>
+                    <Image Margin="66,0,0,0"
+                           Source="/Resources/new-icons/close-white.png"
+                           RenderOptions.BitmapScalingMode="HighQuality"
+                           Height="16" Width="16"
+                           MouseDown="Border_MouseDown"
+                           MouseUp="CloseBordertools_MouseUp" />
                 </ikw:SimpleStackPanel>
-            </Border>
+            </ikw:SimpleStackPanel>
+        </Border>
 
-            <!-- Default Pen Props Panel -->
-            <Viewbox x:Name="DefaultPenPropsPanel" Visibility="Collapsed"
-                     Margin="12,8,12,0" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" Stretch="Fill">
-                <ikw:SimpleStackPanel>
-                    <ikw:SimpleStackPanel Orientation="Horizontal" Height="35" Margin="0,0,0,8">
-                        <Label Content="笔锋" Margin="0,0,6,0"
-                               Foreground="{DynamicResource FloatBarForeground}"
-                               FontSize="16" FontWeight="Bold"
-                               VerticalAlignment="Center" />
-                        <ComboBox Height="30" VerticalAlignment="Center"
-                            x:Name="ComboBoxPenStyle"
-                            FontFamily="Microsoft YaHei UI"
-                            SelectedIndex="1"
-                            SelectionChanged="ComboBoxPenStyle_SelectionChanged">
-                            <ComboBoxItem Content="实时笔锋" FontFamily="Microsoft YaHei UI" />
-                            <ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI" />
-                            <ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI" />
-                            <ComboBoxItem Content="关闭笔锋" FontFamily="Microsoft YaHei UI" />
-                        </ComboBox>
+        <Viewbox x:Name="DefaultPenPropsPanel" Visibility="Collapsed"
+                 Margin="12,8,12,0" HorizontalAlignment="Center"
+                 VerticalAlignment="Center" Stretch="Fill">
+            <ikw:SimpleStackPanel>
+                <ikw:SimpleStackPanel Orientation="Horizontal" Height="35" Margin="0,0,0,8">
+                    <Label Content="笔锋" Margin="0,0,6,0"
+                           Foreground="{DynamicResource FloatBarForeground}"
+                           FontSize="16" FontWeight="Bold"
+                           VerticalAlignment="Center" />
+                    <ComboBox Height="30" VerticalAlignment="Center"
+                        x:Name="ComboBoxPenStyle"
+                        FontFamily="Microsoft YaHei UI"
+                        SelectedIndex="1"
+                        SelectionChanged="ComboBoxPenStyle_SelectionChanged">
+                        <ComboBoxItem Content="实时笔锋" FontFamily="Microsoft YaHei UI" />
+                        <ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI" />
+                        <ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI" />
+                        <ComboBoxItem Content="关闭笔锋" FontFamily="Microsoft YaHei UI" />
+                    </ComboBox>
+                </ikw:SimpleStackPanel>
+                <Controls:UniformGrid Columns="3" Width="300" Height="55">
+                    <ikw:SimpleStackPanel x:Name="NibModeSimpleStackPanel"
+                        Orientation="Horizontal" Width="100">
+                        <Label Content="笔尖模式" FontSize="12" VerticalAlignment="Center" />
+                        <ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode"
+                            MinWidth="0" FontFamily="Microsoft YaHei UI"
+                            Width="80" Margin="10,0,0,0"
+                            Toggled="ToggleSwitchEnableNibMode_Toggled"
+                            IsOn="True" />
                     </ikw:SimpleStackPanel>
-                    <Controls:UniformGrid Columns="3" Width="300" Height="55">
-                        <ikw:SimpleStackPanel x:Name="NibModeSimpleStackPanel"
-                            Orientation="Horizontal" Width="100">
-                            <Label Content="笔尖模式" FontSize="12" VerticalAlignment="Center" />
-                            <ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode"
-                                MinWidth="0" FontFamily="Microsoft YaHei UI"
-                                Width="80" Margin="10,0,0,0"
-                                Toggled="ToggleSwitchEnableNibMode_Toggled"
-                                IsOn="True" />
-                        </ikw:SimpleStackPanel>
-                        <ikw:SimpleStackPanel Orientation="Horizontal" Width="100">
-                            <Label Margin="0,0,10,0" Content="墨迹纠正"
-                                Foreground="{DynamicResource FloatBarForeground}"
-                                FontSize="12" VerticalAlignment="Center" />
-                            <ui:ToggleSwitch x:Name="ToggleSwitchEnableInkToShape"
-                                Foreground="{DynamicResource FloatBarForeground}"
-                                FontFamily="Microsoft YaHei UI" Width="80"
-                                Toggled="ToggleSwitchEnableInkToShape_Toggled"
-                                MinWidth="0" />
-                        </ikw:SimpleStackPanel>
-                        <ikw:SimpleStackPanel Orientation="Horizontal"
-                            Width="100" x:Name="InkFadeControlPanel">
-                            <Label Margin="0,0,10,0" Content="墨迹渐隐"
-                                Foreground="{DynamicResource FloatBarForeground}"
-                                FontSize="12" VerticalAlignment="Center" />
-                            <ui:ToggleSwitch x:Name="ToggleSwitchInkFade"
-                                Foreground="{DynamicResource FloatBarForeground}"
-                                FontFamily="Microsoft YaHei UI" Width="90"
-                                Toggled="ToggleSwitchInkFade_Toggled"
-                                MinWidth="0" IsOn="False" />
-                        </ikw:SimpleStackPanel>
-                    </Controls:UniformGrid>
+                    <ikw:SimpleStackPanel Orientation="Horizontal" Width="100">
+                        <Label Margin="0,0,10,0" Content="墨迹纠正"
+                            Foreground="{DynamicResource FloatBarForeground}"
+                            FontSize="12" VerticalAlignment="Center" />
+                        <ui:ToggleSwitch x:Name="ToggleSwitchEnableInkToShape"
+                            Foreground="{DynamicResource FloatBarForeground}"
+                            FontFamily="Microsoft YaHei UI" Width="80"
+                            Toggled="ToggleSwitchEnableInkToShape_Toggled"
+                            MinWidth="0" />
+                    </ikw:SimpleStackPanel>
+                    <ikw:SimpleStackPanel Orientation="Horizontal"
+                        Width="100" x:Name="InkFadeControlPanel">
+                        <Label Margin="0,0,10,0" Content="墨迹渐隐"
+                            Foreground="{DynamicResource FloatBarForeground}"
+                            FontSize="12" VerticalAlignment="Center" />
+                        <ui:ToggleSwitch x:Name="ToggleSwitchInkFade"
+                            Foreground="{DynamicResource FloatBarForeground}"
+                            FontFamily="Microsoft YaHei UI" Width="90"
+                            Toggled="ToggleSwitchInkFade_Toggled"
+                            MinWidth="0" IsOn="False" />
+                    </ikw:SimpleStackPanel>
+                </Controls:UniformGrid>
 
-                    <StackPanel Orientation="Horizontal" Height="30">
-                        <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
-                               Foreground="{DynamicResource FloatBarForeground}"
-                               FontSize="17" VerticalAlignment="Center" />
-                        <Slider x:Name="InkWidthSlider" Minimum="1"
-                                Maximum="20" Width="200" FontFamily="Microsoft YaHei UI"
-                                FontSize="20" IsSnapToTickEnabled="True"
-                                Value="5" TickFrequency="0.1" TickPlacement="None"
-                                ValueChanged="InkWidthSlider_ValueChanged" />
-                        <TextBlock Width="36" TextAlignment="Right"
-                            Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
-                            FontFamily="Consolas" VerticalAlignment="Center"
-                            Margin="10,0,0,0" FontSize="15" />
-                        <Button x:Name="BrushModeButton" Width="24" Height="24" Margin="8,0,0,0"
-                                Style="{StaticResource NavButton}"
-                                VerticalAlignment="Center"
-                                Click="BrushModeButton_Click"
-                                ToolTip="板刷模式">
-                            <Viewbox Margin="4" Stretch="Uniform">
-                                <Path x:Name="BrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill">
-                                    <Path.Data>
-                                        <PathGeometry Figures="M6.7812 6.9375C6.81411 7.06468 6.87172 7.18413 6.95081 7.28903C7.0299 7.39392 7.12891 7.4822 7.24213 7.54882C7.47058 7.68347 7.74313 7.72187 7.99989 7.65557C8.25664 7.58928 8.47657 7.42372 8.61128 7.19531L11.9238 1.57031C12.0584 1.34186 12.0968 1.06928 12.0305 0.812526C11.9642 0.555772 11.7987 0.335869 11.5703 0.201167C11.3418 0.0665197 11.0693 0.028121 10.8125 0.0944166C10.5558 0.160712 10.3358 0.326268 10.2011 0.554683L6.88862 6.17968C6.82183 6.29276 6.77796 6.41788 6.75953 6.54791C6.7411 6.67793 6.74847 6.81031 6.7812 6.9375Z M5.21875 5.09375L10.1662 8.14759C10.7697 8.46231 10.9861 9.26072 10.3308 9.74464L9.70892 9.96117L3.6897 6.43971L3.7074 5.53239C3.99623 4.94715 4.46209 4.71653 5.21875 5.09375Z M3.05377 7.48846L9.04364 10.9631L7.99908 12.5052C7.77811 12.7482 7.86648 13.0797 8.08746 13.2123L9.03766 14.0298H3.66809C1.47755 14.0298 0.471255 11.9653 1.52466 10.1408L3.05377 7.48846Z" />
-                                    </Path.Data>
-                                </Path>
-                            </Viewbox>
-                        </Button>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Height="30">
-                        <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold"
-                               Foreground="{DynamicResource FloatBarForeground}"
-                               FontSize="17" VerticalAlignment="Center" />
-                        <Slider x:Name="InkAlphaSlider" Margin="0,0,0,0"
-                                Minimum="1" Maximum="255" Width="200"
-                                FontFamily="Microsoft YaHei UI" FontSize="20"
-                                IsSnapToTickEnabled="True" Value="255"
-                                TickFrequency="1" TickPlacement="None"
-                                ValueChanged="InkAlphaSlider_ValueChanged" />
-                        <TextBlock Width="36" TextAlignment="Right"
-                            Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}"
-                            FontFamily="Consolas" VerticalAlignment="Center"
-                            Margin="10,0,0,0" FontSize="15" />
-                    </StackPanel>
-                </ikw:SimpleStackPanel>
-            </Viewbox>
+                <StackPanel Orientation="Horizontal" Height="30">
+                    <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
+                           Foreground="{DynamicResource FloatBarForeground}"
+                           FontSize="17" VerticalAlignment="Center" />
+                    <Slider x:Name="InkWidthSlider" Minimum="1"
+                            Maximum="20" Width="200" FontFamily="Microsoft YaHei UI"
+                            FontSize="20" IsSnapToTickEnabled="True"
+                            Value="5" TickFrequency="0.1" TickPlacement="None"
+                            ValueChanged="InkWidthSlider_ValueChanged">
+                        <Slider.Style>
+                            <Style TargetType="Slider">
+                                <Setter Property="Width" Value="200" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsBoardMode, ElementName=Root}" Value="True">
+                                        <Setter Property="Width" Value="208" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Slider.Style>
+                    </Slider>
+                    <TextBlock Width="36" TextAlignment="Right"
+                        Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
+                        FontFamily="Consolas" VerticalAlignment="Center"
+                        Margin="10,0,0,0" FontSize="15" />
+                    <Button x:Name="BrushModeButton" Width="24" Height="24" Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Click="BrushModeButton_Click"
+                            ToolTip="板刷模式">
+                        <Button.Style>
+                            <Style TargetType="Button" BasedOn="{StaticResource NavButton}">
+                                <Setter Property="Visibility" Value="Visible" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsBoardMode, ElementName=Root}" Value="True">
+                                        <Setter Property="Visibility" Value="Collapsed" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Button.Style>
+                        <Viewbox Margin="4" Stretch="Uniform">
+                            <Path x:Name="BrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill">
+                                <Path.Data>
+                                    <PathGeometry Figures="M6.7812 6.9375C6.81411 7.06468 6.87172 7.18413 6.95081 7.28903C7.0299 7.39392 7.12891 7.4822 7.24213 7.54882C7.47058 7.68347 7.74313 7.72187 7.99989 7.65557C8.25664 7.58928 8.47657 7.42372 8.61128 7.19531L11.9238 1.57031C12.0584 1.34186 12.0968 1.06928 12.0305 0.812526C11.9642 0.555772 11.7987 0.335869 11.5703 0.201167C11.3418 0.0665197 11.0693 0.028121 10.8125 0.0944166C10.5558 0.160712 10.3358 0.326268 10.2011 0.554683L6.88862 6.17968C6.82183 6.29276 6.77796 6.41788 6.75953 6.54791C6.7411 6.67793 6.74847 6.81031 6.7812 6.9375Z M5.21875 5.09375L10.1662 8.14759C10.7697 8.46231 10.9861 9.26072 10.3308 9.74464L9.70892 9.96117L3.6897 6.43971L3.7074 5.53239C3.99623 4.94715 4.46209 4.71653 5.21875 5.09375Z M3.05377 7.48846L9.04364 10.9631L7.99908 12.5052C7.77811 12.7482 7.86648 13.0797 8.08746 13.2123L9.03766 14.0298H3.66809C1.47755 14.0298 0.471255 11.9653 1.52466 10.1408L3.05377 7.48846Z" />
+                                </Path.Data>
+                            </Path>
+                        </Viewbox>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Height="30">
+                    <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold"
+                           Foreground="{DynamicResource FloatBarForeground}"
+                           FontSize="17" VerticalAlignment="Center" />
+                    <Slider x:Name="InkAlphaSlider" Margin="0,0,0,0"
+                            Minimum="1" Maximum="255" Width="200"
+                            FontFamily="Microsoft YaHei UI" FontSize="20"
+                            IsSnapToTickEnabled="True" Value="255"
+                            TickFrequency="1" TickPlacement="None"
+                            ValueChanged="InkAlphaSlider_ValueChanged">
+                        <Slider.Style>
+                            <Style TargetType="Slider">
+                                <Setter Property="Width" Value="200" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsBoardMode, ElementName=Root}" Value="True">
+                                        <Setter Property="Width" Value="208" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Slider.Style>
+                    </Slider>
+                    <TextBlock Width="36" TextAlignment="Right"
+                        Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}"
+                        FontFamily="Consolas" VerticalAlignment="Center"
+                        Margin="10,0,0,0" FontSize="15" />
+                </StackPanel>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
 
-            <!-- Highlighter Pen Props Panel -->
-            <Viewbox x:Name="HighlighterPenPropsPanel" Visibility="Collapsed"
-                     Margin="12,8,12,0" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" Stretch="Fill">
-                <ikw:SimpleStackPanel>
-                    <StackPanel Orientation="Horizontal" Height="30">
-                        <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
-                               Foreground="{DynamicResource FloatBarForeground}"
-                               FontSize="17" VerticalAlignment="Center" />
-                        <Slider x:Name="HighlighterWidthSlider" Minimum="15"
-                                Maximum="45" Width="208"
-                                FontFamily="Microsoft YaHei UI" FontSize="20"
-                                IsSnapToTickEnabled="True" Value="20"
-                                TickFrequency="1" TickPlacement="None"
-                                ValueChanged="HighlighterWidthSlider_ValueChanged" />
-                        <TextBlock Text="{Binding Value, ElementName=HighlighterWidthSlider, Mode=OneWay}"
-                            FontFamily="Consolas" VerticalAlignment="Bottom"
-                            Margin="10,0,0,4.5" FontSize="15" />
-                    </StackPanel>
-                </ikw:SimpleStackPanel>
-            </Viewbox>
-        </ikw:SimpleStackPanel>
-    </Border>
+        <Viewbox x:Name="HighlighterPenPropsPanel" Visibility="Visible"
+                 Margin="12,8,12,0" HorizontalAlignment="Center"
+                 VerticalAlignment="Center" Stretch="Fill">
+            <ikw:SimpleStackPanel>
+                <StackPanel Orientation="Horizontal" Height="30">
+                    <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold"
+                           Foreground="{DynamicResource FloatBarForeground}"
+                           FontSize="17" VerticalAlignment="Center" />
+                    <Slider x:Name="HighlighterWidthSlider" Minimum="15"
+                            Maximum="45" Width="208"
+                            FontFamily="Microsoft YaHei UI" FontSize="20"
+                            IsSnapToTickEnabled="True" Value="20"
+                            TickFrequency="1" TickPlacement="None"
+                            ValueChanged="HighlighterWidthSlider_ValueChanged" />
+                    <TextBlock Text="{Binding Value, ElementName=HighlighterWidthSlider, Mode=OneWay}"
+                        FontFamily="Consolas" VerticalAlignment="Bottom"
+                        Margin="10,0,0,4.5" FontSize="15" />
+                </StackPanel>
+            </ikw:SimpleStackPanel>
+        </Viewbox>
+    </ikw:SimpleStackPanel>
 </UserControl>
diff --git a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs
index 5ef0db6e..c2074c53 100644
--- a/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/PenSettingsPanel.xaml.cs	
@@ -3,35 +3,41 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Ink_Canvas.MainWindow_controls
 {
     public partial class PenSettingsPanel : UserControl
     {
+        private bool _isSynchronizingControls;
+
         public static readonly DependencyProperty PenWidthProperty = DependencyProperty.Register(
-            nameof(PenWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(5.0));
+            nameof(PenWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(5.0, OnPenWidthChanged));
 
         public static readonly DependencyProperty PenAlphaProperty = DependencyProperty.Register(
-            nameof(PenAlpha), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(255.0));
+            nameof(PenAlpha), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(255.0, OnPenAlphaChanged));
 
         public static readonly DependencyProperty HighlighterWidthProperty = DependencyProperty.Register(
-            nameof(HighlighterWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(20.0));
+            nameof(HighlighterWidth), typeof(double), typeof(PenSettingsPanel), new PropertyMetadata(20.0, OnHighlighterWidthChanged));
 
         public static readonly DependencyProperty IsNibModeEnabledProperty = DependencyProperty.Register(
-            nameof(IsNibModeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(true));
+            nameof(IsNibModeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(true, OnIsNibModeEnabledChanged));
 
         public static readonly DependencyProperty IsInkFadeEnabledProperty = DependencyProperty.Register(
-            nameof(IsInkFadeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(false));
+            nameof(IsInkFadeEnabled), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(false, OnIsInkFadeEnabledChanged));
 
         public static readonly DependencyProperty IsBoardModeProperty = DependencyProperty.Register(
             nameof(IsBoardMode), typeof(bool), typeof(PenSettingsPanel), new PropertyMetadata(false));
 
         public static readonly DependencyProperty SelectedPenTypeProperty = DependencyProperty.Register(
-            nameof(SelectedPenType), typeof(int), typeof(PenSettingsPanel), new PropertyMetadata(0));
+            nameof(SelectedPenType), typeof(int), typeof(PenSettingsPanel), new PropertyMetadata(0, OnSelectedPenTypeChanged));
 
         public static readonly RoutedEvent PenTypeChangedEvent = EventManager.RegisterRoutedEvent(
             nameof(PenTypeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
 
+        public static readonly RoutedEvent PenStyleChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(PenStyleChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
         public static readonly RoutedEvent WidthChangedEvent = EventManager.RegisterRoutedEvent(
             nameof(WidthChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
 
@@ -44,6 +50,15 @@ public partial class PenSettingsPanel : UserControl
         public static readonly RoutedEvent InkFadeChangedEvent = EventManager.RegisterRoutedEvent(
             nameof(InkFadeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
 
+        public static readonly RoutedEvent InkToShapeChangedEvent = EventManager.RegisterRoutedEvent(
+            nameof(InkToShapeChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent BrushModeClickedEvent = EventManager.RegisterRoutedEvent(
+            nameof(BrushModeClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
+        public static readonly RoutedEvent CloseRequestedEvent = EventManager.RegisterRoutedEvent(
+            nameof(CloseRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PenSettingsPanel));
+
         public double PenWidth
         {
             get => (double)GetValue(PenWidthProperty);
@@ -92,6 +107,12 @@ public event RoutedEventHandler PenTypeChanged
             remove => RemoveHandler(PenTypeChangedEvent, value);
         }
 
+        public event RoutedEventHandler PenStyleChanged
+        {
+            add => AddHandler(PenStyleChangedEvent, value);
+            remove => RemoveHandler(PenStyleChangedEvent, value);
+        }
+
         public event RoutedEventHandler WidthChanged
         {
             add => AddHandler(WidthChangedEvent, value);
@@ -116,9 +137,254 @@ public event RoutedEventHandler InkFadeChanged
             remove => RemoveHandler(InkFadeChangedEvent, value);
         }
 
+        public event RoutedEventHandler InkToShapeChanged
+        {
+            add => AddHandler(InkToShapeChangedEvent, value);
+            remove => RemoveHandler(InkToShapeChangedEvent, value);
+        }
+
+        public event RoutedEventHandler BrushModeClicked
+        {
+            add => AddHandler(BrushModeClickedEvent, value);
+            remove => RemoveHandler(BrushModeClickedEvent, value);
+        }
+
+        public event RoutedEventHandler CloseRequested
+        {
+            add => AddHandler(CloseRequestedEvent, value);
+            remove => RemoveHandler(CloseRequestedEvent, value);
+        }
+
+        public Slider InkWidthSliderControl => InkWidthSlider;
+
+        public Slider InkAlphaSliderControl => InkAlphaSlider;
+
+        public Slider HighlighterWidthSliderControl => HighlighterWidthSlider;
+
+        public FrameworkElement NibModePanel => NibModeSimpleStackPanel;
+
+        public FrameworkElement InkFadePanel => InkFadeControlPanel;
+
+        public int PenStyleSelectedIndex
+        {
+            get => ComboBoxPenStyle?.SelectedIndex ?? -1;
+            set
+            {
+                if (ComboBoxPenStyle != null && ComboBoxPenStyle.SelectedIndex != value)
+                {
+                    SynchronizeControls(() => ComboBoxPenStyle.SelectedIndex = value);
+                }
+            }
+        }
+
+        public bool IsInkToShapeEnabled
+        {
+            get => ToggleSwitchEnableInkToShape?.IsOn ?? false;
+            set
+            {
+                if (ToggleSwitchEnableInkToShape != null && ToggleSwitchEnableInkToShape.IsOn != value)
+                {
+                    SynchronizeControls(() => ToggleSwitchEnableInkToShape.IsOn = value);
+                }
+            }
+        }
+
+        public Visibility NibModePanelVisibility
+        {
+            get => NibModeSimpleStackPanel.Visibility;
+            set => NibModeSimpleStackPanel.Visibility = value;
+        }
+
+        public Visibility InkFadePanelVisibility
+        {
+            get => InkFadeControlPanel.Visibility;
+            set => InkFadeControlPanel.Visibility = value;
+        }
+
         public PenSettingsPanel()
         {
             InitializeComponent();
+            ApplyStateToControls();
+        }
+
+        public void SetPenTypeVisualState(int penType)
+        {
+            if (SelectedPenType != penType)
+            {
+                SelectedPenType = penType;
+                return;
+            }
+
+            UpdatePenTypeVisualState();
+        }
+
+        public void SetBrushModeActive(bool isActive)
+        {
+            if (BrushModeButton == null)
+            {
+                return;
+            }
+
+            if (isActive)
+            {
+                BrushModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
+            }
+            else
+            {
+                BrushModeButton.ClearValue(BackgroundProperty);
+            }
+        }
+
+        private static void OnPenWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.ApplyPenWidthToControl((double)e.NewValue);
+            }
+        }
+
+        private static void OnPenAlphaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.ApplyPenAlphaToControl((double)e.NewValue);
+            }
+        }
+
+        private static void OnHighlighterWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.ApplyHighlighterWidthToControl((double)e.NewValue);
+            }
+        }
+
+        private static void OnIsNibModeEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.ApplyNibModeToControl((bool)e.NewValue);
+            }
+        }
+
+        private static void OnIsInkFadeEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.ApplyInkFadeToControl((bool)e.NewValue);
+            }
+        }
+
+        private static void OnSelectedPenTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PenSettingsPanel panel)
+            {
+                panel.UpdatePenTypeVisualState();
+            }
+        }
+
+        private void ApplyStateToControls()
+        {
+            ApplyPenWidthToControl(PenWidth);
+            ApplyPenAlphaToControl(PenAlpha);
+            ApplyHighlighterWidthToControl(HighlighterWidth);
+            ApplyNibModeToControl(IsNibModeEnabled);
+            ApplyInkFadeToControl(IsInkFadeEnabled);
+            UpdatePenTypeVisualState();
+        }
+
+        private void ApplyPenWidthToControl(double value)
+        {
+            if (InkWidthSlider == null || AreClose(InkWidthSlider.Value, value))
+            {
+                return;
+            }
+
+            SynchronizeControls(() => InkWidthSlider.Value = value);
+        }
+
+        private void ApplyPenAlphaToControl(double value)
+        {
+            if (InkAlphaSlider == null || AreClose(InkAlphaSlider.Value, value))
+            {
+                return;
+            }
+
+            SynchronizeControls(() => InkAlphaSlider.Value = value);
+        }
+
+        private void ApplyHighlighterWidthToControl(double value)
+        {
+            if (HighlighterWidthSlider == null || AreClose(HighlighterWidthSlider.Value, value))
+            {
+                return;
+            }
+
+            SynchronizeControls(() => HighlighterWidthSlider.Value = value);
+        }
+
+        private void ApplyNibModeToControl(bool value)
+        {
+            if (ToggleSwitchEnableNibMode == null || ToggleSwitchEnableNibMode.IsOn == value)
+            {
+                return;
+            }
+
+            SynchronizeControls(() => ToggleSwitchEnableNibMode.IsOn = value);
+        }
+
+        private void ApplyInkFadeToControl(bool value)
+        {
+            if (ToggleSwitchInkFade == null || ToggleSwitchInkFade.IsOn == value)
+            {
+                return;
+            }
+
+            SynchronizeControls(() => ToggleSwitchInkFade.IsOn = value);
+        }
+
+        private void UpdatePenTypeVisualState()
+        {
+            bool isDefaultPen = SelectedPenType != 1;
+
+            DefaultPenPropsPanel.Visibility = isDefaultPen ? Visibility.Visible : Visibility.Collapsed;
+            HighlighterPenPropsPanel.Visibility = isDefaultPen ? Visibility.Collapsed : Visibility.Visible;
+
+            DefaultPenTabButton.Opacity = isDefaultPen ? 1 : 0.9;
+            DefaultPenTabButtonText.FontWeight = isDefaultPen ? FontWeights.Bold : FontWeights.Normal;
+            DefaultPenTabButtonText.FontSize = isDefaultPen ? 9.5 : 9;
+            DefaultPenTabButtonText.Margin = isDefaultPen ? new Thickness(2, 0.5, 0, 0) : new Thickness(2, 1, 0, 0);
+            DefaultPenTabButton.Background = isDefaultPen
+                ? new SolidColorBrush(Color.FromArgb(72, 219, 234, 254))
+                : new SolidColorBrush(Colors.Transparent);
+            DefaultPenTabButtonIndicator.Visibility = isDefaultPen ? Visibility.Visible : Visibility.Collapsed;
+
+            HighlightPenTabButton.Opacity = isDefaultPen ? 0.9 : 1;
+            HighlightPenTabButtonText.FontWeight = isDefaultPen ? FontWeights.Normal : FontWeights.Bold;
+            HighlightPenTabButtonText.FontSize = isDefaultPen ? 9 : 9.5;
+            HighlightPenTabButtonText.Margin = isDefaultPen ? new Thickness(2, 1, 0, 0) : new Thickness(2, 0.5, 0, 0);
+            HighlightPenTabButton.Background = isDefaultPen
+                ? new SolidColorBrush(Colors.Transparent)
+                : new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
+            HighlightPenTabButtonIndicator.Visibility = isDefaultPen ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        private void SynchronizeControls(Action action)
+        {
+            _isSynchronizingControls = true;
+            try
+            {
+                action();
+            }
+            finally
+            {
+                _isSynchronizingControls = false;
+            }
+        }
+
+        private static bool AreClose(double left, double right)
+        {
+            return Math.Abs(left - right) < 0.001;
         }
 
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)
@@ -127,7 +393,7 @@ private void Border_MouseDown(object sender, MouseButtonEventArgs e)
 
         private void CloseBordertools_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+            RaiseEvent(new RoutedEventArgs(CloseRequestedEvent, this));
         }
 
         private void SwitchToDefaultPen(object sender, MouseButtonEventArgs e)
@@ -144,47 +410,87 @@ private void SwitchToHighlighterPen(object sender, MouseButtonEventArgs e)
 
         private void ComboBoxPenStyle_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
+            RaiseEvent(new RoutedEventArgs(PenStyleChangedEvent, this));
         }
 
         private void ToggleSwitchEnableNibMode_Toggled(object sender, RoutedEventArgs e)
         {
             IsNibModeEnabled = ToggleSwitchEnableNibMode.IsOn;
+
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
             RaiseEvent(new RoutedEventArgs(NibModeChangedEvent, this));
         }
 
         private void ToggleSwitchEnableInkToShape_Toggled(object sender, RoutedEventArgs e)
         {
-            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
+            RaiseEvent(new RoutedEventArgs(InkToShapeChangedEvent, this));
         }
 
         private void ToggleSwitchInkFade_Toggled(object sender, RoutedEventArgs e)
         {
             IsInkFadeEnabled = ToggleSwitchInkFade.IsOn;
+
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
             RaiseEvent(new RoutedEventArgs(InkFadeChangedEvent, this));
         }
 
         private void InkWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             PenWidth = InkWidthSlider.Value;
+
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
             RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
         }
 
         private void InkAlphaSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             PenAlpha = InkAlphaSlider.Value;
+
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
             RaiseEvent(new RoutedEventArgs(AlphaChangedEvent, this));
         }
 
         private void HighlighterWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             HighlighterWidth = HighlighterWidthSlider.Value;
+
+            if (_isSynchronizingControls)
+            {
+                return;
+            }
+
             RaiseEvent(new RoutedEventArgs(WidthChangedEvent, this));
         }
 
         private void BrushModeButton_Click(object sender, RoutedEventArgs e)
         {
-            RaiseEvent(new RoutedEventArgs(PenTypeChangedEvent, this));
+            RaiseEvent(new RoutedEventArgs(BrushModeClickedEvent, this));
         }
     }
 }
diff --git a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml
index b42c473a..f0b09b36 100644
--- a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml	
+++ b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml	
@@ -7,7 +7,6 @@
             HorizontalAlignment="Left" VerticalAlignment="Top" Margin="800,900,0,0"
             CornerRadius="5" Height="80"
             Background="{DynamicResource FloatBarBackground}"
-            Visibility="{Binding IsVisible, ElementName=Root, Mode=TwoWay}"
             BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
         <Viewbox Margin="0,-2.5">
             <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
diff --git a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs
index 44a91e75..e820be66 100644
--- a/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs	
+++ b/Ink Canvas/MainWindow_controls/StrokeSelectionToolbar.xaml.cs	
@@ -11,8 +11,9 @@ public partial class StrokeSelectionToolbar : UserControl
         public static readonly DependencyProperty SelectedStrokesProperty = DependencyProperty.Register(
             nameof(SelectedStrokes), typeof(object), typeof(StrokeSelectionToolbar), new PropertyMetadata(null));
 
-        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
-            nameof(IsVisible), typeof(Visibility), typeof(StrokeSelectionToolbar), new PropertyMetadata(Visibility.Collapsed));
+        public static new readonly DependencyProperty VisibilityProperty = DependencyProperty.Register(
+            nameof(Visibility), typeof(Visibility), typeof(StrokeSelectionToolbar), 
+            new FrameworkPropertyMetadata(Visibility.Collapsed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnVisibilityChanged));
 
         public static readonly RoutedEvent CloneRequestedEvent = EventManager.RegisterRoutedEvent(
             nameof(CloneRequested), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
@@ -32,16 +33,44 @@ public partial class StrokeSelectionToolbar : UserControl
         public static readonly RoutedEvent WidthChangedEvent = EventManager.RegisterRoutedEvent(
             nameof(WidthChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(StrokeSelectionToolbar));
 
+        // 用于向后兼容 - 暴露内部 Border 以便 partial class 访问
+        public Border BorderSelectionControl => BorderStrokeSelectionControl;
+
         public object SelectedStrokes
         {
             get => GetValue(SelectedStrokesProperty);
             set => SetValue(SelectedStrokesProperty, value);
         }
 
-        public new Visibility IsVisible
+        public new Visibility Visibility
+        {
+            get => (Visibility)GetValue(VisibilityProperty);
+            set => SetValue(VisibilityProperty, value);
+        }
+
+        // 暴露 Margin 属性以便 MW_SelectionGestures.cs 设置位置
+        public Thickness ControlMargin
+        {
+            get => BorderStrokeSelectionControl.Margin;
+            set => BorderStrokeSelectionControl.Margin = value;
+        }
+
+        // 暴露 Child 属性以便 MW_AutoTheme.cs 访问
+        public UIElement ControlChild
+        {
+            get => BorderStrokeSelectionControl.Child;
+        }
+
+        // 暴露 InvalidateVisual 方法以便 MW_AutoTheme.cs 调用
+        public void InvalidateVisualOnControl()
+        {
+            BorderStrokeSelectionControl.InvalidateVisual();
+        }
+
+        // 暴露克隆按钮背景设置方法
+        public void SetCloneButtonBackground(Brush brush)
         {
-            get => (Visibility)GetValue(IsVisibleProperty);
-            set => SetValue(IsVisibleProperty, value);
+            BorderStrokeSelectionClone.Background = brush;
         }
 
         public event RoutedEventHandler CloneRequested
@@ -85,8 +114,17 @@ public StrokeSelectionToolbar()
             InitializeComponent();
         }
 
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is StrokeSelectionToolbar toolbar)
+            {
+                toolbar.BorderStrokeSelectionControl.Visibility = (Visibility)e.NewValue;
+            }
+        }
+
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)
         {
+            // 空处理 - 让事件冒泡以便 MW_SelectionGestures.cs 处理 lastBorderMouseDownObject
         }
 
         private void BorderStrokeSelectionClone_MouseUp(object sender, MouseButtonEventArgs e)
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs
index 0d7de4fe..e8ce63ce 100644
--- a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs	
@@ -148,8 +148,8 @@ await Dispatcher.InvokeAsync(() =>
 
             await Dispatcher.InvokeAsync(() =>
             {
-                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
+                BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
                 LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 GridForFloatingBarDraging.Visibility = Visibility.Collapsed;
@@ -415,16 +415,16 @@ await Dispatcher.InvokeAsync(() =>
                 {
                     var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
                     var dopsc = dops.ToCharArray();
-                    if (dopsc[0] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(LeftBottomPanelForPPTNavigation);
-                    if (dopsc[1] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightBottomPanelForPPTNavigation);
+                    if (dopsc[0] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(BorderPPTNavBottomLeft);
+                    if (dopsc[1] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(BorderPPTNavBottomRight);
                     if (dopsc[2] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation);
                     if (dopsc[3] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation);
                 }
                 else
                 {
                     // 如果条件不满足，确保隐藏翻页按钮
-                    LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                    RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
+                    BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
                     LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                     RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 }
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
index 06131fc5..03923728 100644
--- a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs	
@@ -443,11 +443,9 @@ private void RefreshStrokeSelectionIcons()
             {
                 if (BorderStrokeSelectionControl != null)
                 {
-                    // 强制刷新墨迹选中栏的视觉状态
-                    BorderStrokeSelectionControl.InvalidateVisual();
+                    BorderStrokeSelectionControl.InvalidateVisualOnControl();
 
-                    // 刷新墨迹选中栏内的所有图标
-                    var viewbox = BorderStrokeSelectionControl.Child as Viewbox;
+                    var viewbox = BorderStrokeSelectionControl.ControlChild as Viewbox;
                     if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
                     {
                         RefreshStrokeSelectionIconsRecursive(stackPanel);
@@ -501,11 +499,9 @@ private void RefreshImageSelectionIcons()
             {
                 if (BorderImageSelectionControl != null)
                 {
-                    // 强制刷新图片选中栏的视觉状态
-                    BorderImageSelectionControl.InvalidateVisual();
+                    BorderImageSelectionControl.InvalidateVisualOnControl();
 
-                    // 刷新图片选中栏内的所有图标
-                    var viewbox = BorderImageSelectionControl.Child as Viewbox;
+                    var viewbox = BorderImageSelectionControl.ControlChild as Viewbox;
                     if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
                     {
                         RefreshImageSelectionIconsRecursive(stackPanel);
diff --git a/Ink Canvas/MainWindow_cs/MW_Colors.cs b/Ink Canvas/MainWindow_cs/MW_Colors.cs
index 133d23c9..85d88ff8 100644
--- a/Ink Canvas/MainWindow_cs/MW_Colors.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Colors.cs	
@@ -279,203 +279,17 @@ private void CheckColorTheme(bool changeColorTheme = false)
                     inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(249, 115, 22);
             }
 
-            if (isUselightThemeColor)
-            {
-                // 亮系
-                // 亮色的红色
-                BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
-                BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
-                // 亮色的绿色
-                BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
-                BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
-                // 亮色的蓝色
-                BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
-                BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
-                // 亮色的黄色
-                BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
-                BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
-                // 亮色的粉色
-                BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
-                BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
-                // 亮色的Teal
-                BorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(20, 184, 166));
-                BoardBorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(20, 184, 166));
-                // 亮色的Orange
-                BorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(249, 115, 22));
-                BoardBorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(249, 115, 22));
-
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource = new Uri("/Resources/Icons-Fluent/ic_fluent_weather_moon_24_regular.png",
-                    UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                ColorThemeSwitchIcon.Source = newImageSource;
-                BoardColorThemeSwitchIcon.Source = newImageSource;
-
-                ColorThemeSwitchTextBlock.Text = "暗系";
-                BoardColorThemeSwitchTextBlock.Text = "暗系";
-            }
-            else
-            {
-                // 暗系
-                // 暗色的红色
-                BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
-                BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
-                // 暗色的绿色
-                BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
-                BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
-                // 暗色的蓝色
-                BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
-                BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
-                // 暗色的黄色
-                BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
-                BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
-                // 暗色的紫色对应亮色的粉色
-                BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
-                BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
-                // 暗色的Teal
-                BorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(13, 148, 136));
-                BoardBorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(13, 148, 136));
-                // 暗色的Orange
-                BorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(234, 88, 12));
-                BoardBorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(234, 88, 12));
-
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource = new Uri("/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png",
-                    UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                ColorThemeSwitchIcon.Source = newImageSource;
-                BoardColorThemeSwitchIcon.Source = newImageSource;
-
-                ColorThemeSwitchTextBlock.Text = "亮系";
-                BoardColorThemeSwitchTextBlock.Text = "亮系";
-            }
-
-            // 改变选中提示
-            ViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorPinkContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-
-            BoardViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorPinkContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-
-            HighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Collapsed;
-
-            BoardHighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Collapsed;
-
-            switch (inkColor)
-            {
-                case 0:
-                    ViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    break;
-                case 1:
-                    ViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    break;
-                case 2:
-                    ViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    break;
-                case 3:
-                    ViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    break;
-                case 4:
-                    ViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    break;
-                case 5:
-                    ViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    break;
-                case 6:
-                    ViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
-                    break;
-                case 7:
-                    ViewboxBtnColorTealContent.Visibility = Visibility.Visible;
-                    break;
-                case 8:
-                    ViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
-                    break;
-            }
-
-            switch (highlighterColor)
-            {
-                case 100:
-                    HighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    break;
-                case 101:
-                    HighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    break;
-                case 102:
-                    HighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    break;
-                case 103:
-                    HighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    break;
-                case 104:
-                    HighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    break;
-                case 105:
-                    HighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
-                    break;
-                case 106:
-                    HighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    break;
-                case 107:
-                    HighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
-                    break;
-                case 108:
-                    HighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
-                    break;
-                case 109:
-                    HighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
-                    break;
-            }
+            var penPalette = BorderPenColorPaletteControl as MainWindow_controls.PenColorPalette;
+            var boardPenPalette = BoardBorderPenColorPaletteControl as MainWindow_controls.PenColorPalette;
+            penPalette?.SetUseLightThemeColors(isUselightThemeColor);
+            boardPenPalette?.SetUseLightThemeColors(isUselightThemeColor);
+            penPalette?.SetSelectedColorCode(inkColor);
+            boardPenPalette?.SetSelectedColorCode(inkColor);
+
+            var highlighterPalette = (object)HighlighterPenColorsPanel as MainWindow_controls.HighlighterColorPalette;
+            var boardHighlighterPalette = (object)BoardHighlighterPenColorsPanel as MainWindow_controls.HighlighterColorPalette;
+            highlighterPalette?.SetSelectedColorCode(highlighterColor);
+            boardHighlighterPalette?.SetSelectedColorCode(highlighterColor);
 
             // 更新快捷调色盘选择指示器
             if (penType == 0)
@@ -520,39 +334,13 @@ private async void CheckPenTypeUIState()
         {
             if (penType == 0)
             {
-                DefaultPenPropsPanel.Visibility = Visibility.Visible;
-                DefaultPenColorsPanel.Visibility = Visibility.Visible;
+                BorderPenSettingsControl?.SetPenTypeVisualState(0);
+                BoardPenSettingsControl?.SetPenTypeVisualState(0);
+                BorderPenColorPaletteControl.Visibility = Visibility.Visible;
                 HighlighterPenColorsPanel.Visibility = Visibility.Collapsed;
-                HighlighterPenPropsPanel.Visibility = Visibility.Collapsed;
-                DefaultPenTabButton.Opacity = 1;
-                DefaultPenTabButtonText.FontWeight = FontWeights.Bold;
-                DefaultPenTabButtonText.Margin = new Thickness(2, 0.5, 0, 0);
-                DefaultPenTabButtonText.FontSize = 9.5;
-                DefaultPenTabButton.Background = new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
-                DefaultPenTabButtonIndicator.Visibility = Visibility.Visible;
-                HighlightPenTabButton.Opacity = 0.9;
-                HighlightPenTabButtonText.FontWeight = FontWeights.Normal;
-                HighlightPenTabButtonText.FontSize = 9;
-                HighlightPenTabButtonText.Margin = new Thickness(2, 1, 0, 0);
-                HighlightPenTabButton.Background = new SolidColorBrush(Colors.Transparent);
-                HighlightPenTabButtonIndicator.Visibility = Visibility.Collapsed;
-
-                BoardDefaultPenPropsPanel.Visibility = Visibility.Visible;
-                BoardDefaultPenColorsPanel.Visibility = Visibility.Visible;
+
+                BoardBorderPenColorPaletteControl.Visibility = Visibility.Visible;
                 BoardHighlighterPenColorsPanel.Visibility = Visibility.Collapsed;
-                BoardHighlighterPenPropsPanel.Visibility = Visibility.Collapsed;
-                BoardDefaultPenTabButton.Opacity = 1;
-                BoardDefaultPenTabButtonText.FontWeight = FontWeights.Bold;
-                BoardDefaultPenTabButtonText.Margin = new Thickness(2, 0.5, 0, 0);
-                BoardDefaultPenTabButtonText.FontSize = 9.5;
-                BoardDefaultPenTabButton.Background = new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
-                BoardDefaultPenTabButtonIndicator.Visibility = Visibility.Visible;
-                BoardHighlightPenTabButton.Opacity = 0.9;
-                BoardHighlightPenTabButtonText.FontWeight = FontWeights.Normal;
-                BoardHighlightPenTabButtonText.FontSize = 9;
-                BoardHighlightPenTabButtonText.Margin = new Thickness(2, 1, 0, 0);
-                BoardHighlightPenTabButton.Background = new SolidColorBrush(Colors.Transparent);
-                BoardHighlightPenTabButtonIndicator.Visibility = Visibility.Collapsed;
 
                 // PenPalette.Margin = new Thickness(-160, -200, -33, 32);
                 await Dispatcher.InvokeAsync(() =>
@@ -588,39 +376,13 @@ await Dispatcher.InvokeAsync(() =>
             }
             else if (penType == 1)
             {
-                DefaultPenPropsPanel.Visibility = Visibility.Collapsed;
-                DefaultPenColorsPanel.Visibility = Visibility.Collapsed;
+                BorderPenSettingsControl?.SetPenTypeVisualState(1);
+                BoardPenSettingsControl?.SetPenTypeVisualState(1);
+                BorderPenColorPaletteControl.Visibility = Visibility.Collapsed;
                 HighlighterPenColorsPanel.Visibility = Visibility.Visible;
-                HighlighterPenPropsPanel.Visibility = Visibility.Visible;
-                DefaultPenTabButton.Opacity = 0.9;
-                DefaultPenTabButtonText.FontWeight = FontWeights.Normal;
-                DefaultPenTabButtonText.FontSize = 9;
-                DefaultPenTabButtonText.Margin = new Thickness(2, 1, 0, 0);
-                DefaultPenTabButton.Background = new SolidColorBrush(Colors.Transparent);
-                DefaultPenTabButtonIndicator.Visibility = Visibility.Collapsed;
-                HighlightPenTabButton.Opacity = 1;
-                HighlightPenTabButtonText.FontWeight = FontWeights.Bold;
-                HighlightPenTabButtonText.FontSize = 9.5;
-                HighlightPenTabButtonText.Margin = new Thickness(2, 0.5, 0, 0);
-                HighlightPenTabButton.Background = new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
-                HighlightPenTabButtonIndicator.Visibility = Visibility.Visible;
-
-                BoardDefaultPenPropsPanel.Visibility = Visibility.Collapsed;
-                BoardDefaultPenColorsPanel.Visibility = Visibility.Collapsed;
+
+                BoardBorderPenColorPaletteControl.Visibility = Visibility.Collapsed;
                 BoardHighlighterPenColorsPanel.Visibility = Visibility.Visible;
-                BoardHighlighterPenPropsPanel.Visibility = Visibility.Visible;
-                BoardDefaultPenTabButton.Opacity = 0.9;
-                BoardDefaultPenTabButtonText.FontWeight = FontWeights.Normal;
-                BoardDefaultPenTabButtonText.FontSize = 9;
-                BoardDefaultPenTabButtonText.Margin = new Thickness(2, 1, 0, 0);
-                BoardDefaultPenTabButton.Background = new SolidColorBrush(Colors.Transparent);
-                BoardDefaultPenTabButtonIndicator.Visibility = Visibility.Collapsed;
-                BoardHighlightPenTabButton.Opacity = 1;
-                BoardHighlightPenTabButtonText.FontWeight = FontWeights.Bold;
-                BoardHighlightPenTabButtonText.FontSize = 9.5;
-                BoardHighlightPenTabButtonText.Margin = new Thickness(2, 0.5, 0, 0);
-                BoardHighlightPenTabButton.Background = new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
-                BoardHighlightPenTabButtonIndicator.Visibility = Visibility.Visible;
 
                 // PenPalette.Margin = new Thickness(-160, -157, -33, 32);
                 await Dispatcher.InvokeAsync(() =>
@@ -932,6 +694,32 @@ private void BtnHighlighterColorOrange_Click(object sender, RoutedEventArgs e)
             ColorSwitchCheck();
         }
 
+        private void HighlighterColorPalette_ColorSelected(object sender, RoutedEventArgs e)
+        {
+            var palette = sender as MainWindow_controls.HighlighterColorPalette;
+            if (palette == null)
+            {
+                return;
+            }
+
+            CheckLastColor(palette.SelectedColorCode, true);
+            penType = 1;
+            CheckPenTypeUIState();
+            ColorSwitchCheck();
+        }
+
+        private void PenColorPalette_ColorSelected(object sender, RoutedEventArgs e)
+        {
+            var palette = sender as MainWindow_controls.PenColorPalette;
+            if (palette == null)
+            {
+                return;
+            }
+
+            CheckLastColor(palette.SelectedColorCode);
+            ColorSwitchCheck();
+        }
+
         /// <summary>
         /// 将字符串转换为颜色对象
         /// </summary>
@@ -970,4 +758,4 @@ private static byte toByte(char c)
             return b;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs b/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs
index e91bcb73..0349acf5 100644
--- a/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs	
@@ -1556,7 +1556,10 @@ private void UpdateImageSelectionToolbarPosition(FrameworkElement element)
                 toolbarTop = Math.Max(0, Math.Min(toolbarTop, maxTop));
 
                 // 设置工具栏位置
-                BorderImageSelectionControl.Margin = new Thickness(toolbarLeft, toolbarTop, 0, 0);
+                if ((object)BorderImageSelectionControl is MainWindow_controls.ImageSelectionToolbar imageSelectionToolbar)
+                {
+                    imageSelectionToolbar.ControlMargin = new Thickness(toolbarLeft, toolbarTop, 0, 0);
+                }
 
                 var pdfTarget = GetPdfSidebarTargetElement();
                 if (pdfTarget != null && BorderPdfPageSidebar != null && BorderPdfPageSidebar.Visibility == Visibility.Visible)
@@ -2431,33 +2434,10 @@ private void UpdateImageResizeHandlesPosition(Rect elementBounds)
             {
                 if (ImageResizeHandlesCanvas == null) return;
 
-                ImageResizeHandlesCanvas.Margin = new Thickness(elementBounds.Left, elementBounds.Top, 0, 0);
-
-                // 四个角控制点
-                System.Windows.Controls.Canvas.SetLeft(ImageTopLeftHandle, -4);
-                System.Windows.Controls.Canvas.SetTop(ImageTopLeftHandle, -4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageTopRightHandle, elementBounds.Width - 4);
-                System.Windows.Controls.Canvas.SetTop(ImageTopRightHandle, -4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageBottomLeftHandle, -4);
-                System.Windows.Controls.Canvas.SetTop(ImageBottomLeftHandle, elementBounds.Height - 4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageBottomRightHandle, elementBounds.Width - 4);
-                System.Windows.Controls.Canvas.SetTop(ImageBottomRightHandle, elementBounds.Height - 4);
-
-                // 四个边控制点
-                System.Windows.Controls.Canvas.SetLeft(ImageTopHandle, elementBounds.Width / 2 - 4);
-                System.Windows.Controls.Canvas.SetTop(ImageTopHandle, -4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageBottomHandle, elementBounds.Width / 2 - 4);
-                System.Windows.Controls.Canvas.SetTop(ImageBottomHandle, elementBounds.Height - 4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageLeftHandle, -4);
-                System.Windows.Controls.Canvas.SetTop(ImageLeftHandle, elementBounds.Height / 2 - 4);
-
-                System.Windows.Controls.Canvas.SetLeft(ImageRightHandle, elementBounds.Width - 4);
-                System.Windows.Controls.Canvas.SetTop(ImageRightHandle, elementBounds.Height / 2 - 4);
+                if ((object)ImageResizeHandlesCanvas is MainWindow_controls.ImageResizeHandles resizeHandles)
+                {
+                    resizeHandles.UpdateHandlePositions(elementBounds);
+                }
             }
             catch (Exception ex)
             {
@@ -2470,7 +2450,7 @@ private void ImageResizeHandle_MouseLeftButtonDown(object sender, MouseButtonEve
         {
             try
             {
-                if (IsBitmapLikeCanvasElement(currentSelectedElement) && sender is Ellipse ellipse)
+                if (IsBitmapLikeCanvasElement(currentSelectedElement) && e.OriginalSource is Ellipse ellipse)
                 {
                     isResizingImage = true;
                     imageResizeStartPoint = e.GetPosition(inkCanvas);
@@ -2494,7 +2474,7 @@ private void ImageResizeHandle_MouseLeftButtonUp(object sender, MouseButtonEvent
         {
             try
             {
-                if (isResizingImage && sender is Ellipse ellipse)
+                if (isResizingImage && e.OriginalSource is Ellipse ellipse)
                 {
                     isResizingImage = false;
                     ellipse.ReleaseMouseCapture();
@@ -2513,7 +2493,7 @@ private void ImageResizeHandle_MouseMove(object sender, MouseEventArgs e)
         {
             try
             {
-                if (isResizingImage && IsBitmapLikeCanvasElement(currentSelectedElement) && sender is Ellipse ellipse)
+                if (isResizingImage && IsBitmapLikeCanvasElement(currentSelectedElement) && e.OriginalSource is Ellipse ellipse)
                 {
                     var currentPoint = e.GetPosition(inkCanvas);
                     ResizeImageByHandle(currentSelectedElement, imageResizeStartPoint, currentPoint, activeResizeHandle);
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 2788a77f..050f6234 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -688,8 +688,8 @@ internal void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
 
             if (currentMode == 0)
             {
-                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
+                BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
                 LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 //進入黑板
@@ -820,16 +820,16 @@ internal void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
                 {
                     var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
                     var dopsc = dops.ToCharArray();
-                    if (dopsc[0] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(LeftBottomPanelForPPTNavigation);
-                    if (dopsc[1] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightBottomPanelForPPTNavigation);
+                    if (dopsc[0] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(BorderPPTNavBottomLeft);
+                    if (dopsc[1] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(BorderPPTNavBottomRight);
                     if (dopsc[2] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation);
                     if (dopsc[3] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation);
                 }
                 else
                 {
                     // 如果不在放映模式或页数无效，隐藏所有翻页按钮
-                    LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                    RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    BorderPPTNavBottomLeft.Visibility = Visibility.Collapsed;
+                    BorderPPTNavBottomRight.Visibility = Visibility.Collapsed;
                     LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                     RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 }
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index e9fd850f..e6f4f79a 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -2217,22 +2217,6 @@ private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
         {
             lastBorderMouseDownObject = sender;
             if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
-            if (sender == PPTLSPageButton)
-            {
-                PPTLSPageButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRSPageButton)
-            {
-                PPTRSPageButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTLBPageButton)
-            {
-                PPTLBPageButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRBPageButton)
-            {
-                PPTRBPageButtonFeedbackBorder.Opacity = 0.15;
-            }
         }
 
         /// <summary>
@@ -2248,22 +2232,6 @@ private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
         private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
         {
             lastBorderMouseDownObject = null;
-            if (sender == PPTLSPageButton)
-            {
-                PPTLSPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSPageButton)
-            {
-                PPTRSPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBPageButton)
-            {
-                PPTLBPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBPageButton)
-            {
-                PPTRBPageButtonFeedbackBorder.Opacity = 0;
-            }
         }
 
         /// <summary>
@@ -2286,24 +2254,11 @@ private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
         private async void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
+            await HandlePptNavigationPageClickAsync();
+        }
 
-            if (sender == PPTLSPageButton)
-            {
-                PPTLSPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSPageButton)
-            {
-                PPTRSPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBPageButton)
-            {
-                PPTLBPageButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBPageButton)
-            {
-                PPTRBPageButtonFeedbackBorder.Opacity = 0;
-            }
-
+        private async Task HandlePptNavigationPageClickAsync()
+        {
             if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
 
             // 使用新的PPT管理器检查连接状态
@@ -2500,23 +2455,6 @@ private async Task HandleManualSlideShowEnd()
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
         {
             lastBorderMouseDownObject = sender;
-            if (sender == PPTLSPreviousButtonBorder)
-            {
-                PPTLSPreviousButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRSPreviousButtonBorder)
-            {
-                PPTRSPreviousButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTLBPreviousButtonBorder)
-            {
-                PPTLBPreviousButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRBPreviousButtonBorder)
-            {
-                PPTRBPreviousButtonFeedbackBorder.Opacity = 0.15;
-            }
-
             // 启动长按检测
             if (Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn)
             {
@@ -2537,23 +2475,6 @@ private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArg
         private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
         {
             lastBorderMouseDownObject = null;
-            if (sender == PPTLSPreviousButtonBorder)
-            {
-                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSPreviousButtonBorder)
-            {
-                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBPreviousButtonBorder)
-            {
-                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBPreviousButtonBorder)
-            {
-                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-
             // 停止长按检测
             StopLongPressDetection();
         }
@@ -2572,23 +2493,6 @@ private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
         private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
-            if (sender == PPTLSPreviousButtonBorder)
-            {
-                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSPreviousButtonBorder)
-            {
-                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBPreviousButtonBorder)
-            {
-                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBPreviousButtonBorder)
-            {
-                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-            }
-
             // 停止长按检测
             StopLongPressDetection();
 
@@ -2610,23 +2514,6 @@ private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs
         private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
         {
             lastBorderMouseDownObject = sender;
-            if (sender == PPTLSNextButtonBorder)
-            {
-                PPTLSNextButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRSNextButtonBorder)
-            {
-                PPTRSNextButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTLBNextButtonBorder)
-            {
-                PPTLBNextButtonFeedbackBorder.Opacity = 0.15;
-            }
-            else if (sender == PPTRBNextButtonBorder)
-            {
-                PPTRBNextButtonFeedbackBorder.Opacity = 0.15;
-            }
-
             // 启动长按检测
             if (Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn)
             {
@@ -2647,23 +2534,6 @@ private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e)
         private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
         {
             lastBorderMouseDownObject = null;
-            if (sender == PPTLSNextButtonBorder)
-            {
-                PPTLSNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSNextButtonBorder)
-            {
-                PPTRSNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBNextButtonBorder)
-            {
-                PPTLBNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBNextButtonBorder)
-            {
-                PPTRBNextButtonFeedbackBorder.Opacity = 0;
-            }
-
             // 停止长按检测
             StopLongPressDetection();
         }
@@ -2682,29 +2552,72 @@ private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
         private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
-            if (sender == PPTLSNextButtonBorder)
-            {
-                PPTLSNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRSNextButtonBorder)
-            {
-                PPTRSNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTLBNextButtonBorder)
-            {
-                PPTLBNextButtonFeedbackBorder.Opacity = 0;
-            }
-            else if (sender == PPTRBNextButtonBorder)
-            {
-                PPTRBNextButtonFeedbackBorder.Opacity = 0;
-            }
-
             // 停止长按检测
             StopLongPressDetection();
 
             BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
         }
 
+        private void PPTNavigationBottomLeft_PreviousClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+        }
+
+        private void PPTNavigationBottomRight_PreviousClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+        }
+
+        private void PPTNavigationSideLeft_PreviousClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+        }
+
+        private void PPTNavigationSideRight_PreviousClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+        }
+
+        private void PPTNavigationBottomLeft_NextClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+        }
+
+        private void PPTNavigationBottomRight_NextClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+        }
+
+        private void PPTNavigationSideLeft_NextClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+        }
+
+        private void PPTNavigationSideRight_NextClicked(object sender, RoutedEventArgs e)
+        {
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+        }
+
+        private async void PPTNavigationBottomLeft_PageClicked(object sender, RoutedEventArgs e)
+        {
+            await HandlePptNavigationPageClickAsync();
+        }
+
+        private async void PPTNavigationBottomRight_PageClicked(object sender, RoutedEventArgs e)
+        {
+            await HandlePptNavigationPageClickAsync();
+        }
+
+        private async void PPTNavigationSideLeft_PageClicked(object sender, RoutedEventArgs e)
+        {
+            await HandlePptNavigationPageClickAsync();
+        }
+
+        private async void PPTNavigationSideRight_PageClicked(object sender, RoutedEventArgs e)
+        {
+            await HandlePptNavigationPageClickAsync();
+        }
+
         /// <summary>
         /// 处理PPT结束控制按钮的鼠标释放事件
         /// </summary>
diff --git a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
index 92ee533c..da06f76a 100644
--- a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs	
@@ -603,7 +603,7 @@ private void inkCanvas_SelectionChanged(object sender, EventArgs e)
 
                 // 显示墨迹选择栏和选择框
                 GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
-                BorderStrokeSelectionClone.Background = Brushes.Transparent;
+                BorderStrokeSelectionControl.SetCloneButtonBackground(Brushes.Transparent);
                 updateBorderStrokeSelectionControlLocation();
                 UpdateSelectionDisplay();
                 return;
@@ -664,7 +664,7 @@ private void updateBorderStrokeSelectionControlLocation()
                 if (borderTop < 0) borderTop = 10; // 如果上方也没有空间，则显示在顶部
             }
 
-            BorderStrokeSelectionControl.Margin = new Thickness(borderLeft, borderTop, 0, 0);
+            BorderStrokeSelectionControl.ControlMargin = new Thickness(borderLeft, borderTop, 0, 0);
         }
 
         /// <summary>
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index acacfedc..51d3bf12 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -868,11 +868,28 @@ private void ToggleSwitchShowCanvasAtNewSlideShow_Toggled(object sender, RoutedE
         private void ToggleSwitchEnableNibMode_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            if (sender == ToggleSwitchEnableNibMode)
-                BoardToggleSwitchEnableNibMode.IsOn = ToggleSwitchEnableNibMode.IsOn;
+
+            bool isNibModeEnabled;
+            if (sender == BoardPenSettingsControl)
+            {
+                isNibModeEnabled = BoardPenSettingsControl.IsNibModeEnabled;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.IsNibModeEnabled = isNibModeEnabled;
+            }
+            else if (sender == BorderPenSettingsControl)
+            {
+                isNibModeEnabled = BorderPenSettingsControl != null && BorderPenSettingsControl.IsNibModeEnabled;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.IsNibModeEnabled = isNibModeEnabled;
+            }
             else
-                ToggleSwitchEnableNibMode.IsOn = BoardToggleSwitchEnableNibMode.IsOn;
-            Settings.Startup.IsEnableNibMode = ToggleSwitchEnableNibMode.IsOn;
+            {
+                isNibModeEnabled = BorderPenSettingsControl != null && BorderPenSettingsControl.IsNibModeEnabled;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.IsNibModeEnabled = isNibModeEnabled;
+            }
+
+            Settings.Startup.IsEnableNibMode = isNibModeEnabled;
 
             if (Settings.Startup.IsEnableNibMode)
                 BoundsWidth = Settings.Advanced.NibModeBoundsWidth;
@@ -902,13 +919,17 @@ private void ToggleSwitchEnableDisPlayNibModeToggle_Toggled(object sender, Route
             SaveSettingsToFile();
             if (!ToggleSwitchEnableDisPlayNibModeToggle.IsOn)
             {
-                NibModeSimpleStackPanel.Visibility = Visibility.Collapsed;
-                BoardNibModeSimpleStackPanel.Visibility = Visibility.Collapsed;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.NibModePanelVisibility = Visibility.Collapsed;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.NibModePanelVisibility = Visibility.Collapsed;
             }
             else
             {
-                NibModeSimpleStackPanel.Visibility = Visibility.Visible;
-                BoardNibModeSimpleStackPanel.Visibility = Visibility.Visible;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.NibModePanelVisibility = Visibility.Visible;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.NibModePanelVisibility = Visibility.Visible;
             }
         }
 
@@ -2804,16 +2825,23 @@ private static int InkStyleFromPenStyleUiIndex(int uiIndex)
         private void ComboBoxPenStyle_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!isLoaded) return;
-            int uiIndex = sender == ComboBoxPenStyle
-                ? ComboBoxPenStyle.SelectedIndex
-                : BoardComboBoxPenStyle.SelectedIndex;
+
+            int uiIndex = sender == BoardPenSettingsControl
+                ? BoardPenSettingsControl?.PenStyleSelectedIndex ?? -1
+                : BorderPenSettingsControl?.PenStyleSelectedIndex ?? -1;
             if (uiIndex < 0) return;
 
             Settings.Canvas.InkStyle = InkStyleFromPenStyleUiIndex(uiIndex);
-            if (sender == ComboBoxPenStyle)
-                BoardComboBoxPenStyle.SelectedIndex = uiIndex;
+            if (sender == BoardPenSettingsControl)
+            {
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.PenStyleSelectedIndex = uiIndex;
+            }
             else
-                ComboBoxPenStyle.SelectedIndex = uiIndex;
+            {
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.PenStyleSelectedIndex = uiIndex;
+            }
 
             SaveSettingsToFile();
         }
@@ -2895,22 +2923,46 @@ private void SwitchToRectangleEraser(object sender, MouseButtonEventArgs e)
         private void InkWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if (!isLoaded) return;
-            if (sender == BoardInkWidthSlider) InkWidthSlider.Value = ((Slider)sender).Value;
-            if (sender == InkWidthSlider) BoardInkWidthSlider.Value = ((Slider)sender).Value;
-            drawingAttributes.Height = ((Slider)sender).Value / 2;
-            drawingAttributes.Width = ((Slider)sender).Value / 2;
-            Settings.Canvas.InkWidth = ((Slider)sender).Value / 2;
+
+            if (!(sender is Slider slider)) return;
+
+            if (sender == BoardPenSettingsControl?.InkWidthSliderControl)
+            {
+                if (BorderPenSettingsControl != null && Math.Abs(BorderPenSettingsControl.PenWidth - slider.Value) > 0.001)
+                    BorderPenSettingsControl.PenWidth = slider.Value;
+            }
+            else if (sender == BorderPenSettingsControl?.InkWidthSliderControl)
+            {
+                if (BoardPenSettingsControl != null && Math.Abs(BoardPenSettingsControl.PenWidth - slider.Value) > 0.001)
+                    BoardPenSettingsControl.PenWidth = slider.Value;
+            }
+
+            drawingAttributes.Height = slider.Value / 2;
+            drawingAttributes.Width = slider.Value / 2;
+            Settings.Canvas.InkWidth = slider.Value / 2;
             SaveSettingsToFile();
         }
 
         private void HighlighterWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if (!isLoaded) return;
-            // if (sender == BoardInkWidthSlider) InkWidthSlider.Value = ((Slider)sender).Value;
-            // if (sender == InkWidthSlider) BoardInkWidthSlider.Value = ((Slider)sender).Value;
-            drawingAttributes.Height = ((Slider)sender).Value;
-            drawingAttributes.Width = ((Slider)sender).Value / 2;
-            Settings.Canvas.HighlighterWidth = ((Slider)sender).Value;
+
+            if (!(sender is Slider slider)) return;
+
+            if (sender == BoardPenSettingsControl?.HighlighterWidthSliderControl)
+            {
+                if (BorderPenSettingsControl != null && Math.Abs(BorderPenSettingsControl.HighlighterWidth - slider.Value) > 0.001)
+                    BorderPenSettingsControl.HighlighterWidth = slider.Value;
+            }
+            else if (sender == BorderPenSettingsControl?.HighlighterWidthSliderControl)
+            {
+                if (BoardPenSettingsControl != null && Math.Abs(BoardPenSettingsControl.HighlighterWidth - slider.Value) > 0.001)
+                    BoardPenSettingsControl.HighlighterWidth = slider.Value;
+            }
+
+            drawingAttributes.Height = slider.Value;
+            drawingAttributes.Width = slider.Value / 2;
+            Settings.Canvas.HighlighterWidth = slider.Value;
             SaveSettingsToFile();
         }
 
@@ -2923,14 +2975,25 @@ private void HighlighterWidthSlider_ValueChanged(object sender, RoutedPropertyCh
         private void InkAlphaSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if (!isLoaded) return;
-            // if (sender == BoardInkWidthSlider) InkWidthSlider.Value = ((Slider)sender).Value;
-            // if (sender == InkWidthSlider) BoardInkWidthSlider.Value = ((Slider)sender).Value;
+
+            if (!(sender is Slider slider)) return;
+
+            if (sender == BoardPenSettingsControl?.InkAlphaSliderControl)
+            {
+                if (BorderPenSettingsControl != null && Math.Abs(BorderPenSettingsControl.PenAlpha - slider.Value) > 0.001)
+                    BorderPenSettingsControl.PenAlpha = slider.Value;
+            }
+            else if (sender == BorderPenSettingsControl?.InkAlphaSliderControl)
+            {
+                if (BoardPenSettingsControl != null && Math.Abs(BoardPenSettingsControl.PenAlpha - slider.Value) > 0.001)
+                    BoardPenSettingsControl.PenAlpha = slider.Value;
+            }
+
             var NowR = drawingAttributes.Color.R;
             var NowG = drawingAttributes.Color.G;
             var NowB = drawingAttributes.Color.B;
-            // Trace.WriteLine(BitConverter.GetBytes(((Slider)sender).Value));
-            drawingAttributes.Color = Color.FromArgb((byte)((Slider)sender).Value, NowR, NowG, NowB);
-            Settings.Canvas.InkAlpha = ((Slider)sender).Value;
+            drawingAttributes.Color = Color.FromArgb((byte)slider.Value, NowR, NowG, NowB);
+            Settings.Canvas.InkAlpha = slider.Value;
             SaveSettingsToFile();
         }
 
@@ -3953,7 +4016,32 @@ private async void SpecialVersionResetToSuggestion_Click()
         private void ToggleSwitchEnableInkToShape_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            Settings.InkToShape.IsInkToShapeEnabled = ToggleSwitchEnableInkToShape.IsOn;
+
+            bool isEnabled;
+            if (sender == BorderPenSettingsControl)
+            {
+                isEnabled = BorderPenSettingsControl.IsInkToShapeEnabled;
+                ToggleSwitchEnableInkToShape.IsOn = isEnabled;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.IsInkToShapeEnabled = isEnabled;
+            }
+            else if (sender == BoardPenSettingsControl)
+            {
+                isEnabled = BoardPenSettingsControl.IsInkToShapeEnabled;
+                ToggleSwitchEnableInkToShape.IsOn = isEnabled;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.IsInkToShapeEnabled = isEnabled;
+            }
+            else
+            {
+                isEnabled = ToggleSwitchEnableInkToShape.IsOn;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.IsInkToShapeEnabled = isEnabled;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.IsInkToShapeEnabled = isEnabled;
+            }
+
+            Settings.InkToShape.IsInkToShapeEnabled = isEnabled;
             SaveSettingsToFile();
         }
 
@@ -5878,4 +5966,4 @@ private void BtnRegisterFileAssociation_Click(object sender, RoutedEventArgs e)
         #endregion
 
     }
-}
\ No newline at end of file
+}
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 9fbca2bc..6e0f5e87 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -252,14 +252,14 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
 
                 if (Settings.Startup.IsEnableNibMode)
                 {
-                    ToggleSwitchEnableNibMode.IsOn = true;
-                    BoardToggleSwitchEnableNibMode.IsOn = true;
+                    if (BorderPenSettingsControl != null) BorderPenSettingsControl.IsNibModeEnabled = true;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.IsNibModeEnabled = true;
                     BoundsWidth = Settings.Advanced.NibModeBoundsWidth;
                 }
                 else
                 {
-                    ToggleSwitchEnableNibMode.IsOn = false;
-                    BoardToggleSwitchEnableNibMode.IsOn = false;
+                    if (BorderPenSettingsControl != null) BorderPenSettingsControl.IsNibModeEnabled = false;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.IsNibModeEnabled = false;
                     BoundsWidth = Settings.Advanced.FingerModeBoundsWidth;
                 }
 
@@ -339,8 +339,8 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
             {
                 Settings.Startup = new Startup();
                 Settings.Startup.IsEnableNibMode = false; // 默认关闭笔尖模式
-                ToggleSwitchEnableNibMode.IsOn = false; // 默认关闭笔尖模式
-                BoardToggleSwitchEnableNibMode.IsOn = false; // 默认关闭笔尖模式
+                    if (BorderPenSettingsControl != null) BorderPenSettingsControl.IsNibModeEnabled = false; // 默认关闭笔尖模式
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.IsNibModeEnabled = false; // 默认关闭笔尖模式
                 BoundsWidth = Settings.Advanced.FingerModeBoundsWidth; // 使用手指模式边界宽度
             }
 
@@ -365,13 +365,13 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
             {
                 if (!Settings.Appearance.IsEnableDisPlayNibModeToggler)
                 {
-                    NibModeSimpleStackPanel.Visibility = Visibility.Collapsed;
-                    BoardNibModeSimpleStackPanel.Visibility = Visibility.Collapsed;
+                    if (BorderPenSettingsControl != null) BorderPenSettingsControl.NibModePanelVisibility = Visibility.Collapsed;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.NibModePanelVisibility = Visibility.Collapsed;
                 }
                 else
                 {
-                    NibModeSimpleStackPanel.Visibility = Visibility.Visible;
-                    BoardNibModeSimpleStackPanel.Visibility = Visibility.Visible;
+                    if (BorderPenSettingsControl != null) BorderPenSettingsControl.NibModePanelVisibility = Visibility.Visible;
+                    if (BoardPenSettingsControl != null) BoardPenSettingsControl.NibModePanelVisibility = Visibility.Visible;
                 }
 
                 //if (Settings.Appearance.IsColorfulViewboxFloatingBar) // 浮动工具栏背景色
@@ -803,16 +803,18 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
                 drawingAttributes.Height = Settings.Canvas.InkWidth;
                 drawingAttributes.Width = Settings.Canvas.InkWidth;
 
-                InkWidthSlider.Value = Settings.Canvas.InkWidth * 2;
-                HighlighterWidthSlider.Value = Settings.Canvas.HighlighterWidth;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.PenWidth = Settings.Canvas.InkWidth * 2;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenWidth = Settings.Canvas.InkWidth * 2;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.HighlighterWidth = Settings.Canvas.HighlighterWidth;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.HighlighterWidth = Settings.Canvas.HighlighterWidth;
 
                 int alpha = (int)Settings.Canvas.InkAlpha;
                 if (alpha < 0) alpha = 0; if (alpha > 255) alpha = 255;
                 var inkColor = drawingAttributes.Color;
                 drawingAttributes.Color = Color.FromArgb((byte)alpha, inkColor.R, inkColor.G, inkColor.B);
                 inkCanvas.DefaultDrawingAttributes.Color = drawingAttributes.Color;
-                if (InkAlphaSlider != null) InkAlphaSlider.Value = alpha;
-                if (BoardInkAlphaSlider != null) BoardInkAlphaSlider.Value = alpha;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.PenAlpha = alpha;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenAlpha = alpha;
 
 
                 ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption;
@@ -865,8 +867,8 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
                     Settings.Canvas.InkStyle = 0;
 
                 int penStyleUi = PenStyleUiIndexFromInkStyle(Settings.Canvas.InkStyle);
-                ComboBoxPenStyle.SelectedIndex = penStyleUi;
-                BoardComboBoxPenStyle.SelectedIndex = penStyleUi;
+                if (BorderPenSettingsControl != null) BorderPenSettingsControl.PenStyleSelectedIndex = penStyleUi;
+                if (BoardPenSettingsControl != null) BoardPenSettingsControl.PenStyleSelectedIndex = penStyleUi;
 
                 ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize;
                 ComboBoxEraserSizeFloatingBar.SelectedIndex = Settings.Canvas.EraserSize;
@@ -1060,6 +1062,10 @@ private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = fal
             if (Settings.InkToShape != null)
             {
                 ToggleSwitchEnableInkToShape.IsOn = Settings.InkToShape.IsInkToShapeEnabled;
+                if (BorderPenSettingsControl != null)
+                    BorderPenSettingsControl.IsInkToShapeEnabled = Settings.InkToShape.IsInkToShapeEnabled;
+                if (BoardPenSettingsControl != null)
+                    BoardPenSettingsControl.IsInkToShapeEnabled = Settings.InkToShape.IsInkToShapeEnabled;
 
                 if (ComboBoxShapeRecognitionEngine != null)
                 {
@@ -1439,15 +1445,15 @@ private void LoadInkFadeSettings()
                 }
 
                 // 同步批注子面板中的开关状态
-                if (ToggleSwitchInkFadeInPanel != null)
+                if (BoardPenSettingsControl != null)
                 {
-                    ToggleSwitchInkFadeInPanel.IsOn = Settings.Canvas.EnableInkFade;
+                    BoardPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
                 }
 
                 // 同步普通画笔面板中的开关状态
-                if (ToggleSwitchInkFadeInPanel2 != null)
+                if (BorderPenSettingsControl != null)
                 {
-                    ToggleSwitchInkFadeInPanel2.IsOn = Settings.Canvas.EnableInkFade;
+                    BorderPenSettingsControl.IsInkFadeEnabled = Settings.Canvas.EnableInkFade;
                 }
 
                 // 同步滑块值
@@ -1611,4 +1617,4 @@ private void RemoveObsoleteProperties(JObject userObj, JObject defaultObj, ref b
             }
         }
     }
-}
\ No newline at end of file
+}

From ef8931c717f630ade46401666da74a09fb0bf64d Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Wed, 8 Apr 2026 21:07:46 +0800
Subject: [PATCH 08/15] refactor: extract ResourceDictionary styles to separate
 file

Ultraworked with Sisyphus

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/MainWindow.xaml                    | 108 +----------------
 .../ResourceDictionaryStyles.xaml             | 113 ++++++++++++++++++
 2 files changed, 114 insertions(+), 107 deletions(-)
 create mode 100644 Ink Canvas/MainWindow_controls/ResourceDictionaryStyles.xaml

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 54fc9685..bf8d5fda 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -44,114 +44,8 @@
                 <ResourceDictionary Source="MainWindow_cs/MW_Eraser.xaml"/>
                 <ResourceDictionary Source="MainWindow_cs/MW_Styles.xaml"/>
                 <ResourceDictionary Source="MainWindow_cs/MW_ToolbarIcons.xaml"/>
+                <ResourceDictionary Source="MainWindow_controls/ResourceDictionaryStyles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
-            <c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <c:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
-            <c:IntNumberToString x:Key="IntNumberToString" />
-            <c:IntNumberToString2 x:Key="IntNumberToString2" />
-
-            <!-- 浮动栏/白板栏：英文等长文本自动缩小避免截断 -->
-            <Style x:Key="AutoFitFloatBarLabel12" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="NoWrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="7" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="12" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.5" />
-            </Style>
-
-            <Style x:Key="AutoFitFloatBarLabel9" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="NoWrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="6" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="9" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.5" />
-            </Style>
-
-            <Style x:Key="AutoFitFloatBarLabel8" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="NoWrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitMainToolbarLabel8" TargetType="TextBlock" BasedOn="{StaticResource AutoFitFloatBarLabel8}">
-                <Setter Property="Height" Value="10" />
-                <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />
-                <Setter Property="LineHeight" Value="10" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="2.5" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.1" />
-            </Style>
-
-            <Style x:Key="AutoFitPenTabLabel9" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="NoWrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="9" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.1" />
-            </Style>
-
-            <Style x:Key="AutoFitSettingsOptionLabel14" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="Wrap" />
-                <Setter Property="TextAlignment" Value="Left" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="8" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="14" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitSettingsHint15" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="Wrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="10" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="15" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitSettingsGridLabel14" TargetType="TextBlock">
-                <Setter Property="TextWrapping" Value="Wrap" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="8" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="14" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitToolPopupLabel8" TargetType="Label">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="HorizontalContentAlignment" Value="Center" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="Foreground" Value="{DynamicResource FloatBarForeground}" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitGestureOptionLabel10" TargetType="Label">
-                <Setter Property="Foreground" Value="{DynamicResource FloatBarForeground}" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="HorizontalContentAlignment" Value="Left" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="4" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
-                <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
-            </Style>
-
-            <Style x:Key="AutoFitBoardGestureOptionLabel10" TargetType="Label" BasedOn="{StaticResource AutoFitGestureOptionLabel10}">
-                <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="5" />
-                <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="10" />
-            </Style>
-
         </ResourceDictionary>
     </Window.Resources>
 
diff --git a/Ink Canvas/MainWindow_controls/ResourceDictionaryStyles.xaml b/Ink Canvas/MainWindow_controls/ResourceDictionaryStyles.xaml
new file mode 100644
index 00000000..fd8a173e
--- /dev/null
+++ b/Ink Canvas/MainWindow_controls/ResourceDictionaryStyles.xaml	
@@ -0,0 +1,113 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:c="clr-namespace:Ink_Canvas.Converter"
+                    xmlns:helpers="clr-namespace:Ink_Canvas.Helpers">
+
+    <!-- Converters -->
+    <c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
+    <c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <c:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
+    <c:IntNumberToString x:Key="IntNumberToString" />
+    <c:IntNumberToString2 x:Key="IntNumberToString2" />
+
+    <!-- 浮动栏/白板栏：英文等长文本自动缩小避免截断 -->
+    <Style x:Key="AutoFitFloatBarLabel12" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="7" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="12" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.5" />
+    </Style>
+
+    <Style x:Key="AutoFitFloatBarLabel9" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="6" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="9" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.5" />
+    </Style>
+
+    <Style x:Key="AutoFitFloatBarLabel8" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitMainToolbarLabel8" TargetType="TextBlock" BasedOn="{StaticResource AutoFitFloatBarLabel8}">
+        <Setter Property="Height" Value="10" />
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />
+        <Setter Property="LineHeight" Value="10" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="2.5" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.1" />
+    </Style>
+
+    <Style x:Key="AutoFitPenTabLabel9" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="9" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.1" />
+    </Style>
+
+    <Style x:Key="AutoFitSettingsOptionLabel14" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextAlignment" Value="Left" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="8" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="14" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitSettingsHint15" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="10" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="15" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitSettingsGridLabel14" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="8" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="14" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitToolPopupLabel8" TargetType="Label">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="{DynamicResource FloatBarForeground}" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="3.5" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitGestureOptionLabel10" TargetType="Label">
+        <Setter Property="Foreground" Value="{DynamicResource FloatBarForeground}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="helpers:AutoFontSizeHelper.IsEnabled" Value="True" />
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="4" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="8" />
+        <Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
+    </Style>
+
+    <Style x:Key="AutoFitBoardGestureOptionLabel10" TargetType="Label" BasedOn="{StaticResource AutoFitGestureOptionLabel10}">
+        <Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="5" />
+        <Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="10" />
+    </Style>
+
+</ResourceDictionary>

From ce49904dde6a1e3e1426f3526d7f064f4f8b0a58 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Wed, 8 Apr 2026 21:07:57 +0800
Subject: [PATCH 09/15] refactor: add IBoardCanvasController interface for
 canvas abstraction

Ultraworked with Sisyphus

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/IBoardCanvasController.cs | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Ink Canvas/IBoardCanvasController.cs

diff --git a/Ink Canvas/IBoardCanvasController.cs b/Ink Canvas/IBoardCanvasController.cs
new file mode 100644
index 00000000..804d337b
--- /dev/null
+++ b/Ink Canvas/IBoardCanvasController.cs	
@@ -0,0 +1,47 @@
+using System.Windows.Controls;
+using System.Windows.Ink;
+using System.Windows.Media;
+
+namespace Ink_Canvas
+{
+    public interface IBoardCanvasController
+    {
+        StrokeCollection Strokes { get; }
+        System.Windows.Visibility Visibility { get; set; }
+        bool IsHitTestVisible { get; set; }
+        bool IsManipulationEnabled { get; set; }
+        InkCanvasEditingMode EditingMode { get; set; }
+        void SetInkMode();
+        void SetEraserByPointMode();
+        void SetEraserByStrokeMode();
+        void SetSelectMode();
+        Color StrokeColor { get; set; }
+        double StrokeWidth { get; set; }
+        double HighlighterWidth { get; set; }
+        bool IsHighlighterMode { get; set; }
+        EllipseStylusShape EraserShape { get; set; }
+        StrokeCollection GetSelectedStrokes();
+        void Select(StrokeCollection strokes);
+        void ClearSelection();
+        event System.EventHandler<EditingModeChangedEventArgs> EditingModeChanged;
+        event System.EventHandler<StrokeColorChangedEventArgs> StrokeColorChanged;
+        event System.EventHandler<StrokeEventArgs> StrokeCollected;
+    }
+
+    public class EditingModeChangedEventArgs : System.EventArgs
+    {
+        public InkCanvasEditingMode OldMode { get; set; }
+        public InkCanvasEditingMode NewMode { get; set; }
+    }
+    
+    public class StrokeColorChangedEventArgs : System.EventArgs
+    {
+        public Color OldColor { get; set; }
+        public Color NewColor { get; set; }
+    }
+    
+    public class StrokeEventArgs : System.EventArgs
+    {
+        public StrokeCollection Strokes { get; set; }
+    }
+}

From 0e4601eb148ccee1063c3cf890d3191c2b15624f Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 20:00:29 +0800
Subject: [PATCH 10/15] fix: load toolbar icon resources in ImageResizeHandles

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
index 11dd334d..517800ac 100644
--- a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
@@ -2,6 +2,13 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Name="Root">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="MainWindow_cs/MW_ToolbarIcons.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Canvas Name="ImageResizeHandlesCanvas"
             Visibility="Collapsed"
             Panel.ZIndex="1000">

From c0bcc334bbd736f149955b1dc7cba55233378ddf Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 20:00:29 +0800
Subject: [PATCH 11/15] refactor: initialize board canvas controller adapter

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/IBoardCanvasController.cs          |   2 +-
 Ink Canvas/MainWindow.xaml.cs                 |   1 +
 .../MainWindow_cs/MW_BoardCanvasController.cs | 151 ++++++++++++++++++
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 Ink Canvas/MainWindow_cs/MW_BoardCanvasController.cs

diff --git a/Ink Canvas/IBoardCanvasController.cs b/Ink Canvas/IBoardCanvasController.cs
index 804d337b..178e47a3 100644
--- a/Ink Canvas/IBoardCanvasController.cs	
+++ b/Ink Canvas/IBoardCanvasController.cs	
@@ -19,7 +19,7 @@ public interface IBoardCanvasController
         double StrokeWidth { get; set; }
         double HighlighterWidth { get; set; }
         bool IsHighlighterMode { get; set; }
-        EllipseStylusShape EraserShape { get; set; }
+        StylusShape EraserShape { get; set; }
         StrokeCollection GetSelectedStrokes();
         void Select(StrokeCollection strokes);
         void ClearSelection();
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index d0bb5900..c1bfa605 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -119,6 +119,7 @@ 处于 PPT 放映内：BtnPPTSlideShowEnd.Visibility
             }
 
             InitializeComponent();
+            InitializeBoardCanvasController();
 
             BlackboardLeftSide.Visibility = Visibility.Collapsed;
             BlackboardCenterSide.Visibility = Visibility.Collapsed;
diff --git a/Ink Canvas/MainWindow_cs/MW_BoardCanvasController.cs b/Ink Canvas/MainWindow_cs/MW_BoardCanvasController.cs
new file mode 100644
index 00000000..40f05ae7
--- /dev/null
+++ b/Ink Canvas/MainWindow_cs/MW_BoardCanvasController.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Ink;
+using System.Windows.Media;
+
+namespace Ink_Canvas
+{
+    public partial class MainWindow
+    {
+        private IBoardCanvasController _boardCanvasController;
+
+        public IBoardCanvasController BoardCanvasController => _boardCanvasController;
+
+        private void InitializeBoardCanvasController()
+        {
+            if (_boardCanvasController == null)
+            {
+                _boardCanvasController = new MainWindowBoardCanvasController(this);
+            }
+        }
+    }
+
+    internal sealed class MainWindowBoardCanvasController : IBoardCanvasController
+    {
+        private readonly MainWindow _window;
+        private InkCanvasEditingMode _lastEditingMode;
+
+        public MainWindowBoardCanvasController(MainWindow window)
+        {
+            _window = window;
+            _lastEditingMode = _window.inkCanvas.EditingMode;
+            _window.inkCanvas.EditingModeChanged += InkCanvasOnEditingModeChanged;
+            _window.inkCanvas.StrokeCollected += InkCanvasOnStrokeCollected;
+        }
+
+        public StrokeCollection Strokes => _window.inkCanvas.Strokes;
+
+        public System.Windows.Visibility Visibility
+        {
+            get => _window.inkCanvas.Visibility;
+            set => _window.inkCanvas.Visibility = value;
+        }
+
+        public bool IsHitTestVisible
+        {
+            get => _window.inkCanvas.IsHitTestVisible;
+            set => _window.inkCanvas.IsHitTestVisible = value;
+        }
+
+        public bool IsManipulationEnabled
+        {
+            get => _window.inkCanvas.IsManipulationEnabled;
+            set => _window.inkCanvas.IsManipulationEnabled = value;
+        }
+
+        public InkCanvasEditingMode EditingMode
+        {
+            get => _window.inkCanvas.EditingMode;
+            set
+            {
+                if (_window.inkCanvas.EditingMode == value)
+                {
+                    return;
+                }
+
+                var oldMode = _window.inkCanvas.EditingMode;
+                _window.inkCanvas.EditingMode = value;
+                EditingModeChanged?.Invoke(this, new EditingModeChangedEventArgs { OldMode = oldMode, NewMode = value });
+            }
+        }
+
+        public void SetInkMode() => EditingMode = InkCanvasEditingMode.Ink;
+
+        public void SetEraserByPointMode() => EditingMode = InkCanvasEditingMode.EraseByPoint;
+
+        public void SetEraserByStrokeMode() => EditingMode = InkCanvasEditingMode.EraseByStroke;
+
+        public void SetSelectMode() => EditingMode = InkCanvasEditingMode.Select;
+
+        public Color StrokeColor
+        {
+            get => _window.inkCanvas.DefaultDrawingAttributes.Color;
+            set
+            {
+                if (_window.inkCanvas.DefaultDrawingAttributes.Color == value)
+                {
+                    return;
+                }
+
+                var oldColor = _window.inkCanvas.DefaultDrawingAttributes.Color;
+                _window.inkCanvas.DefaultDrawingAttributes.Color = value;
+                StrokeColorChanged?.Invoke(this, new StrokeColorChangedEventArgs { OldColor = oldColor, NewColor = value });
+            }
+        }
+
+        public double StrokeWidth
+        {
+            get => _window.inkCanvas.DefaultDrawingAttributes.Width;
+            set => _window.inkCanvas.DefaultDrawingAttributes.Width = value;
+        }
+
+        public double HighlighterWidth
+        {
+            get => _window.inkCanvas.DefaultDrawingAttributes.Height;
+            set => _window.inkCanvas.DefaultDrawingAttributes.Height = value;
+        }
+
+        public bool IsHighlighterMode
+        {
+            get => _window.inkCanvas.DefaultDrawingAttributes.IsHighlighter;
+            set => _window.inkCanvas.DefaultDrawingAttributes.IsHighlighter = value;
+        }
+
+        public StylusShape EraserShape
+        {
+            get => _window.inkCanvas.EraserShape;
+            set => _window.inkCanvas.EraserShape = value;
+        }
+
+        public StrokeCollection GetSelectedStrokes() => _window.inkCanvas.GetSelectedStrokes();
+
+        public void Select(StrokeCollection strokes) => _window.inkCanvas.Select(strokes);
+
+        public void ClearSelection() => _window.inkCanvas.Select(new StrokeCollection());
+
+        public event EventHandler<EditingModeChangedEventArgs> EditingModeChanged;
+
+        public event EventHandler<StrokeColorChangedEventArgs> StrokeColorChanged;
+
+        public event EventHandler<StrokeEventArgs> StrokeCollected;
+
+        private void InkCanvasOnEditingModeChanged(object sender, RoutedEventArgs e)
+        {
+            var newMode = _window.inkCanvas.EditingMode;
+            var oldMode = _lastEditingMode;
+            _lastEditingMode = newMode;
+            EditingModeChanged?.Invoke(this, new EditingModeChangedEventArgs { OldMode = oldMode, NewMode = newMode });
+        }
+
+        private void InkCanvasOnStrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e)
+        {
+            if (e?.Stroke == null)
+            {
+                return;
+            }
+
+            StrokeCollected?.Invoke(this, new StrokeEventArgs { Strokes = new StrokeCollection { e.Stroke } });
+        }
+    }
+}

From 3ed9f2c2dd4043f66ce37ca26f7c28d78d949406 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 20:00:29 +0800
Subject: [PATCH 12/15] refactor: route board interactions through canvas
 controller

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/MainWindow_cs/MW_Colors.cs         | 58 +++++++++----------
 Ink Canvas/MainWindow_cs/MW_Eraser.cs         | 14 ++---
 .../MainWindow_cs/MW_FloatingBarIcons.cs      | 26 ++++-----
 Ink Canvas/MainWindow_cs/MW_Timer.cs          |  8 +--
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_Colors.cs b/Ink Canvas/MainWindow_cs/MW_Colors.cs
index 85d88ff8..8eff8ac2 100644
--- a/Ink Canvas/MainWindow_cs/MW_Colors.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Colors.cs	
@@ -64,7 +64,7 @@ private void ColorSwitchCheck(bool hidePanels = true)
                 foreach (var stroke in strokes)
                     try
                     {
-                        stroke.DrawingAttributes.Color = inkCanvas.DefaultDrawingAttributes.Color;
+                        stroke.DrawingAttributes.Color = BoardCanvasController.StrokeColor;
                     }
                     catch
                     {
@@ -176,7 +176,7 @@ private void CheckColorTheme(bool changeColorTheme = false)
                 inkColor = lastBoardInkColor;
             }
 
-            double alpha = inkCanvas.DefaultDrawingAttributes.Color.A;
+            double alpha = BoardCanvasController.StrokeColor.A;
             if (penType == 0 && Settings?.Canvas != null)
             {
                 double settingAlpha = Settings.Canvas.InkAlpha;
@@ -189,94 +189,94 @@ private void CheckColorTheme(bool changeColorTheme = false)
                 if (inkColor == 0)
                 {
                     // Black
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 0, 0, 0);
+                    BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 0, 0, 0);
                 }
                 else if (inkColor == 5)
                 {
                     // White
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 255, 255, 255);
+                    BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 255, 255, 255);
                 }
                 else if (isUselightThemeColor)
                 {
                     if (inkColor == 1)
                         // Red
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 239, 68, 68);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 239, 68, 68);
                     else if (inkColor == 2)
                         // Green
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 34, 197, 94);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 34, 197, 94);
                     else if (inkColor == 3)
                         // Blue
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 59, 130, 246);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 59, 130, 246);
                     else if (inkColor == 4)
                         // Yellow
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 250, 204, 21);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 250, 204, 21);
                     else if (inkColor == 6)
                         // Pink
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 236, 72, 153);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 236, 72, 153);
                     else if (inkColor == 7)
                         // Teal (亮色)
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 20, 184, 166);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 20, 184, 166);
                     else if (inkColor == 8)
                         // Orange (亮色)
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 249, 115, 22);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 249, 115, 22);
                 }
                 else
                 {
                     if (inkColor == 1)
                         // Red
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 220, 38, 38);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 220, 38, 38);
                     else if (inkColor == 2)
                         // Green
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 22, 163, 74);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 22, 163, 74);
                     else if (inkColor == 3)
                         // Blue
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 37, 99, 235);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 37, 99, 235);
                     else if (inkColor == 4)
                         // Yellow
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 234, 179, 8);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 234, 179, 8);
                     else if (inkColor == 6)
                         // Pink ( Purple )
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 147, 51, 234);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 147, 51, 234);
                     else if (inkColor == 7)
                         // Teal (暗色)
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 13, 148, 136);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 13, 148, 136);
                     else if (inkColor == 8)
                         // Orange (暗色)
-                        inkCanvas.DefaultDrawingAttributes.Color = Color.FromArgb((byte)alpha, 234, 88, 12);
+                        BoardCanvasController.StrokeColor = Color.FromArgb((byte)alpha, 234, 88, 12);
                 }
             }
             else if (penType == 1)
             {
                 if (highlighterColor == 100)
                     // Black
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(0, 0, 0);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(0, 0, 0);
                 else if (highlighterColor == 101)
                     // White
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(250, 250, 250);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(250, 250, 250);
                 else if (highlighterColor == 102)
                     // Red
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(239, 68, 68);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(239, 68, 68);
                 else if (highlighterColor == 103)
                     // Yellow
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(253, 224, 71);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(253, 224, 71);
                 else if (highlighterColor == 104)
                     // Green
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(74, 222, 128);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(74, 222, 128);
                 else if (highlighterColor == 105)
                     // Zinc
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(113, 113, 122);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(113, 113, 122);
                 else if (highlighterColor == 106)
                     // Blue
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(59, 130, 246);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(59, 130, 246);
                 else if (highlighterColor == 107)
                     // Purple
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(168, 85, 247);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(168, 85, 247);
                 else if (highlighterColor == 108)
                     // teal
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(45, 212, 191);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(45, 212, 191);
                 else if (highlighterColor == 109)
                     // Orange
-                    inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(249, 115, 22);
+                    BoardCanvasController.StrokeColor = Color.FromRgb(249, 115, 22);
             }
 
             var penPalette = BorderPenColorPaletteControl as MainWindow_controls.PenColorPalette;
@@ -294,7 +294,7 @@ private void CheckColorTheme(bool changeColorTheme = false)
             // 更新快捷调色盘选择指示器
             if (penType == 0)
             {
-                UpdateQuickColorPaletteIndicator(inkCanvas.DefaultDrawingAttributes.Color);
+                UpdateQuickColorPaletteIndicator(BoardCanvasController.StrokeColor);
             }
         }
 
diff --git a/Ink Canvas/MainWindow_cs/MW_Eraser.cs b/Ink Canvas/MainWindow_cs/MW_Eraser.cs
index 0b1e203c..16c1f244 100644
--- a/Ink Canvas/MainWindow_cs/MW_Eraser.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Eraser.cs	
@@ -122,7 +122,7 @@ private void EraserOverlay_PointerDown(object sender)
                 eraserShape = new RectangleStylusShape(eraserWidth, _h);
             }
 
-            hitTester = inkCanvas.Strokes.GetIncrementalStrokeHitTester(eraserShape);
+            hitTester = BoardCanvasController.Strokes.GetIncrementalStrokeHitTester(eraserShape);
             hitTester.StrokeHit += EraserGeometry_StrokeHit;
 
             // 计算缩放矩阵
@@ -189,10 +189,10 @@ private void EraserOverlay_PointerMove(object sender, Point pt)
             if (isUsingStrokesEraser)
             {
                 // 笔画橡皮擦模式
-                var _filtered = inkCanvas.Strokes.HitTest(pt).Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
+                var _filtered = BoardCanvasController.Strokes.HitTest(pt).Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
                 var filtered = _filtered as Stroke[] ?? _filtered.ToArray();
                 if (!filtered.Any()) return;
-                inkCanvas.Strokes.Remove(new StrokeCollection(filtered));
+                BoardCanvasController.Strokes.Remove(new StrokeCollection(filtered));
             }
             else
             {
@@ -237,11 +237,11 @@ private void EraserGeometry_StrokeHit(object sender, StrokeHitEventArgs args)
             // 替换或删除笔画
             if (filteredResult.Any())
             {
-                inkCanvas.Strokes.Replace(new StrokeCollection(filtered2Replace), new StrokeCollection(filteredResult));
+                BoardCanvasController.Strokes.Replace(new StrokeCollection(filtered2Replace), new StrokeCollection(filteredResult));
             }
             else
             {
-                inkCanvas.Strokes.Remove(new StrokeCollection(filtered2Replace));
+                BoardCanvasController.Strokes.Remove(new StrokeCollection(filtered2Replace));
             }
         }
 
@@ -360,7 +360,7 @@ public void ApplyAdvancedEraserShape()
                 }
 
                 // 应用到InkCanvas
-                inkCanvas.EraserShape = eraserShape;
+                BoardCanvasController.EraserShape = eraserShape;
 
                 Trace.WriteLine($"Eraser: Applied shape - Size: {eraserWidth}, Circle: {isEraserCircleShape}");
             }
@@ -382,4 +382,4 @@ public string GetEraserStatusInfo()
                    $"- 模式: {(isUsingStrokesEraser ? "笔画" : "几何")}";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 050f6234..9022fcba 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -1559,7 +1559,7 @@ private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e)
                     FloatingbarUIForInkReplay.IsHitTestVisible = true;
                     BlackboardUIGridForInkReplay.Visibility = Visibility.Visible;
                     BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-                    inkCanvas.IsHitTestVisible = true;
+                    BoardCanvasController.IsHitTestVisible = true;
                     inkCanvas.IsManipulationEnabled = true;
 
                     if (inkCanvas.EditingMode == InkCanvasEditingMode.None)
@@ -1607,7 +1607,7 @@ private void InkCanvasForInkReplay_MouseDown(object sender, MouseButtonEventArgs
                 BlackboardUIGridForInkReplay.IsHitTestVisible = true;
                 AnimationsHelper.HideWithFadeOut(BorderInkReplayToolBox);
                 isStopInkReplay = true;
-                inkCanvas.IsHitTestVisible = true;
+                BoardCanvasController.IsHitTestVisible = true;
                 inkCanvas.IsManipulationEnabled = true;
 
                 if (inkCanvas.EditingMode == InkCanvasEditingMode.None)
@@ -2177,7 +2177,7 @@ internal async void CursorIcon_Click(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    inkCanvas.IsHitTestVisible = false;
+                    BoardCanvasController.IsHitTestVisible = false;
                     inkCanvas.Visibility = Visibility.Visible;
                 }
             }
@@ -2186,7 +2186,7 @@ internal async void CursorIcon_Click(object sender, RoutedEventArgs e)
                 if (Settings.PowerPointSettings.IsShowStrokeOnSelectInPowerPoint)
                 {
                     inkCanvas.Visibility = Visibility.Visible;
-                    inkCanvas.IsHitTestVisible = true;
+                    BoardCanvasController.IsHitTestVisible = true;
                 }
                 else
                 {
@@ -2196,7 +2196,7 @@ internal async void CursorIcon_Click(object sender, RoutedEventArgs e)
                     }
                     else
                     {
-                        inkCanvas.IsHitTestVisible = false;
+                        BoardCanvasController.IsHitTestVisible = false;
                         inkCanvas.Visibility = Visibility.Visible;
                     }
                 }
@@ -2306,7 +2306,7 @@ internal void PenIcon_Click(object sender, RoutedEventArgs e)
                 GridTransparencyFakeBackground.Opacity = 1;
                 GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
 
-                inkCanvas.IsHitTestVisible = true;
+                BoardCanvasController.IsHitTestVisible = true;
                 inkCanvas.Visibility = Visibility.Visible;
 
                 GridBackgroundCoverHolder.Visibility = Visibility.Visible;
@@ -2757,7 +2757,7 @@ private void SetQuickColor(Color color)
 
             // 设置画笔颜色
             drawingAttributes.Color = color;
-            inkCanvas.DefaultDrawingAttributes.Color = color;
+            BoardCanvasController.StrokeColor = color;
 
             // 如果当前是荧光笔模式，同时更新荧光笔颜色和属性
             if (penType == 1)
@@ -2814,7 +2814,7 @@ private void SetQuickColor(Color color)
                 inkCanvas.DefaultDrawingAttributes.IsHighlighter = true;
 
                 // 确保荧光笔颜色索引正确更新
-                inkCanvas.DefaultDrawingAttributes.Color = drawingAttributes.Color;
+                BoardCanvasController.StrokeColor = drawingAttributes.Color;
             }
 
             // 更新颜色状态
@@ -3302,7 +3302,7 @@ private void ResetTouchStates()
                     isPalmEraserActive = false;
 
                 // 确保触摸事件能正常响应
-                inkCanvas.IsHitTestVisible = true;
+                BoardCanvasController.IsHitTestVisible = true;
                 inkCanvas.IsManipulationEnabled = true;
 
                 // 释放所有触摸捕获
@@ -3583,7 +3583,7 @@ private void BtnHideInkCanvas_Click(object sender, RoutedEventArgs e)
                 // 进入批注模式
                 GridTransparencyFakeBackground.Opacity = 1;
                 GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
-                inkCanvas.IsHitTestVisible = true;
+                BoardCanvasController.IsHitTestVisible = true;
                 inkCanvas.Visibility = Visibility.Visible;
 
                 GridBackgroundCoverHolder.Visibility = Visibility.Visible;
@@ -3636,7 +3636,7 @@ private void BtnHideInkCanvas_Click(object sender, RoutedEventArgs e)
                             //BtnClear_Click(null, null);
                         }
 
-                    inkCanvas.IsHitTestVisible = true;
+                    BoardCanvasController.IsHitTestVisible = true;
                     inkCanvas.Visibility = Visibility.Visible;
                 }
                 else
@@ -3656,11 +3656,11 @@ private void BtnHideInkCanvas_Click(object sender, RoutedEventArgs e)
                     if (Settings.PowerPointSettings.IsShowStrokeOnSelectInPowerPoint)
                     {
                         inkCanvas.Visibility = Visibility.Visible;
-                        inkCanvas.IsHitTestVisible = true;
+                        BoardCanvasController.IsHitTestVisible = true;
                     }
                     else
                     {
-                        inkCanvas.IsHitTestVisible = true;
+                        BoardCanvasController.IsHitTestVisible = true;
                         inkCanvas.Visibility = Visibility.Visible;
                     }
                 }
diff --git a/Ink Canvas/MainWindow_cs/MW_Timer.cs b/Ink Canvas/MainWindow_cs/MW_Timer.cs
index 0190d673..2568be9c 100644
--- a/Ink Canvas/MainWindow_cs/MW_Timer.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Timer.cs	
@@ -323,7 +323,7 @@ private void AutoSaveStrokesTimer_Tick(object sender, EventArgs e)
             try
             {
                 // 只有在画布可见且有墨迹时才保存
-                if (inkCanvas.Visibility == Visibility.Visible && inkCanvas.Strokes.Count > 0)
+                if (BoardCanvasController.Visibility == Visibility.Visible && BoardCanvasController.Strokes.Count > 0)
                 {
                     // 静默保存
                     SaveInkCanvasStrokes(false, false);
@@ -1221,7 +1221,7 @@ private void timerCheckAutoUpdateWithSilence_Elapsed(object sender, ElapsedEvent
                     {
                         // 判断是否处于批注模式（inkCanvas.EditingMode == InkCanvasEditingMode.Ink）
                         // 判断是否处于画板模式（!Topmost）
-                        if (inkCanvas.EditingMode != InkCanvasEditingMode.Ink && Topmost)
+                        if (BoardCanvasController.EditingMode != InkCanvasEditingMode.Ink && Topmost)
                         {
                             // 检查是否有未保存的内容或正在进行的操作
                             if (!isHidingSubPanelsWhenInking)
@@ -1455,8 +1455,8 @@ private void EraserAutoSwitchBackTimer_Tick(object sender, EventArgs e)
             try
             {
                 // 检查是否仍然在橡皮擦模式
-                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint &&
-                    inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
+                if (BoardCanvasController.EditingMode != InkCanvasEditingMode.EraseByPoint &&
+                    BoardCanvasController.EditingMode != InkCanvasEditingMode.EraseByStroke)
                 {
                     StopEraserAutoSwitchBackTimer();
                     return;

From b8251b9312feec736e227afcca320fd7446402ed Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 20:13:44 +0800
Subject: [PATCH 13/15] fix: use absolute pack URI for ImageResizeHandles
 resources

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
index 517800ac..6580554e 100644
--- a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
@@ -5,7 +5,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="MainWindow_cs/MW_ToolbarIcons.xaml"/>
+                <ResourceDictionary Source="/InkCanvasForClass;component/MainWindow_cs/MW_ToolbarIcons.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

From 1ba7ef0596822c01e52312c83004f04b3e826069 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 21:00:56 +0800
Subject: [PATCH 14/15] fix: inline ImageResizeHandles styles to avoid runtime
 lookup failure

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 .../ImageResizeHandles.xaml                   | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml
index 6580554e..a9555796 100644
--- a/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
+++ b/Ink Canvas/MainWindow_controls/ImageResizeHandles.xaml	
@@ -3,11 +3,25 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Name="Root">
     <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/InkCanvasForClass;component/MainWindow_cs/MW_ToolbarIcons.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
+        <Style x:Key="ImageResizeHandleBase" TargetType="Ellipse">
+            <Setter Property="Width" Value="8"/>
+            <Setter Property="Height" Value="8"/>
+            <Setter Property="Fill" Value="White"/>
+            <Setter Property="Stroke" Value="#0078D4"/>
+            <Setter Property="StrokeThickness" Value="1"/>
+        </Style>
+        <Style x:Key="ImageResizeHandleNWSE" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+            <Setter Property="Cursor" Value="SizeNWSE"/>
+        </Style>
+        <Style x:Key="ImageResizeHandleNESW" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+            <Setter Property="Cursor" Value="SizeNESW"/>
+        </Style>
+        <Style x:Key="ImageResizeHandleNS" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+            <Setter Property="Cursor" Value="SizeNS"/>
+        </Style>
+        <Style x:Key="ImageResizeHandleWE" TargetType="Ellipse" BasedOn="{StaticResource ImageResizeHandleBase}">
+            <Setter Property="Cursor" Value="SizeWE"/>
+        </Style>
     </UserControl.Resources>
     <Canvas Name="ImageResizeHandlesCanvas"
             Visibility="Collapsed"

From 203dae7f74d35faa12455a5682c2973192bbfe8c Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Thu, 9 Apr 2026 22:31:13 +0800
Subject: [PATCH 15/15] fix: disambiguate reflection calls in hardware
 fingerprint generation

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 Ink Canvas/Helpers/DeviceIdentifier.cs | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Ink Canvas/Helpers/DeviceIdentifier.cs b/Ink Canvas/Helpers/DeviceIdentifier.cs
index a78e1a4d..020d4e54 100644
--- a/Ink Canvas/Helpers/DeviceIdentifier.cs	
+++ b/Ink Canvas/Helpers/DeviceIdentifier.cs	
@@ -129,10 +129,10 @@ private static string GenerateHardwareFingerprint()
                     {
                         var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
                         var searcher = Activator.CreateInstance(searcherType, "SELECT ProcessorId FROM Win32_Processor");
-                        var getMethod = searcherType.GetMethod("Get");
+                        var getMethod = GetPublicInstanceMethod(searcherType, "Get");
                         var enumerator = getMethod.Invoke(searcher, null);
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var moveNextMethod = GetPublicInstanceMethod(enumerator.GetType(), "MoveNext");
                         var currentProperty = enumerator.GetType().GetProperty("Current");
 
                         if ((bool)moveNextMethod.Invoke(enumerator, null))
@@ -143,7 +143,7 @@ private static string GenerateHardwareFingerprint()
                             hardwareInfo.Append(processorId?.ToString() ?? "");
                         }
 
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        var disposeMethod = GetPublicInstanceMethod(searcher.GetType(), "Dispose");
                         disposeMethod?.Invoke(searcher, null);
                     }
                     catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
@@ -153,10 +153,10 @@ private static string GenerateHardwareFingerprint()
                     {
                         var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
                         var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BaseBoard");
-                        var getMethod = searcherType.GetMethod("Get");
+                        var getMethod = GetPublicInstanceMethod(searcherType, "Get");
                         var enumerator = getMethod.Invoke(searcher, null);
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var moveNextMethod = GetPublicInstanceMethod(enumerator.GetType(), "MoveNext");
                         var currentProperty = enumerator.GetType().GetProperty("Current");
 
                         if ((bool)moveNextMethod.Invoke(enumerator, null))
@@ -167,7 +167,7 @@ private static string GenerateHardwareFingerprint()
                             hardwareInfo.Append(serialNumber?.ToString() ?? "");
                         }
 
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        var disposeMethod = GetPublicInstanceMethod(searcher.GetType(), "Dispose");
                         disposeMethod?.Invoke(searcher, null);
                     }
                     catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
@@ -177,10 +177,10 @@ private static string GenerateHardwareFingerprint()
                     {
                         var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
                         var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BIOS");
-                        var getMethod = searcherType.GetMethod("Get");
+                        var getMethod = GetPublicInstanceMethod(searcherType, "Get");
                         var enumerator = getMethod.Invoke(searcher, null);
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var moveNextMethod = GetPublicInstanceMethod(enumerator.GetType(), "MoveNext");
                         var currentProperty = enumerator.GetType().GetProperty("Current");
 
                         if ((bool)moveNextMethod.Invoke(enumerator, null))
@@ -191,7 +191,7 @@ private static string GenerateHardwareFingerprint()
                             hardwareInfo.Append(serialNumber?.ToString() ?? "");
                         }
 
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        var disposeMethod = GetPublicInstanceMethod(searcher.GetType(), "Dispose");
                         disposeMethod?.Invoke(searcher, null);
                     }
                     catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
@@ -201,10 +201,10 @@ private static string GenerateHardwareFingerprint()
                     {
                         var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
                         var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'");
-                        var getMethod = searcherType.GetMethod("Get");
+                        var getMethod = GetPublicInstanceMethod(searcherType, "Get");
                         var enumerator = getMethod.Invoke(searcher, null);
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var moveNextMethod = GetPublicInstanceMethod(enumerator.GetType(), "MoveNext");
                         var currentProperty = enumerator.GetType().GetProperty("Current");
 
                         if ((bool)moveNextMethod.Invoke(enumerator, null))
@@ -215,7 +215,7 @@ private static string GenerateHardwareFingerprint()
                             hardwareInfo.Append(serialNumber?.ToString() ?? "");
                         }
 
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        var disposeMethod = GetPublicInstanceMethod(searcher.GetType(), "Dispose");
                         disposeMethod?.Invoke(searcher, null);
                     }
                     catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
@@ -235,6 +235,12 @@ private static string GenerateHardwareFingerprint()
             return hardwareInfo.ToString();
         }
 
+        private static MethodInfo GetPublicInstanceMethod(Type type, string methodName)
+        {
+            if (type == null || string.IsNullOrEmpty(methodName)) return null;
+            return type.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null);
+        }
+
         /// <summary>
         /// 基于硬件指纹生成25字符的设备ID
         /// </summary>