diff --git a/Core.Window/Core.Window.csproj b/Core.Window/Core.Window.csproj
index 43b9e39..880315d 100644
--- a/Core.Window/Core.Window.csproj
+++ b/Core.Window/Core.Window.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        
+
         <ProjectReference Include="..\Core\Core.csproj"/>
     </ItemGroup>
     <ItemGroup>
diff --git a/KitopiaAvalonia/Services/ThemeChange.cs b/KitopiaAvalonia/Services/ThemeChange.cs
index 1641096..a8b1d5d 100644
--- a/KitopiaAvalonia/Services/ThemeChange.cs
+++ b/KitopiaAvalonia/Services/ThemeChange.cs
@@ -3,6 +3,7 @@
 using System;
 using Avalonia;
 using Avalonia.Styling;
+using Avalonia.Threading;
 using Core.SDKs.Services;
 using FluentAvalonia.Styling;
 using KitopiaAvalonia;
@@ -20,17 +21,18 @@ public void changeTo(string name)
     {
         log.Debug(nameof(ThemeChange) + "的接口" + nameof(changeTo) + "被调用");
 
-
-        switch (name)
-        {
-            case "theme_light":
-                Application.Current.RequestedThemeVariant = ThemeVariant.Light;
-                break;
-
-            default:
-                Application.Current.RequestedThemeVariant = ThemeVariant.Dark;
-                break;
-        }
+        Dispatcher.UIThread.Post(() => {
+            switch (name)
+            {
+                case "theme_light":
+                    Application.Current.RequestedThemeVariant = ThemeVariant.Light;
+                    break;
+
+                default:
+                    Application.Current.RequestedThemeVariant = ThemeVariant.Dark;
+                    break;
+            }
+        });
     }
 
     public void changeAnother()
diff --git a/KitopiaAvalonia/Windows/TaskEditor.axaml b/KitopiaAvalonia/Windows/TaskEditor.axaml
index 3031649..7ab7a32 100644
--- a/KitopiaAvalonia/Windows/TaskEditor.axaml
+++ b/KitopiaAvalonia/Windows/TaskEditor.axaml
@@ -14,7 +14,6 @@
 
                      xmlns:objectModel="clr-namespace:System.Collections.ObjectModel;assembly=System.ObjectModel"
                      xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Runtime"
-                     xmlns:sdKs="clr-namespace:Kitopia.SDKs"
                      xmlns:controls2="clr-namespace:NodifyM.Avalonia.Controls;assembly=NodifyM.Avalonia"
                      xmlns:pages="clr-namespace:KitopiaAvalonia.Pages"
                      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -273,8 +272,8 @@
                                                             <!-- ReSharper disable once Xaml.RedundantResource -->
                                                             <MenuItem Header="删除此变量"
                                                                       Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                                                                      Command="{Binding $parent[Border].((taskEditor1:TaskEditorViewModel)DataContext).DelValueCommand}"
-                                                                      CommandParameter="{Binding $parent[Border].((sdKs:KeyValuePairBindingTool)DataContext).Key }" />
+                                                                      Command="{Binding $parent[StackPanel].((taskEditor1:TaskEditorViewModel)DataContext).DelValueCommand}"
+                                                                      CommandParameter="{Binding Key }" />
                                                         </MenuFlyout>
                                                     </Border.ContextFlyout>
 
@@ -309,8 +308,8 @@
                                                                         <Rectangle>
                                                                             <Rectangle.Fill>
                                                                                 <SolidColorBrush
-                                                                                    Color="{DynamicResource ApplicationBackgroundColor}"
-                                                                                    Opacity="0.2" />
+                                                                                    Color="{DynamicResource Node.BackgroundColor}"
+                                                                                    Opacity="0.5" />
                                                                             </Rectangle.Fill>
                                                                         </Rectangle>
                                                                         <DockPanel>
@@ -448,8 +447,8 @@
                                                                         <Rectangle>
                                                                             <Rectangle.Fill>
                                                                                 <SolidColorBrush
-                                                                                    Color="{DynamicResource ApplicationBackgroundColor}"
-                                                                                    Opacity="0.2" />
+                                                                                    Color="{DynamicResource Node.BackgroundColor}"
+                                                                                    Opacity="0.5" />
                                                                             </Rectangle.Fill>
                                                                         </Rectangle>
                                                                         <StackPanel Orientation="Horizontal"
@@ -776,8 +775,8 @@
                                                                 <Rectangle>
                                                                     <Rectangle.Fill>
                                                                         <SolidColorBrush
-                                                                            Color="{DynamicResource ApplicationBackgroundColor}"
-                                                                            Opacity="0.2" />
+                                                                            Color="{DynamicResource Node.BackgroundColor}"
+                                                                            Opacity="0.5" />
                                                                     </Rectangle.Fill>
                                                                 </Rectangle>
                                                                 <DockPanel>
@@ -1179,9 +1178,7 @@
 
                                 </controls2:Node.Resources>
 
-                                <controls2:Node.Foreground>
-                                    <SolidColorBrush Color="{DynamicResource ApplicationBackgroundColor}" />
-                                </controls2:Node.Foreground>
+
                                 <controls2:Node.HeaderBrush>
                                     <SolidColorBrush Color="{DynamicResource SystemAccentColor}"
                                                      Opacity="0.5" />