From e138f1aad320e0ac2776856ea6f9a519c3123a73 Mon Sep 17 00:00:00 2001
From: artyom <worldbeater-dev@yandex.ru>
Date: Sun, 26 Jul 2020 18:18:52 +0300
Subject: [PATCH] Support Avalonia 0.10.* (#7)

---
 .../Citrus.Avalonia.Sandbox.csproj            | 19 +++++++++++++----
 src/Citrus.Avalonia/Candy.xaml                | 19 +----------------
 src/Citrus.Avalonia/Citrus.Avalonia.csproj    |  8 ++-----
 src/Citrus.Avalonia/Citrus.xaml               | 19 +----------------
 src/Citrus.Avalonia/Magma.xaml                | 19 +----------------
 src/Citrus.Avalonia/Rust.xaml                 | 19 +----------------
 src/Citrus.Avalonia/Sea.xaml                  | 19 +----------------
 src/Citrus.Avalonia/Theme/ButtonStyles.xaml   |  1 +
 src/Citrus.Avalonia/Theme/CalendarStyles.xaml |  8 +++----
 src/Citrus.Avalonia/Theme/ComboBoxStyles.xaml |  2 +-
 src/Citrus.Avalonia/Theme/Index.xaml          | 21 +++++++++++++++++++
 src/Citrus.Avalonia/Theme/MenuStyles.xaml     |  1 +
 .../Theme/TabControlStyles.xaml               |  5 ++++-
 .../Theme/TextBlockStyles.xaml                |  5 +++++
 src/Citrus.Avalonia/Theme/TextBoxStyles.xaml  |  1 +
 .../Theme/ToggleButtonStyles.xaml             |  1 +
 16 files changed, 61 insertions(+), 106 deletions(-)
 create mode 100644 src/Citrus.Avalonia/Theme/Index.xaml

diff --git a/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj b/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj
index 78eed4f..c1b9035 100644
--- a/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj
+++ b/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.0" />
-    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="0.9.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.0" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview2" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview2" />
+    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="0.10.0-preview2" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview2" />
     <PackageReference Include="ReactiveUI.Validation" Version="1.4.7" />
     <PackageReference Include="ReactiveUI.Fody" Version="11.1.12" />
   </ItemGroup>
@@ -21,10 +21,21 @@
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
+    <Watch Include="**\*.xaml" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\Citrus.Avalonia\Citrus.Avalonia.csproj" />
   </ItemGroup>
 
+  <Target Name="Preview">
+    <Error Condition="$(XamlFile) == ''" Text="Specify /p:XamlFile=path" />
+    <PropertyGroup>
+      <PreviewerPort Condition="'$(PreviewerPort)' == ''">6001</PreviewerPort>
+      <FullPathToPreviewXaml>$([System.IO.Path]::GetFullPath('$(XamlFile)'))</FullPathToPreviewXaml>
+      <FileUriToPreviewXaml>file:///$(FullPathToPreviewXaml.Replace('\', '/').TrimStart('/'))</FileUriToPreviewXaml>
+    </PropertyGroup>
+    <Exec Command="dotnet exec --runtimeconfig $(ProjectRuntimeConfigFilePath) --depsfile $(ProjectDepsFilePath) $(PkgAvalonia)/tools/netcoreapp2.0/designer/Avalonia.Designer.HostApp.dll --method html --html-url http://127.0.0.1:$(PreviewerPort) --transport $(FileUriToPreviewXaml) $(TargetPath)" />
+  </Target>
+
 </Project>
diff --git a/src/Citrus.Avalonia/Candy.xaml b/src/Citrus.Avalonia/Candy.xaml
index a9f39fc..8b5f0df 100644
--- a/src/Citrus.Avalonia/Candy.xaml
+++ b/src/Citrus.Avalonia/Candy.xaml
@@ -1,22 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/Index.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Palette/CandyPalette.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Citrus.Avalonia.csproj b/src/Citrus.Avalonia/Citrus.Avalonia.csproj
index 3e4914b..bdbebf3 100644
--- a/src/Citrus.Avalonia/Citrus.Avalonia.csproj
+++ b/src/Citrus.Avalonia/Citrus.Avalonia.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <IsPackable>true</IsPackable>
-        <VersionPrefix>1.2.6</VersionPrefix>
+        <VersionPrefix>1.3.0</VersionPrefix>
         <Authors>Artyom Gorchakov and Contributors</Authors>
         <Copyright>Copyright (c) 2020 Artyom Gorchakov</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -14,13 +13,10 @@
         <RepositoryUrl>https://github.com/worldbeater/citrus.avalonia</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>
-    
     <ItemGroup>
         <AvaloniaResource Include="**\*.xaml" />
     </ItemGroup>
-
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.9.0" />
+        <PackageReference Include="Avalonia" Version="0.10.0-preview2" />
     </ItemGroup>
-
 </Project>
diff --git a/src/Citrus.Avalonia/Citrus.xaml b/src/Citrus.Avalonia/Citrus.xaml
index 411f0b8..6a895d6 100644
--- a/src/Citrus.Avalonia/Citrus.xaml
+++ b/src/Citrus.Avalonia/Citrus.xaml
@@ -1,22 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/Index.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Palette/CitrusPalette.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Magma.xaml b/src/Citrus.Avalonia/Magma.xaml
index f965828..fde8722 100644
--- a/src/Citrus.Avalonia/Magma.xaml
+++ b/src/Citrus.Avalonia/Magma.xaml
@@ -1,22 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/Index.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Palette/MagmaPalette.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Rust.xaml b/src/Citrus.Avalonia/Rust.xaml
index 79f4276..b8715fd 100644
--- a/src/Citrus.Avalonia/Rust.xaml
+++ b/src/Citrus.Avalonia/Rust.xaml
@@ -1,22 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/Index.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Palette/RustPalette.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Sea.xaml b/src/Citrus.Avalonia/Sea.xaml
index 92f6c78..66449dd 100644
--- a/src/Citrus.Avalonia/Sea.xaml
+++ b/src/Citrus.Avalonia/Sea.xaml
@@ -1,22 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
-    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/Index.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Palette/SeaPalette.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Theme/ButtonStyles.xaml b/src/Citrus.Avalonia/Theme/ButtonStyles.xaml
index 532b6f8..e9142ce 100644
--- a/src/Citrus.Avalonia/Theme/ButtonStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/ButtonStyles.xaml
@@ -9,6 +9,7 @@
     <Style Selector="Button > TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
+
     <Style Selector="Button /template/ ContentPresenter">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
diff --git a/src/Citrus.Avalonia/Theme/CalendarStyles.xaml b/src/Citrus.Avalonia/Theme/CalendarStyles.xaml
index 896a15e..383cf9c 100644
--- a/src/Citrus.Avalonia/Theme/CalendarStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/CalendarStyles.xaml
@@ -152,13 +152,13 @@
   <Style Selector="CalendarItem:calendardisabled /template/ Rectangle#DisabledVisual">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
-  <Style Selector="CalendarDayButton:selected /template/ ContentControl#Content">
+  <Style Selector="CalendarDayButton:selected /template/ ContentControl#Content > TextBlock">
     <Setter Property="Opacity" Value="1"/>
-    <Setter Property="Foreground" Value="#ffffff"/>
+    <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}"/>
   </Style>
