diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/ComboBoxStyles.xaml b/Ink Canvas/Windows/SettingsViews/SettingsViews/ComboBoxStyles.xaml
new file mode 100644
index 00000000..7e9e349e
--- /dev/null
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/ComboBoxStyles.xaml	
@@ -0,0 +1,136 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="ComboBoxStyle" TargetType="ComboBox">
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="#e6e6e6"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="13,7"/>
+        <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="#2e3436"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"
+                                      Background="Transparent"
+                                      BorderThickness="0"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <Border Background="Transparent" 
+                                            HorizontalAlignment="Stretch" 
+                                            VerticalAlignment="Stretch"/>
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                        </ToggleButton>
+                        <Border x:Name="Border" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                CornerRadius="8"
+                                IsHitTestVisible="False">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0" 
+                                                  Margin="{TemplateBinding Padding}" 
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  Content="{TemplateBinding SelectionBoxItem}"
+                                                  ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"/>
+                                <Path x:Name="Arrow" Grid.Column="1" 
+                                      Data="M 0 0 L 5 5 L 10 0 Z" 
+                                      Fill="#9a9996" 
+                                      VerticalAlignment="Center" 
+                                      HorizontalAlignment="Center" 
+                                      Margin="0,0,12,0" 
+                                      Width="10" 
+                                      Height="5"
+                                      Stretch="Uniform"
+                                      IsHitTestVisible="False"/>
+                            </Grid>
+                        </Border>
+                        <Popup x:Name="Popup" 
+                               Placement="Bottom" 
+                               PlacementTarget="{Binding ElementName=Border}" 
+                               AllowsTransparency="True" 
+                               PopupAnimation="Fade" 
+                               IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                               StaysOpen="False">
+                            <Border Background="White" 
+                                    BorderBrush="#e6e6e6" 
+                                    BorderThickness="1" 
+                                    CornerRadius="8" 
+                                    MaxHeight="300"
+                                    MinWidth="{Binding ActualWidth, ElementName=Border}">
+                                <Border.Effect>
+                                    <DropShadowEffect BlurRadius="8" Direction="270" ShadowDepth="4" Color="Black" Opacity="0.15"/>
+                                </Border.Effect>
+                                <ScrollViewer VerticalScrollBarVisibility="Auto" 
+                                              HorizontalScrollBarVisibility="Disabled"
+                                              Padding="4">
+                                    <ItemsPresenter/>
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
+                        </Trigger>
+                        <Trigger Property="IsDropDownOpen" Value="True">
+                            <Setter TargetName="Arrow" Property="Data" Value="M 0 5 L 5 0 L 10 5 Z"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!-- ComboBoxItem样式 - 符合设置页面风格 -->
+    <Style x:Key="ComboBoxItemStyle" TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="Foreground" Value="#2e3436"/>
+        <Setter Property="Padding" Value="13,8"/>
+        <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="MinHeight" Value="36"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Border" 
+                            Background="{TemplateBinding Background}" 
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="#f5f5f5"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="#e1e1e1"/>
+                            <Setter Property="FontWeight" Value="Bold"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
+
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/SnapshotPanel.xaml b/Ink Canvas/Windows/SettingsViews/SettingsViews/SnapshotPanel.xaml
index 36c41802..a5d19a9b 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/SnapshotPanel.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/SnapshotPanel.xaml	
@@ -8,29 +8,22 @@
              mc:Ignorable="d" 
              d:DesignHeight="950" d:DesignWidth="640">
     <UserControl.Resources>
