diff --git a/Actions/AdvancedShutdownAction.cs b/Actions/AdvancedShutdownAction.cs
index bf016d7..ef5a366 100644
--- a/Actions/AdvancedShutdownAction.cs
+++ b/Actions/AdvancedShutdownAction.cs
@@ -317,8 +317,7 @@ private async Task ShowStyledDialogAsync()
 
         var dialog = new AdvancedShutdownDialog
         {
-            CanResize = false,
-            SystemDecorations = SystemDecorations.Full
+            CanResize = false
         };
         _activeDialog = dialog;
 
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
index 62679e7..0f8cbe2 100644
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -2,9 +2,9 @@
   "profiles": {
     "ClassIsland 插件": {
       "commandName": "Executable",
-      "executablePath": "F:\\ci\\Newest\\app-2.0.2.0-0\\ClassIsland.Desktop.exe",
+      "executablePath": "C:\\Users\\arcwolf\\source\\repos\\ClassIsland\\ClassIsland.Desktop\\bin\\Debug\\net8.0-windows10.0.19041.0\\ClassIsland.Desktop.exe",
       "commandLineArgs": "-epp $(TargetDir)",
-      "workingDirectory": "F:\\ci\\Newest\\"
+      "workingDirectory": "D:\\Users\\arcwolf\\Documents\\ci"
     }
   }
 }
\ No newline at end of file
diff --git a/Views/AdvancedShutdownDialog.axaml b/Views/AdvancedShutdownDialog.axaml
index 55c7da0..40435f3 100644
--- a/Views/AdvancedShutdownDialog.axaml
+++ b/Views/AdvancedShutdownDialog.axaml
@@ -1,4 +1,4 @@
-<Window x:Class="SystemTools.Views.AdvancedShutdownDialog"
+<ci:MyWindow x:Class="SystemTools.Views.AdvancedShutdownDialog"
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ci="http://classisland.tech/schemas/xaml/core"
@@ -6,22 +6,17 @@
         Height="215" 
         WindowStartupLocation="CenterScreen"
         Topmost="True"
-        SystemDecorations="None"
         CanResize="False"
-        Title="SystemTools - 高级计时关机">
+        Title="高级计时关机"
+        ShowAsDialog="True">
     
-    <Border Margin="7" Padding="10" CornerRadius="7"
+    <Border Padding="16" CornerRadius="8"
             Background="{DynamicResource LayerFillColorAltBrush}">
         <Grid RowDefinitions="Auto,Auto,Auto,Auto"  RowSpacing="8">
             
             <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="10">
-                <StackPanel>
-                    <TextBlock Text=" " FontSize="0.1" />
-                </StackPanel>
-                <ci:FluentIcon Glyph="&#xE4C4;" FontSize="21" FontWeight="SemiBold" VerticalAlignment="Center" />
-                <StackPanel>
-                    <TextBlock Text="即将关机…" FontSize="19.5" FontWeight="SemiBold" VerticalAlignment="Center" />
-                </StackPanel>
+                <ci:FluentIcon Glyph="&#xE4C4;" FontSize="21" FontWeight="SemiBold" VerticalAlignment="Center" Foreground="{DynamicResource AccentFillColorDefaultBrush}" />
+                <TextBlock Text="即将关机…" FontSize="19.5" FontWeight="SemiBold" VerticalAlignment="Center" />
             </StackPanel>
 
             <Border Grid.Row="1" Padding="16" CornerRadius="8"
@@ -30,44 +25,48 @@
                     <TextBlock x:Name="CountdownTextBlockElement"
                                FontSize="18"
                                FontWeight="SemiBold"
+                               Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                Text="将在2分00秒后关机……" />
-                    <ProgressBar x:Name="CountdownProgressBarElement" Height="5" Minimum="0" Maximum="3000" Value="3000" />
+                    <ProgressBar x:Name="CountdownProgressBarElement" Height="5" Minimum="0" Maximum="3000" Value="3000">
+                        <ProgressBar.Styles>
+                            <Style Selector="ProgressBar">
+                                <Setter Property="Foreground" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+                            </Style>
+                        </ProgressBar.Styles>
+                    </ProgressBar>
                 </StackPanel>
             </Border>
 
             <StackPanel Grid.Row="2" Spacing="12">
-                <TextBlock Text="   即将关闭计算机。请及时保存您的工作或选择其他操作。"
+                <TextBlock Text="即将关闭计算机。请及时保存您的工作或选择其他操作。"
                            TextWrapping="Wrap"
                            FontSize="14"
                            Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
-                <Separator Height="1" Opacity="0.2" Background="{DynamicResource TextFillColorSecondaryBrush}"/>
             </StackPanel>
 
