diff --git a/App.xaml.cs b/App.xaml.cs
index 276a3c9..45b405c 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -49,6 +49,7 @@ public partial class App : Application
     {
         base.OnStartup(e);
         ShutdownMode = ShutdownMode.OnExplicitShutdown;
+        ThemeHelper.InitializeTheme();
         await Host.StartAsync();
 
         try
diff --git a/Config/ConnectionSettings.cs b/Config/ConnectionSettings.cs
index 82e497c..b725148 100644
--- a/Config/ConnectionSettings.cs
+++ b/Config/ConnectionSettings.cs
@@ -12,6 +12,7 @@ namespace PMSWPF.Config
         public string UserId { get; set; } = "root";
         public string Password { get; set; } = "Pgw15221236646";
         public string Database { get; set; } = "pmswpf";
+        public string Theme { get; set; } = "跟随系统";
         public bool EnableS7Service { get; set; } = true;
         public bool EnableMqttService { get; set; } = true;
         public bool EnableOpcUaService { get; set; } = true;
diff --git a/ViewModels/SettingViewModel.cs b/ViewModels/SettingViewModel.cs
index 1d8705c..b62e043 100644
--- a/ViewModels/SettingViewModel.cs
+++ b/ViewModels/SettingViewModel.cs
@@ -25,6 +25,24 @@ public partial class SettingViewModel : ViewModelBase
         _s7BackgroundService = s7BackgroundService;
         _mqttBackgroundService = mqttBackgroundService;
         _opcUaBackgroundService = opcUaBackgroundService;
+        Themes = new List<string> { "浅色", "深色", "跟随系统" };
+    }
+
+    public List<string> Themes { get; }
+
+    public string SelectedTheme
+    {
+        get => _connectionSettings.Theme;
+        set
+        {
+            if (_connectionSettings.Theme != value)
+            { 
+                _connectionSettings.Theme = value;
+                OnPropertyChanged();
+                _connectionSettings.Save();
+                ThemeHelper.ApplyTheme(value);
+            }
+        }
     }
 
     public List<string> AvailableDbTypes { get; set; }
@@ -209,4 +227,4 @@ public partial class SettingViewModel : ViewModelBase
             NotificationHelper.ShowError($"连接失败：{ex.Message}", ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Views/Dialogs/DeviceDialog.xaml b/Views/Dialogs/DeviceDialog.xaml
index 3a80ae4..d1afe0d 100644
--- a/Views/Dialogs/DeviceDialog.xaml
+++ b/Views/Dialogs/DeviceDialog.xaml
@@ -13,7 +13,6 @@
                   CloseButtonText="取消"
                   DefaultButton="Primary"
                   PrimaryButtonText="{Binding PrimaryButContent}"
-                  Background="#fff"
                   d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
                   mc:Ignorable="d">
     <ui:ContentDialog.Resources>
diff --git a/Views/SettingView.xaml b/Views/SettingView.xaml
index 350baf9..fcb9e65 100644
--- a/Views/SettingView.xaml
+++ b/Views/SettingView.xaml
@@ -15,6 +15,12 @@
                 <ui:FontIcon Glyph="&#xE713;" />
             </ui:SettingsExpander.HeaderIcon>
             <ui:SettingsExpander.Items>
+                <ui:SettingsCard Header="主题切换"
+                                 Description="切换应用程序的主题">
+                    <ComboBox Width="120"
+                              ItemsSource="{Binding Themes}"
+                              SelectedItem="{Binding SelectedTheme, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                </ui:SettingsCard>
                 <ui:SettingsCard Header="点击关闭按钮时最小化到通知栏"
                                  Description="开启后，点击主窗口的关闭按钮会将程序最小化到系统通知栏，而不是直接退出。"
                                  IsClickEnabled="True">
diff --git a/Views/VariableTableView.xaml b/Views/VariableTableView.xaml
index 8fe796b..de5ecdc 100644
--- a/Views/VariableTableView.xaml
+++ b/Views/VariableTableView.xaml
@@ -30,7 +30,7 @@
         <Style TargetType="TextBlock"
                x:Key="VarTableLabelStyle">
             <Setter Property="Foreground"
-                    Value="#555" />
+                    Value="{DynamicResource SecondaryTextBrush}" />
             <Setter Property="FontSize"
                     Value="16" />
             <Setter Property="VerticalAlignment"
@@ -165,7 +165,8 @@
                   CanUserSortColumns="True"
                   SelectionMode="Extended"
                   SelectedItem="{Binding SelectedVariableData}"
-                  ItemsSource="{Binding VariableDataView}">
+                  ItemsSource="{Binding VariableDataView}"
+                  Style="{StaticResource DataGridBaseStyle}">
             <DataGrid.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="添加变量"
@@ -230,9 +231,9 @@
                         <DataTrigger Binding="{Binding IsModified}"
                                      Value="True">
                             <Setter Property="Background"
-                                    Value="Pink" />
+                                    Value="{DynamicResource SecondaryRegionBrush}" />
                             <Setter Property="Foreground"
-                                    Value="#000" />
+                                    Value="{DynamicResource PrimaryTextBrush}" />
                             <Setter Property="FontWeight"
                                     Value="Bold" />
                         </DataTrigger>
@@ -240,14 +241,14 @@
                         <Trigger Property="IsMouseOver"
                                  Value="True">
                             <Setter Property="Background"
-                                    Value="LightBlue" />
+                                    Value="{DynamicResource HoverBrush}" />
                         </Trigger>
                         <Trigger Property="IsSelected"
                                  Value="True">
                             <Setter Property="Background"
-                                    Value="DodgerBlue" />
+                                    Value="{DynamicResource PrimaryBrush}" />
                             <Setter Property="Foreground"
-                                    Value="White" />
+                                    Value="{DynamicResource TextIconBrush}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>