-  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
+  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content > TextBlock">
     <Setter Property="Opacity" Value="1"/>
-    <Setter Property="Foreground" Value="#ffffff"/>
+    <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}"/>
   </Style>
   
   <Style Selector="CalendarButton:btnfocused /template/ Rectangle#FocusVisual">
diff --git a/src/Citrus.Avalonia/Theme/ComboBoxStyles.xaml b/src/Citrus.Avalonia/Theme/ComboBoxStyles.xaml
index fa20762..1661241 100644
--- a/src/Citrus.Avalonia/Theme/ComboBoxStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/ComboBoxStyles.xaml
@@ -18,7 +18,7 @@
     <Style Selector="ComboBoxItem">
         <Setter Property="Padding" Value="5" />
     </Style>
-    <Style Selector="ComboBoxItem:selected">
+    <Style Selector="ComboBoxItem:selected > TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
 </Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Theme/Index.xaml b/src/Citrus.Avalonia/Theme/Index.xaml
new file mode 100644
index 0000000..aa03298
--- /dev/null
+++ b/src/Citrus.Avalonia/Theme/Index.xaml
@@ -0,0 +1,21 @@
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/BorderStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TabControlStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ComboBoxStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ProgressBarStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ListBoxStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ExpanderStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/TreeViewStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CalendarStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/MenuStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/CheckBoxStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/RadioButtonStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/ToggleButtonStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/SliderStyles.xaml"/>
+    <StyleInclude Source="avares://Citrus.Avalonia/Theme/NumericUpDownStyles.xaml"/>
+</Styles>
\ No newline at end of file
diff --git a/src/Citrus.Avalonia/Theme/MenuStyles.xaml b/src/Citrus.Avalonia/Theme/MenuStyles.xaml
index fb58646..5406bcf 100644
--- a/src/Citrus.Avalonia/Theme/MenuStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/MenuStyles.xaml
@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style Selector="Menu">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource ThemeCardBrush}" />
     </Style>
     <Style Selector="MenuItem > AccessText">
diff --git a/src/Citrus.Avalonia/Theme/TabControlStyles.xaml b/src/Citrus.Avalonia/Theme/TabControlStyles.xaml
index 42f2c5e..d7241e2 100644
--- a/src/Citrus.Avalonia/Theme/TabControlStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/TabControlStyles.xaml
@@ -8,10 +8,10 @@
     </Style>
 
     <Style Selector="TabItem">
+        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}"/>
         <Setter Property="Margin" Value="0 0 0 0"/>
         <Setter Property="Padding" Value="14 0"/>
         <Setter Property="BorderThickness" Value="0 0 0 2"/>
@@ -19,6 +19,9 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Height" Value="54"/>
     </Style>
+    <Style Selector="TabItem > TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}"/>
+    </Style>
     
     <Style Selector="TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
diff --git a/src/Citrus.Avalonia/Theme/TextBlockStyles.xaml b/src/Citrus.Avalonia/Theme/TextBlockStyles.xaml
index ce0d81c..5148b3f 100644
--- a/src/Citrus.Avalonia/Theme/TextBlockStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/TextBlockStyles.xaml
@@ -1,6 +1,11 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style Selector="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+        <Setter Property="FontFamily" Value="Ubuntu" />
+        <Setter Property="FontSize" Value="14" />
+    </Style>
+    <Style Selector="TextBox">
         <Setter Property="FontFamily" Value="Ubuntu" />
         <Setter Property="FontSize" Value="14" />
     </Style>
diff --git a/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml b/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
index e8d7842..a651525 100644
--- a/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
@@ -3,6 +3,7 @@
     <Style Selector="TextBox">
         <Setter Property="FontFamily" Value="Ubuntu" />
         <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource ThemeBorderLowBrush}" />
         <Setter Property="Padding" Value="10" />
         <Setter Property="Margin" Value="0 5" />
diff --git a/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml b/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml
index 1613a8f..9cb52ef 100644
--- a/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml
+++ b/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml
@@ -5,6 +5,7 @@
         <Setter Property="Padding" Value="14" />
         <Setter Property="Background" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
+
     <Style Selector="ToggleButton > TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>