-            <Grid Grid.Row="3" ColumnDefinitions="Auto,*">
+            <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto,Auto">
                 <Button x:Name="ReadButtonElement" 
                         Grid.Column="0"
                         Height="33"
                         MinWidth="81" 
                         Classes="accent" 
                         IsDefault="True">
-                    <ci:IconText Glyph="&#xE423;" Text="已阅" Spacing="8" FontSize="15"/>
+                    <ci:IconText Glyph="&#xE423;" Text="已阅" Spacing="8" FontSize="15" Foreground="{DynamicResource TextOnAccentFillColorSelectedTextBrush}"/>
                 </Button>
     
-                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
-                    <Button x:Name="ImmediateShutdownButtonElement" Height="33" MinWidth="110">
-                        <ci:IconText Glyph="&#xEDE8;" Text="立即关机" Spacing="8" FontSize="15"/>
-                    </Button>
+                <Button x:Name="ImmediateShutdownButtonElement" Height="33" MinWidth="110" Grid.Column="1" Margin="0 0 8 0">
+                    <ci:IconText Glyph="&#xEDE8;" Text="立即关机" Spacing="8" FontSize="15"/>
+                </Button>
         
-                    <Button x:Name="ExtendButtonElement" Height="33" MinWidth="110">
-                        <ci:IconText Glyph="&#xE31C;" Text="延迟关机" Spacing="8" FontSize="15"/>
-                    </Button>
-                    
-                    <Button x:Name="CancelPlanButtonElement" Height="33" MinWidth="130">
-                        <ci:IconText Glyph="&#xE4CC;" Text="取消关机计划" Spacing="8" FontSize="15"/>
-                    </Button>
-                </StackPanel>
+                <Button x:Name="ExtendButtonElement" Height="33" MinWidth="110" Grid.Column="2" Margin="0 0 8 0">
+                    <ci:IconText Glyph="&#xE31C;" Text="延迟关机" Spacing="8" FontSize="15"/>
+                </Button>
+                
+                <Button x:Name="CancelPlanButtonElement" Height="33" MinWidth="130" Grid.Column="3">
+                    <ci:IconText Glyph="&#xE4CC;" Text="取消关机计划" Spacing="8" FontSize="15"/>
+                </Button>
             </Grid>
 
         </Grid>
     </Border>
-</Window>
+</ci:MyWindow>
diff --git a/Views/AdvancedShutdownDialog.axaml.cs b/Views/AdvancedShutdownDialog.axaml.cs
index 26065fe..fc63f30 100644
--- a/Views/AdvancedShutdownDialog.axaml.cs
+++ b/Views/AdvancedShutdownDialog.axaml.cs
@@ -3,10 +3,11 @@
 using Avalonia.Markup.Xaml;
 using System;
 using Avalonia.Threading;
+using ClassIsland.Core.Controls;
 
 namespace SystemTools.Views;
 
-public partial class AdvancedShutdownDialog : Window
+public partial class AdvancedShutdownDialog : MyWindow
 {
     public AdvancedShutdownDialog()
     {
diff --git a/Views/ExtendShutdownDialog.axaml b/Views/ExtendShutdownDialog.axaml
index f70aefd..dafd77a 100644
--- a/Views/ExtendShutdownDialog.axaml
+++ b/Views/ExtendShutdownDialog.axaml
@@ -1,4 +1,4 @@
-<Window x:Class="SystemTools.Views.ExtendShutdownDialog"
+<ci:MyWindow x:Class="SystemTools.Views.ExtendShutdownDialog"
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ci="http://classisland.tech/schemas/xaml/core"
@@ -6,9 +6,10 @@
         Height="150"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
-        Title="SystemTools - 延长关机时间">
+        Title="延长关机时间"
+        ShowAsDialog="True">
     
-    <Border Margin="7.5" Padding="10" CornerRadius="7"
+    <Border Padding="16" CornerRadius="8"
             Background="{DynamicResource LayerFillColorAltBrush}">
         <Grid RowDefinitions="Auto,Auto,Auto" RowSpacing="12">
             <StackPanel Orientation="Horizontal" Spacing="8">
@@ -24,4 +25,4 @@
             </StackPanel>
         </Grid>
     </Border>
-</Window>
+</ci:MyWindow>
diff --git a/Views/ExtendShutdownDialog.axaml.cs b/Views/ExtendShutdownDialog.axaml.cs
index 645df85..632ddb1 100644
--- a/Views/ExtendShutdownDialog.axaml.cs
+++ b/Views/ExtendShutdownDialog.axaml.cs
@@ -4,10 +4,11 @@
 using Avalonia;
 using System;
 using Avalonia.Threading;
+using ClassIsland.Core.Controls;
 
 namespace SystemTools.Views;
 
-public partial class ExtendShutdownDialog : Window
+public partial class ExtendShutdownDialog : MyWindow
 {
     public int? ResultMinutes { get; private set; }