-        <!-- 开关样式模板 -->
-        <Style x:Key="ToggleSwitchStyle" TargetType="Border">
-            <Setter Property="Width" Value="48"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="CornerRadius" Value="12"/>
-            <Setter Property="Padding" Value="3,0"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="Margin" Value="0,0,15,0"/>
-        </Style>
-        <!-- 下拉框样式模板 -->
-        <Style x:Key="ComboBoxStyle" TargetType="ComboBox">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="#e6e6e6"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,6"/>
-            <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Foreground" Value="#2e3436"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ComboBoxStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <!-- 开关样式模板 -->
+            <Style x:Key="ToggleSwitchStyle" TargetType="Border">
+                <Setter Property="Width" Value="48"/>
+                <Setter Property="Height" Value="25"/>
+                <Setter Property="CornerRadius" Value="12"/>
+                <Setter Property="Padding" Value="3,0"/>
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Right"/>
+                <Setter Property="Margin" Value="0,0,15,0"/>
+            </Style>
+        </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer ScrollChanged="ScrollViewerEx_ScrollChanged" IsManipulationEnabled="True" Name="ScrollViewerEx" IsDeferredScrollingEnabled="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" IsTabStop="False" TabIndex="-1" Margin="0,0,2,2">
         <StackPanel Margin="60,12,60,24">
@@ -149,35 +142,22 @@
                             <TextBlock Foreground="#2e3436" FontSize="14.5" Text="保存时长" HorizontalAlignment="Left"/>
                             <TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" TextWrapping="Wrap" Text="设置自动删除文件的保存时长" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <WrapPanel Orientation="Horizontal" Margin="0,0,0,8">
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold1Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_1" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="1天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold3Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_3" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="3天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold5Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_5" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="5天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold7Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_7" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="7天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold15Border" Padding="13,7" CornerRadius="8" Background="#e1e1e1" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_15" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" FontWeight="Bold" Text="15天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold30Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_30" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="30天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold60Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_60" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="60天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold100Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_100" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="100天"/>
-                            </Border>
-                            <Border x:Name="AutoDelSavedFilesDaysThreshold365Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="AutoDelSavedFilesDaysThreshold_365" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="365天"/>
-                            </Border>
-                        </WrapPanel>
+                        <ComboBox x:Name="ComboBoxAutoDelSavedFilesDaysThreshold" 
+                                  Style="{StaticResource ComboBoxStyle}"
+                                  ItemContainerStyle="{StaticResource ComboBoxItemStyle}"
+                                  HorizontalAlignment="Left"
+                                  Width="150"
+                                  SelectedIndex="4">
+                            <ComboBoxItem Content="1天" Tag="AutoDelSavedFilesDaysThreshold_1"/>
+                            <ComboBoxItem Content="3天" Tag="AutoDelSavedFilesDaysThreshold_3"/>
+                            <ComboBoxItem Content="5天" Tag="AutoDelSavedFilesDaysThreshold_5"/>
+                            <ComboBoxItem Content="7天" Tag="AutoDelSavedFilesDaysThreshold_7"/>
+                            <ComboBoxItem Content="15天" Tag="AutoDelSavedFilesDaysThreshold_15" IsSelected="True"/>
+                            <ComboBoxItem Content="30天" Tag="AutoDelSavedFilesDaysThreshold_30"/>
+                            <ComboBoxItem Content="60天" Tag="AutoDelSavedFilesDaysThreshold_60"/>
+                            <ComboBoxItem Content="100天" Tag="AutoDelSavedFilesDaysThreshold_100"/>
+                            <ComboBoxItem Content="365天" Tag="AutoDelSavedFilesDaysThreshold_365"/>
+                        </ComboBox>
                     </StackPanel>
                 </StackPanel>
             </Border>
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml b/Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml
index 3bae602c..5c88eed9 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml	
@@ -8,154 +8,22 @@
              mc:Ignorable="d" 
              d:DesignHeight="950" d:DesignWidth="640">
     <UserControl.Resources>
