diff --git a/src/Consolonia.Gallery/App.cs b/src/Consolonia.Gallery/App.cs
index e63fb85f..a96ace76 100644
--- a/src/Consolonia.Gallery/App.cs
+++ b/src/Consolonia.Gallery/App.cs
@@ -1,15 +1,9 @@
-using System;
 using System.Globalization;
 using System.Threading;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Styling;
 using Consolonia.Core.Infrastructure;
 using Consolonia.Gallery.View;
-using Consolonia.Themes.TurboVision.Templates;
 using Consolonia.Themes.TurboVision.Themes.Fluent;
-using Consolonia.Themes.TurboVision.Themes.Material;
-using Consolonia.Themes.TurboVision.Themes.TurboVisionBlack;
-using Consolonia.Themes.TurboVision.Themes.TurboVisionDark;
 
 namespace Consolonia.Gallery
 {
@@ -26,8 +20,8 @@ public App()
             /*Styles.Add(new TurboVisionTheme());*/
             /*Styles.Add(new TurboVisionBlackTheme());*/
             /*Styles.Add(new TurboVisionDarkTheme());*/
-            /*Styles.Add(new FluentTheme());*/
-            Styles.Add(new MaterialTheme());
+            Styles.Add(new FluentTheme());
+            /*Styles.Add(new MaterialTheme());*/
         }
 
         public override void OnFrameworkInitializationCompleted()
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarButton.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarButton.axaml
index db507531..c0a91daf 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarButton.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarButton.axaml
@@ -6,8 +6,7 @@
 -->
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type CalendarButton}" TargetType="CalendarButton">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarDayButton.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarDayButton.axaml
index d056003f..976271ad 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarDayButton.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarDayButton.axaml
@@ -6,8 +6,7 @@
 -->
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type CalendarDayButton}" TargetType="CalendarDayButton">
         <Setter Property="HorizontalContentAlignment"
                 Value="Center" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/CheckBox.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/CheckBox.axaml
index 61f9ad21..2791510e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/CheckBox.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/CheckBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
         <Setter Property="BorderBrush"
                 Value="{DynamicResource ThemeBorderBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBox.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBox.axaml
index 11025424..a92aef90 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBox.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeSelectionBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBoxItem.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBoxItem.axaml
index 1258d0c9..99431172 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBoxItem.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ComboBoxItem.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
         <Setter Property="Foreground"
                 Value="{DynamicResource ThemeForegroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ContentControl.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ContentControl.axaml
index 815b68ea..b11d0050 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ContentControl.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ContentControl.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DataValidationErrors.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DataValidationErrors.axaml
index 832d076f..4eb6b6be 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DataValidationErrors.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DataValidationErrors.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/FlyoutPresenter.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/FlyoutPresenter.axaml
index c91f89db..03869d02 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/FlyoutPresenter.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/FlyoutPresenter.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
         <Setter Property="HorizontalContentAlignment"
                 Value="Stretch" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ItemsControl.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ItemsControl.axaml
index 25ca9eda..797bd68d 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ItemsControl.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ItemsControl.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type ItemsControl}" TargetType="ItemsControl">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/LightDismissOverlaylayer.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/LightDismissOverlaylayer.axaml
index 4d76604c..32874dc3 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/LightDismissOverlaylayer.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/LightDismissOverlaylayer.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type LightDismissOverlayLayer}" TargetType="LightDismissOverlayLayer">
         <Setter Property="Background"
                 Value="{x:Null}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBox.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBox.axaml
index 5247fa74..f4887630 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBox.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
         <Setter Property="BorderBrush"
                 Value="{DynamicResource ThemeBorderBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBoxItem.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBoxItem.axaml
index ea212bc4..1012a79d 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBoxItem.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ListBoxItem.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
         <Setter Property="Padding"
                 Value="1 0" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/OverlayPopupHost.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/OverlayPopupHost.axaml
index d2fbdbc0..65ab631a 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/OverlayPopupHost.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/OverlayPopupHost.axaml
@@ -1,7 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
         <Setter Property="Background"
                 Value="{x:Null}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Panel.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Panel.axaml
index 619d1d80..97006f18 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Panel.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Panel.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type Panel}" TargetType="Panel">
         <Setter Property="Background"
                 Value="{x:Null}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Popup.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Popup.axaml
index 47310bde..287cbc6e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Popup.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Popup.axaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
             xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
     <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
         <Setter Property="Background"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ProgressBar.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ProgressBar.axaml
index 787a3cc2..74e85c3a 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ProgressBar.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ProgressBar.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
         <Setter Property="BorderBrush"
                 Value="{DynamicResource ThemeChooserBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/RadioButton.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/RadioButton.axaml
index ef45ebcf..1ee9b413 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/RadioButton.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/RadioButton.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type RadioButton}" TargetType="RadioButton">
         <Setter Property="Foreground"
                 Value="{DynamicResource ThemeForegroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollBar.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollBar.axaml
index e80327a8..b982e498 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollBar.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollBar.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ScrollBar}" TargetType="ScrollBar">
         <Setter Property="Cursor"
                 Value="Arrow" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollViewer.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollViewer.axaml
index 857120c9..5774a610 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollViewer.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ScrollViewer.axaml
@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type ScrollViewer}" TargetType="ScrollViewer">
         <Setter Property="(helpers:ScrollViewerExtensions.ScrollOnArrows)"
                 Value="True" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Separator.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Separator.axaml
index 3864a0ae..5c6e0246 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Separator.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Separator.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator">
         <Setter Property="Focusable"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/SymbolsControl.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/SymbolsControl.axaml
index c2ecce8e..1c0f799e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/SymbolsControl.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/SymbolsControl.axaml
@@ -1,8 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:helpers1="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers1="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type helpers1:SymbolsControl}" TargetType="helpers1:SymbolsControl">
         <!--<Setter Property="Foreground"
                 Value="{DynamicResource ThemeForegroundBrush}" />-->
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/TabControl.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/TabControl.axaml
index 2bf761e1..eb08e3e2 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/TabControl.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/TabControl.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
         <Setter Property="BorderThickness"
                 Value="1" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/TabItem.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/TabItem.axaml
index 1cbb9565..42cdf01f 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/TabItem.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/TabItem.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
         <Setter Property="Foreground"
                 Value="{DynamicResource ThemeForegroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBlock.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBlock.axaml
index 596c5d3d..8de54e34 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBlock.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBlock.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--<ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
                 <Setter Property="Foreground">
                         <Setter.Value>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBox.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBox.axaml
index dfa1e0ce..befb9aeb 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBox.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/TextBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision">
     
     <helpers:BooleanAndConverter x:Key="BooleanAndConverter" />
     
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/ToggleButton.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/ToggleButton.axaml
index a28f0326..7190a020 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/ToggleButton.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/ToggleButton.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeActionBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
index 19653233..66afcc3e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
@@ -1,8 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
-            xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers;assembly=Consolonia.Themes.TurboVision"
-            xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core">
+            xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core">
     <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Themes/Fluent/FluentTheme.cs b/src/Consolonia.Themes.TurboVision/Themes/Fluent/FluentTheme.cs
index 81d85486..de514785 100644
--- a/src/Consolonia.Themes.TurboVision/Themes/Fluent/FluentTheme.cs
+++ b/src/Consolonia.Themes.TurboVision/Themes/Fluent/FluentTheme.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
-using Consolonia.Core.Styles;
 
 namespace Consolonia.Themes.TurboVision.Themes.Fluent
 {