From 9be4c05e31718e72294b7bde9c6077cb01d35a64 Mon Sep 17 00:00:00 2001
From: wieslawsoltes <wieslaw.soltes@gmail.com>
Date: Wed, 24 Oct 2018 07:03:45 +0000
Subject: [PATCH 1/2] Use theme resources

---
 src/Avalonia.Themes.Default/ContextMenu.xaml | 2 +-
 src/Avalonia.Themes.Default/Expander.xaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/ContextMenu.xaml b/src/Avalonia.Themes.Default/ContextMenu.xaml
index 41d53aa6b3..61392a869b 100644
--- a/src/Avalonia.Themes.Default/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Default/ContextMenu.xaml
@@ -1,5 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="ContextMenu">
-    <Setter Property="BorderBrush" Value="Gray"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="Padding" Value="4,2"/>
     <Setter Property="TextBlock.FontSize" Value="12" />
diff --git a/src/Avalonia.Themes.Default/Expander.xaml b/src/Avalonia.Themes.Default/Expander.xaml
index d12f704cc4..b34189bac0 100644
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@@ -89,7 +89,7 @@
         <Border BorderThickness="1">
           <Grid ColumnDefinitions="Auto,Auto">
             <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Path Fill="Black"
+              <Path Fill="{DynamicResource ThemeForegroundBrush}"
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="M 0 2 L 4 6 L 0 10 Z" />

From e7b503b8bda215ad33e34b1461076a8e3b3372ec Mon Sep 17 00:00:00 2001
From: wieslawsoltes <wieslaw.soltes@gmail.com>
Date: Wed, 24 Oct 2018 07:13:57 +0000
Subject: [PATCH 2/2] Use FontSizeNormal theme resource

---
 src/Avalonia.Themes.Default/ContextMenu.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/ContextMenu.xaml b/src/Avalonia.Themes.Default/ContextMenu.xaml
index 61392a869b..bfa26d3528 100644
--- a/src/Avalonia.Themes.Default/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Default/ContextMenu.xaml
@@ -2,7 +2,7 @@
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="Padding" Value="4,2"/>
-    <Setter Property="TextBlock.FontSize" Value="12" />
+    <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="TextBlock.FontWeight" Value="Normal" />
     <Setter Property="Template">
     <ControlTemplate>