-        <!-- 开关样式模板 -->
-        <Style x:Key="ToggleSwitchStyle" TargetType="Border">
-            <Setter Property="Width" Value="48"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="CornerRadius" Value="12"/>
-            <Setter Property="Padding" Value="3,0"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="Margin" Value="0,0,15,0"/>
-        </Style>
-        <!-- 下拉框样式模板 -->
-        <Style x:Key="ComboBoxStyle" TargetType="ComboBox">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="#e6e6e6"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="13,7"/>
-            <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Foreground" Value="#2e3436"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Left"/>
-            <Setter Property="MinHeight" Value="32"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBox">
-                        <Grid>
-                            <ToggleButton x:Name="ToggleButton"
-                                          Focusable="False"
-                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                          ClickMode="Press"
-                                          Background="Transparent"
-                                          BorderThickness="0"
-                                          HorizontalAlignment="Stretch"
-                                          VerticalAlignment="Stretch">
-                                <ToggleButton.Template>
-                                    <ControlTemplate TargetType="ToggleButton">
-                                        <Border Background="Transparent" 
-                                                HorizontalAlignment="Stretch" 
-                                                VerticalAlignment="Stretch"/>
-                                    </ControlTemplate>
-                                </ToggleButton.Template>
-                            </ToggleButton>
-                            <Border x:Name="Border" 
-                                    Background="{TemplateBinding Background}" 
-                                    BorderBrush="{TemplateBinding BorderBrush}" 
-                                    BorderThickness="{TemplateBinding BorderThickness}" 
-                                    CornerRadius="8"
-                                    IsHitTestVisible="False">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter Grid.Column="0" 
-                                                      Margin="{TemplateBinding Padding}" 
-                                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
-                                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                      Content="{TemplateBinding SelectionBoxItem}"
-                                                      ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"/>
-                                    <Path x:Name="Arrow" Grid.Column="1" 
-                                          Data="M 0 0 L 5 5 L 10 0 Z" 
-                                          Fill="#9a9996" 
-                                          VerticalAlignment="Center" 
-                                          HorizontalAlignment="Center" 
-                                          Margin="0,0,12,0" 
-                                          Width="10" 
-                                          Height="5"
-                                          Stretch="Uniform"
-                                          IsHitTestVisible="False"/>
-                                </Grid>
-                            </Border>
-                            <Popup x:Name="Popup" 
-                                   Placement="Bottom" 
-                                   PlacementTarget="{Binding ElementName=Border}" 
-                                   AllowsTransparency="True" 
-                                   PopupAnimation="Fade" 
-                                   IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                   StaysOpen="False">
-                                <Border Background="White" 
-                                        BorderBrush="#e6e6e6" 
-                                        BorderThickness="1" 
-                                        CornerRadius="8" 
-                                        MaxHeight="300"
-                                        MinWidth="{Binding ActualWidth, ElementName=Border}">
-                                    <Border.Effect>
-                                        <DropShadowEffect BlurRadius="8" Direction="270" ShadowDepth="4" Color="Black" Opacity="0.15"/>
-                                    </Border.Effect>
-                                    <ScrollViewer VerticalScrollBarVisibility="Auto" 
-                                                  HorizontalScrollBarVisibility="Disabled"
-                                                  Padding="4">
-                                        <ItemsPresenter/>
-                                    </ScrollViewer>
-                                </Border>
-                            </Popup>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
-                            </Trigger>
-                            <Trigger Property="IsFocused" Value="True">
-                                <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
-                            </Trigger>
-                            <Trigger Property="IsDropDownOpen" Value="True">
-                                <Setter TargetName="Arrow" Property="Data" Value="M 0 5 L 5 0 L 10 5 Z"/>
-                                <Setter TargetName="Border" Property="BorderBrush" Value="#3584e4"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <!-- ComboBoxItem样式 - 符合设置页面风格 -->
-        <Style x:Key="ComboBoxItemStyle" TargetType="ComboBoxItem">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="Foreground" Value="#2e3436"/>
-            <Setter Property="Padding" Value="13,8"/>
-            <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="MinHeight" Value="36"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBoxItem">
-                        <Border x:Name="Border" 
-                                Background="{TemplateBinding Background}" 
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#f5f5f5"/>
-                            </Trigger>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#e1e1e1"/>
-                                <Setter Property="Foreground" Value="#2e3436"/>
-                                <Setter Property="FontWeight" Value="Bold"/>
-                            </Trigger>
-                            <Trigger Property="IsHighlighted" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#f5f5f5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ComboBoxStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <!-- 开关样式模板 -->
+            <Style x:Key="ToggleSwitchStyle" TargetType="Border">
+                <Setter Property="Width" Value="48"/>
+                <Setter Property="Height" Value="25"/>
+                <Setter Property="CornerRadius" Value="12"/>
+                <Setter Property="Padding" Value="3,0"/>
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Right"/>
+                <Setter Property="Margin" Value="0,0,15,0"/>
+            </Style>
+        </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer ScrollChanged="ScrollViewerEx_ScrollChanged" IsManipulationEnabled="True" Name="ScrollViewerEx" IsDeferredScrollingEnabled="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" IsTabStop="False" TabIndex="-1" Margin="0,0,2,2">
         <StackPanel Margin="60,12,60,24">
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml b/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml
index 1a8d0ce9..2196d131 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml	
@@ -8,29 +8,22 @@
              mc:Ignorable="d" 
              d:DesignHeight="950" d:DesignWidth="640">
     <UserControl.Resources>
