diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index bf5f7887..a2499ea8 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -80,6 +80,9 @@
 		</Style>
 		<Style Selector="Button">
 			<Setter Property="VerticalContentAlignment" Value="Center"/>
+			<Style Selector="^">
+				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
+			</Style>
 		</Style>
 		<Style Selector="ScrollBar">
 			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
diff --git a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
index ae472f65..618f5a44 100644
--- a/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs
@@ -16,7 +16,7 @@ public partial class ThemePickerDialog : DialogWindow
 {
 	protected DataGridCollectionView ThemeColors { get; }
 	private ChardonnayTheme ExistingTheme { get; } = ChardonnayTheme.GetLiveTheme();
-	private ChardonnayTheme WorkingTheme { get; }
+	private ChardonnayTheme WorkingTheme { get; set; }
 
 	public ThemePickerDialog()
 	{
@@ -63,7 +63,7 @@ public partial class ThemePickerDialog : DialogWindow
 
 			using (var theme = new ChardonnayThemePersister(selectedFile))
 			{
-				theme.Target.ApplyTheme(ActualThemeVariant);
+				ResetTheme(theme.Target);
 			}
 
 			await MessageBox.Show(this, "Theme imported and applied", "Theme Imported");
@@ -147,13 +147,14 @@ public partial class ThemePickerDialog : DialogWindow
 
 	private void ResetTheme(ChardonnayTheme theme)
 	{
-		theme.ApplyTheme(ActualThemeVariant);
+		WorkingTheme = (ChardonnayTheme)theme.Clone();
+		WorkingTheme.ApplyTheme(ActualThemeVariant);
 
 		foreach (var i in ThemeColors.OfType<ThemeItemColor>())
 		{
-			i.SuppressSet = true;
-			i.ThemeColor = theme.GetColor(ActualThemeVariant, i.ThemeItemName);
-			i.SuppressSet = false;
+			i.ColorSetter = null;
+			i.ThemeColor = WorkingTheme.GetColor(ActualThemeVariant, i.ThemeItemName);
+			i.ColorSetter = ColorSetter;
 		}
 	}
 
@@ -164,18 +165,19 @@ public partial class ThemePickerDialog : DialogWindow
 		{
 			ThemeItemName = kvp.Key,
 			ThemeColor = kvp.Value,
-			ColorSetter = c =>
-			{
-				WorkingTheme.SetColor(ActualThemeVariant, kvp.Key, c);
-				WorkingTheme.ApplyTheme(ActualThemeVariant);
-			}
+			ColorSetter = ColorSetter
 		});
 
+	private void ColorSetter(Color color, string colorName)
+	{
+		WorkingTheme.SetColor(ActualThemeVariant, colorName, color);
+		WorkingTheme.ApplyTheme(ActualThemeVariant);
+	}
+
 	private class ThemeItemColor : ViewModels.ViewModelBase
 	{
-		public bool SuppressSet { get; set; }
 		public required string ThemeItemName { get; init; }
-		public required Action<Color> ColorSetter { get; init; }
+		public required Action<Color, string>? ColorSetter { get; set; }
 
 		private Color _themeColor;
 		public Color ThemeColor
@@ -183,10 +185,10 @@ public partial class ThemePickerDialog : DialogWindow
 			get => _themeColor;
 			set
 			{
-				var setColors = !SuppressSet && !_themeColor.Equals(value);
+				var setColors = !_themeColor.Equals(value);
 				this.RaiseAndSetIfChanged(ref _themeColor, value);
 				if (setColors)
-					ColorSetter?.Invoke(_themeColor);
+					ColorSetter?.Invoke(_themeColor, ThemeItemName);
 			}
 		}
 	}