-        <!-- 开关样式模板 -->
-        <Style x:Key="ToggleSwitchStyle" TargetType="Border">
-            <Setter Property="Width" Value="48"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="CornerRadius" Value="12"/>
-            <Setter Property="Padding" Value="3,0"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="Margin" Value="0,0,15,0"/>
-        </Style>
-        <!-- 下拉框样式模板 -->
-        <Style x:Key="ComboBoxStyle" TargetType="ComboBox">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="#e6e6e6"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,6"/>
-            <Setter Property="FontFamily" Value="Microsoft YaHei UI"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Foreground" Value="#2e3436"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ComboBoxStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <!-- 开关样式模板 -->
+            <Style x:Key="ToggleSwitchStyle" TargetType="Border">
+                <Setter Property="Width" Value="48"/>
+                <Setter Property="Height" Value="25"/>
+                <Setter Property="CornerRadius" Value="12"/>
+                <Setter Property="Padding" Value="3,0"/>
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Right"/>
+                <Setter Property="Margin" Value="0,0,15,0"/>
+            </Style>
+        </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer ScrollChanged="ScrollViewerEx_ScrollChanged" IsManipulationEnabled="True" Name="ScrollViewerEx" IsDeferredScrollingEnabled="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" IsTabStop="False" TabIndex="-1" Margin="0,0,2,2">
         <StackPanel Margin="60,12,60,24">
@@ -79,29 +72,19 @@
                             <TextBlock Foreground="#2e3436" FontSize="14.5" Text="启动动画样式" HorizontalAlignment="Left"/>
                             <TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" Text="选择启动动画的样式" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <WrapPanel Orientation="Horizontal">
-                            <Border x:Name="SplashScreenStyleRandomBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Random" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="随机"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleSeasonBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Season" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="跟随四季"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleSpringBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Spring" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="春季"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleSummerBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Summer" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="夏季"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleAutumnBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Autumn" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="秋季"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleWinterBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Winter" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="冬季"/>
-                            </Border>
-                            <Border x:Name="SplashScreenStyleHorseBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="SplashScreenStyle_Horse" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="马年限定"/>
-                            </Border>
-                        </WrapPanel>
+                        <ComboBox x:Name="ComboBoxSplashScreenStyle" 
+                                  Style="{StaticResource ComboBoxStyle}"
+                                  ItemContainerStyle="{StaticResource ComboBoxItemStyle}"
+                                  HorizontalAlignment="Left"
+                                  Width="200">
+                            <ComboBoxItem Content="随机" Tag="SplashScreenStyle_Random"/>
+                            <ComboBoxItem Content="跟随四季" Tag="SplashScreenStyle_Season"/>
+                            <ComboBoxItem Content="春季" Tag="SplashScreenStyle_Spring"/>
+                            <ComboBoxItem Content="夏季" Tag="SplashScreenStyle_Summer"/>
+                            <ComboBoxItem Content="秋季" Tag="SplashScreenStyle_Autumn"/>
+                            <ComboBoxItem Content="冬季" Tag="SplashScreenStyle_Winter"/>
+                            <ComboBoxItem Content="马年限定" Tag="SplashScreenStyle_Horse"/>
+                        </ComboBox>
                     </StackPanel>
                 </StackPanel>
             </Border>
@@ -114,44 +97,25 @@
                             <TextBlock Foreground="#2e3436" FontSize="14.5" Text="浮动工具栏图标" HorizontalAlignment="Left"/>
                             <TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" Text="选择浮动工具栏的图标样式" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <WrapPanel Orientation="Horizontal">
-                            <Border x:Name="FloatingBarImgDefaultBorder" Padding="13,7" CornerRadius="8" Background="#e1e1e1" Cursor="Hand" Tag="FloatingBarImg_Default" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" FontWeight="Bold" Text="&quot;ICC-CE&quot;默认"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgNoShadowBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_NoShadow" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="&quot;ICC-CE&quot;无阴影"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgDarkBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Dark" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="&quot;ICC-CE&quot;深色"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgDarkBreathingBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_DarkBreathing" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="&quot;ICC-CE&quot;深色呼吸版"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgWhiteTransparentBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_WhiteTransparent" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="&quot;ICC-CE&quot;白色透明版"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgBlackTransparentBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_BlackTransparent" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="&quot;ICC-CE&quot;黑色透明版"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgKuan1Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Kuan1" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="酷安斗鸡眼滑稽"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgKuan2Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Kuan2" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="酷安受虐滑稽"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgKuan3Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Kuan3" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="酷安呲牙笑"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgKuan4Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Kuan4" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="酷安头戴内裤滑稽"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgKuan5Border" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Kuan5" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="酷安绿帽Doge"/>
-                            </Border>
-                            <Border x:Name="FloatingBarImgTiebaBorder" Padding="13,7" CornerRadius="8" Cursor="Hand" Tag="FloatingBarImg_Tieba" Margin="0,0,8,8">
-                                <TextBlock Foreground="#2e3436" FontSize="14" Text="贴吧滑稽"/>
-                            </Border>
-                        </WrapPanel>
+                        <ComboBox x:Name="ComboBoxFloatingBarImg" 
+                                  Style="{StaticResource ComboBoxStyle}"
+                                  ItemContainerStyle="{StaticResource ComboBoxItemStyle}"
+                                  HorizontalAlignment="Left"
+                                  Width="250"
+                                  SelectedIndex="0">
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;默认" Tag="FloatingBarImg_Default" IsSelected="True"/>
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;无阴影" Tag="FloatingBarImg_NoShadow"/>
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;深色" Tag="FloatingBarImg_Dark"/>
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;深色呼吸版" Tag="FloatingBarImg_DarkBreathing"/>
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;白色透明版" Tag="FloatingBarImg_WhiteTransparent"/>
+                            <ComboBoxItem Content="&quot;ICC-CE&quot;黑色透明版" Tag="FloatingBarImg_BlackTransparent"/>
+                            <ComboBoxItem Content="酷安斗鸡眼滑稽" Tag="FloatingBarImg_Kuan1"/>
+                            <ComboBoxItem Content="酷安受虐滑稽" Tag="FloatingBarImg_Kuan2"/>
+                            <ComboBoxItem Content="酷安呲牙笑" Tag="FloatingBarImg_Kuan3"/>
+                            <ComboBoxItem Content="酷安头戴内裤滑稽" Tag="FloatingBarImg_Kuan4"/>
+                            <ComboBoxItem Content="酷安绿帽Doge" Tag="FloatingBarImg_Kuan5"/>
+                            <ComboBoxItem Content="贴吧滑稽" Tag="FloatingBarImg_Tieba"/>
+                        </ComboBox>
                     </StackPanel>
                     <Border Height="1" Background="#ebebeb"/>
                     <Grid Height="54">