From 90fd8ab3752d740c529da03138a66196793f3546 Mon Sep 17 00:00:00 2001
From: Ano-sys <timo.niemann02@gmail.com>
Date: Thu, 5 Feb 2026 16:49:49 +0100
Subject: [PATCH] Added Light and Dark Themes, switchable via Button in the
 bottom right

---
 DelaunayTriangulation/App.axaml               | 11 ++-
 .../Themes/ColorPalette.axaml                 | 90 +++++++++++++++++++
 DelaunayTriangulation/Themes/Styles.axaml     | 34 +++++++
 .../ViewModels/MainWindowViewModel.cs         | 24 +++++
 DelaunayTriangulation/Views/MainWindow.axaml  | 64 ++++++-------
 5 files changed, 191 insertions(+), 32 deletions(-)
 create mode 100644 DelaunayTriangulation/Themes/ColorPalette.axaml
 create mode 100644 DelaunayTriangulation/Themes/Styles.axaml

diff --git a/DelaunayTriangulation/App.axaml b/DelaunayTriangulation/App.axaml
index b55681b..863c64d 100644
--- a/DelaunayTriangulation/App.axaml
+++ b/DelaunayTriangulation/App.axaml
@@ -2,14 +2,23 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="DelaunayTriangulation.App"
              xmlns:local="using:DelaunayTriangulation"
-             RequestedThemeVariant="Default">
+             RequestedThemeVariant="Dark">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="Themes/ColorPalette.axaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
   
     <Application.Styles>
         <FluentTheme />
+        <StyleInclude Source="Themes/Styles.axaml"/>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/DelaunayTriangulation/Themes/ColorPalette.axaml b/DelaunayTriangulation/Themes/ColorPalette.axaml
new file mode 100644
index 0000000..dda8976
--- /dev/null
+++ b/DelaunayTriangulation/Themes/ColorPalette.axaml
@@ -0,0 +1,90 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <ResourceDictionary.ThemeDictionaries>
+
+    <!-- LIGHT -->
+    <ResourceDictionary x:Key="Light">
+      <Color x:Key="C.Bg">#FFF6F7F9</Color>
+      <Color x:Key="C.Surface">#FFFFFFFF</Color>
+      <Color x:Key="C.Text">#FF111827</Color>
+      <Color x:Key="C.TextMuted">#FF6B7280</Color>
+      <Color x:Key="C.Border">#FFE5E7EB</Color>
+      <Color x:Key="C.Accent">#FF2563EB</Color>
+      <Color x:Key="C.Danger">#FFDC2626</Color>
+
+      <Color x:Key="C.Overlay">#14000000</Color>
+      <Color x:Key="C.OverlayBorder">#33000000</Color>
+      <Color x:Key="C.CanvasBg">#66FFFFFF</Color>
+      <Color x:Key="C.Shadow">#33000000</Color>
+
+      <Color x:Key="C.Edge">#FF16A34A</Color>
+      <Color x:Key="C.Circle">#FF6D28D9</Color>
+      <Color x:Key="C.Voronoi">#FFEA580C</Color>
+      <Color x:Key="C.Triangle">#FF2563EB</Color>
+      <Color x:Key="C.PointStroke">#FF111827</Color>
+
+      <SolidColorBrush x:Key="B.Bg" Color="{DynamicResource C.Bg}" />
+      <SolidColorBrush x:Key="B.Surface" Color="{DynamicResource C.Surface}" />
+      <SolidColorBrush x:Key="B.Text" Color="{DynamicResource C.Text}" />
+      <SolidColorBrush x:Key="B.TextMuted" Color="{DynamicResource C.TextMuted}" />
+      <SolidColorBrush x:Key="B.Border" Color="{DynamicResource C.Border}" />
+      <SolidColorBrush x:Key="B.Accent" Color="{DynamicResource C.Accent}" />
+      <SolidColorBrush x:Key="B.Danger" Color="{DynamicResource C.Danger}" />
+
+      <SolidColorBrush x:Key="B.Overlay" Color="{DynamicResource C.Overlay}" />
+      <SolidColorBrush x:Key="B.OverlayBorder" Color="{DynamicResource C.OverlayBorder}" />
+      <SolidColorBrush x:Key="B.CanvasBg" Color="{DynamicResource C.CanvasBg}" />
+      <SolidColorBrush x:Key="B.Shadow" Color="{DynamicResource C.Shadow}" />
+
+      <SolidColorBrush x:Key="B.Edge" Color="{DynamicResource C.Edge}" />
+      <SolidColorBrush x:Key="B.Circle" Color="{DynamicResource C.Circle}" />
+      <SolidColorBrush x:Key="B.Voronoi" Color="{DynamicResource C.Voronoi}" />
+      <SolidColorBrush x:Key="B.Triangle" Color="{DynamicResource C.Triangle}" />
+      <SolidColorBrush x:Key="B.PointStroke" Color="{DynamicResource C.PointStroke}" />
+    </ResourceDictionary>
+
+    <!-- DARK -->
+    <ResourceDictionary x:Key="Dark">
+      <Color x:Key="C.Bg">#FF0B1220</Color>
+      <Color x:Key="C.Surface">#FF111A2E</Color>
+      <Color x:Key="C.Text">#FFE5E7EB</Color>
+      <Color x:Key="C.TextMuted">#FF9CA3AF</Color>
+      <Color x:Key="C.Border">#FF263248</Color>
+      <Color x:Key="C.Accent">#FF60A5FA</Color>
+      <Color x:Key="C.Danger">#FFFB7185</Color>
+
+      <Color x:Key="C.Overlay">#30000000</Color>
+      <Color x:Key="C.OverlayBorder">#20FFFFFF</Color>
+      <Color x:Key="C.CanvasBg">#DD000000</Color>
+      <Color x:Key="C.Shadow">#AA000000</Color>
+
+      <Color x:Key="C.Edge">#FFADFF2F</Color>
+      <Color x:Key="C.Circle">#FF8A2BE2</Color>
+      <Color x:Key="C.Voronoi">#FFFF8C00</Color>
+      <Color x:Key="C.Triangle">#FF6495ED</Color>
+      <Color x:Key="C.PointStroke">#FFFFFFFF</Color>
+
+      <SolidColorBrush x:Key="B.Bg" Color="{DynamicResource C.Bg}" />
+      <SolidColorBrush x:Key="B.Surface" Color="{DynamicResource C.Surface}" />
+      <SolidColorBrush x:Key="B.Text" Color="{DynamicResource C.Text}" />
+      <SolidColorBrush x:Key="B.TextMuted" Color="{DynamicResource C.TextMuted}" />
+      <SolidColorBrush x:Key="B.Border" Color="{DynamicResource C.Border}" />
+      <SolidColorBrush x:Key="B.Accent" Color="{DynamicResource C.Accent}" />
+      <SolidColorBrush x:Key="B.Danger" Color="{DynamicResource C.Danger}" />
+
+      <SolidColorBrush x:Key="B.Overlay" Color="{DynamicResource C.Overlay}" />
+      <SolidColorBrush x:Key="B.OverlayBorder" Color="{DynamicResource C.OverlayBorder}" />
+      <SolidColorBrush x:Key="B.CanvasBg" Color="{DynamicResource C.CanvasBg}" />
+      <SolidColorBrush x:Key="B.Shadow" Color="{DynamicResource C.Shadow}" />
+
+      <SolidColorBrush x:Key="B.Edge" Color="{DynamicResource C.Edge}" />
+      <SolidColorBrush x:Key="B.Circle" Color="{DynamicResource C.Circle}" />
+      <SolidColorBrush x:Key="B.Voronoi" Color="{DynamicResource C.Voronoi}" />
+      <SolidColorBrush x:Key="B.Triangle" Color="{DynamicResource C.Triangle}" />
+      <SolidColorBrush x:Key="B.PointStroke" Color="{DynamicResource C.PointStroke}" />
+    </ResourceDictionary>
+
+  </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
diff --git a/DelaunayTriangulation/Themes/Styles.axaml b/DelaunayTriangulation/Themes/Styles.axaml
new file mode 100644
index 0000000..5f24a43
--- /dev/null
+++ b/DelaunayTriangulation/Themes/Styles.axaml
@@ -0,0 +1,34 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style Selector="Window">
+        <Setter Property="Background" Value="{DynamicResource B.Bg}" />
+    </Style>
+
+    <Style Selector="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource B.Text}" />
+    </Style>
+
+    <Style Selector="Border.card">
+        <Setter Property="Background" Value="{DynamicResource B.Surface}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource B.Border}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Padding" Value="16" />
+    </Style>
+
+    <Style Selector="Button">
+        <Setter Property="Background" Value="{DynamicResource B.Surface}" />
+        <Setter Property="Foreground" Value="{DynamicResource B.Text}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource B.Border}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="Padding" Value="12,8" />
+    </Style>
+
+    <Style Selector="Button.accent">
+        <Setter Property="Background" Value="{DynamicResource B.Accent}" />
+        <Setter Property="Foreground" Value="#FFFFFFFF" />
+        <Setter Property="BorderBrush" Value="{DynamicResource B.Accent}" />
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/DelaunayTriangulation/ViewModels/MainWindowViewModel.cs b/DelaunayTriangulation/ViewModels/MainWindowViewModel.cs
index 1a61e94..63cac3c 100644
--- a/DelaunayTriangulation/ViewModels/MainWindowViewModel.cs
+++ b/DelaunayTriangulation/ViewModels/MainWindowViewModel.cs
@@ -6,8 +6,10 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Media;
 using Avalonia.Rendering.Composition.Animations;
+using Avalonia.Styling;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using DelaunatorSharp;
@@ -42,6 +44,11 @@ public partial class MainWindowViewModel : ViewModelBase
 
     [ObservableProperty] private bool _isGenerationRunning = false;
 
+    [ObservableProperty] private string _switchThemeBtnContent = StandardDarkIcon;
+
+    private const string StandardLightIcon = "\ud83c\udf1e";
+    private const string StandardDarkIcon = "\ud83c\udf1a";
+
     public double Width { get; set; } = 1280;
     public double Height { get; set; } = 720;
 
@@ -56,6 +63,21 @@ public partial class MainWindowViewModel : ViewModelBase
 
     public IAsyncRelayCommand GenerateCommand { get; }
 
+    [RelayCommand]
+    private void SwitchTheme()
+    {
+        if(Application.Current!.ActualThemeVariant == ThemeVariant.Light)
+        {
+            Application.Current!.RequestedThemeVariant = ThemeVariant.Dark;
+            SwitchThemeBtnContent = StandardDarkIcon;
+        }
+        else
+        {
+            Application.Current!.RequestedThemeVariant = ThemeVariant.Light;
+            SwitchThemeBtnContent = StandardLightIcon;
+        }
+    }
+
     // gets distance of a and b edge to calc hypotenuse aka dist of two points
     double PointDistance(Geometries.Point p1, Geometries.Point p2) =>
         Math.Sqrt(Math.Pow(p1.X - p2.X, 2) + Math.Pow(p1.Y - p2.Y, 2));
@@ -102,6 +124,8 @@ public partial class MainWindowViewModel : ViewModelBase
 
     async Task GenerateRandomPoints(int count, CancellationToken ct)
     {
+        if (PointCount == null) return;
+
         bool CheckAdd(Geometries.Point p1, IList<Geometries.Point> p) =>
             !p.Any(x => PointDistance(p1, x) <= MinPointDistance);
 
diff --git a/DelaunayTriangulation/Views/MainWindow.axaml b/DelaunayTriangulation/Views/MainWindow.axaml
index 4f60765..0574b82 100644
--- a/DelaunayTriangulation/Views/MainWindow.axaml
+++ b/DelaunayTriangulation/Views/MainWindow.axaml
@@ -19,6 +19,7 @@
         Height="{Binding Height, Mode=TwoWay}"
         MinWidth="1200"
         MinHeight="700"
+
         >
 
     <Design.DataContext>
@@ -34,8 +35,8 @@
     <Window.Styles>
         <Style Selector="Border.InnerCard">
             <Setter Property="CornerRadius" Value="7.5"/>
-            <Setter Property="Background" Value="#30000000"/>
-            <Setter Property="BorderBrush" Value="#20FFFFFF"/>
+            <Setter Property="Background" Value="{DynamicResource B.Overlay}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource B.OverlayBorder}"/>
             <Setter Property="BorderThickness" Value="2"/>
             <Setter Property="Padding" Value="10"/>
             <Setter Property="Margin" Value="5"/>
@@ -43,8 +44,8 @@
     </Window.Styles>
     <Panel>
         <Grid RowDefinitions="30,*">
-            <Border ZIndex="1000" Grid.Row="0" Background="#30000000" PointerPressed="OnTitleBarPointerPressed" DoubleTapped="OnTitleBarDoubleTapped">
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="White" Text="Delaunay Triangulation - Timo Niemann"/>
+            <Border ZIndex="1000" Grid.Row="0" Background="{DynamicResource B.Overlay}" PointerPressed="OnTitleBarPointerPressed" DoubleTapped="OnTitleBarDoubleTapped">
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="{DynamicResource B.Text}" Text="Delaunay Triangulation - Timo Niemann"/>
             </Border>
             <Grid Grid.Row="1" ZIndex="1000" Margin="20">
                 <Grid.ColumnDefinitions>
@@ -53,17 +54,17 @@
                 </Grid.ColumnDefinitions>
                 <Border Classes="InnerCard">
                     <Border.Effect>
-                        <DropShadowEffect BlurRadius="20" Color="#aa000000" OffsetX="5" OffsetY="5"/>
+                        <DropShadowEffect BlurRadius="20" Color="{DynamicResource C.Shadow}" OffsetX="5" OffsetY="5"/>
                     </Border.Effect>
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                         <Grid RowDefinitions="*, auto">
                             <StackPanel Orientation="Vertical">
                                 <Border Classes="InnerCard">
-                                    <TextBlock Text="Delaunay Triangulation" FontSize="18" Foreground="White"/>
+                                    <TextBlock Text="Delaunay Triangulation" FontSize="18" Foreground="{DynamicResource B.Text}"/>
                                 </Border>
                                 <Border Classes="InnerCard">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock Text="Maximal Point Count" Foreground="White"/>
+                                        <TextBlock Text="Maximal Point Count" Foreground="{DynamicResource B.Text}"/>
                                         <Grid ColumnDefinitions="4*,1*">
                                             <Slider Grid.Column="0" Value="{Binding PointCount, Mode=TwoWay}" Margin="5" Minimum="20" Maximum="200"/>
                                             <NumericUpDown Height="20" Grid.Column="1" ShowButtonSpinner="False" Value="{Binding PointCount, Mode=TwoWay}" Minimum="1" Increment="1" FormatString="F0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -72,7 +73,7 @@
                                 </Border>
                                 <Border Classes="InnerCard">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock Text="Minimal Point Distance" Foreground="White"/>
+                                        <TextBlock Text="Minimal Point Distance" Foreground="{DynamicResource B.Text}"/>
                                         <Grid ColumnDefinitions="4*,1*">
                                             <Slider Grid.Column="0" Value="{Binding MinPointDistance, Mode=TwoWay}" Margin="5" Minimum="1" Maximum="10"/>
                                             <NumericUpDown Height="20" Grid.Column="1" ShowButtonSpinner="False" Value="{Binding MinPointDistance, Mode=TwoWay}" Minimum="1" Increment="1" FormatString="F0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>                                    </Grid>
@@ -80,7 +81,7 @@
                                 </Border>
                                 <Border Classes="InnerCard">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock Text="Genearation Speed" Foreground="White"/>
+                                        <TextBlock Text="Genearation Speed" Foreground="{DynamicResource B.Text}"/>
                                         <Grid ColumnDefinitions="4*,1*">
                                             <Slider Grid.Column="0" Value="{Binding GenerationDelay, Mode=TwoWay}" Margin="5" Minimum="0" Maximum="1000"/>
                                             <NumericUpDown Height="20" Grid.Column="1" ShowButtonSpinner="False" Value="{Binding GenerationDelay, Mode=TwoWay}" Minimum="0" Increment="1" FormatString="F0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -89,46 +90,46 @@
                                 </Border>
                                 <Border Classes="InnerCard">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock Text="Enabled Visuals:" Foreground="White"/>
+                                        <TextBlock Text="Enabled Visuals:" Foreground="{DynamicResource B.Text}"/>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <CheckBox HorizontalAlignment="Left" Content="Points" IsChecked="{Binding PointsVisible}" Foreground="White" Margin="10,0"/>
-                                            <CheckBox Grid.Column="1" HorizontalAlignment="Left" Content="Convex Hull" IsChecked="{Binding EdgesVisible}" Foreground="White" Margin="10,0"/>
+                                            <CheckBox HorizontalAlignment="Left" Content="Points" IsChecked="{Binding PointsVisible}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <CheckBox Grid.Column="1" HorizontalAlignment="Left" Content="Convex Hull" IsChecked="{Binding EdgesVisible}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
                                         </Grid>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <CheckBox HorizontalAlignment="Left" Content="Circles" IsChecked="{Binding CirclesVisible}" Foreground="White" Margin="10,0"/>
-                                            <CheckBox Grid.Column="1" HorizontalAlignment="Left" Content="Triangles" IsChecked="{Binding TrianglesVisible}" Foreground="White" Margin="10,0"/>
+                                            <CheckBox HorizontalAlignment="Left" Content="Circles" IsChecked="{Binding CirclesVisible}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <CheckBox Grid.Column="1" HorizontalAlignment="Left" Content="Triangles" IsChecked="{Binding TrianglesVisible}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
                                         </Grid>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <CheckBox HorizontalAlignment="Left" Content="Voronoi" IsChecked="{Binding VoronoiVisible}" Foreground="White" Margin="10,0"/>
-                                            <!-- <CheckBox Content="Triangles" IsChecked="{Binding TrianglesVisible}" Foreground="White" Margin="10,0"/> -->
+                                            <CheckBox HorizontalAlignment="Left" Content="Voronoi" IsChecked="{Binding VoronoiVisible}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <!-- <CheckBox Content="Triangles" IsChecked="{Binding TrianglesVisible}" Foreground="{DynamicResource B.Overlay}" Margin="10,0"/> -->
                                         </Grid>
                                     </StackPanel>
                                 </Border>
                                 <Border Classes="InnerCard">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock Text="Used Algorithm:" Foreground="White"/>
+                                        <TextBlock Text="Used Algorithm:" Foreground="{DynamicResource B.Text}"/>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Connect Points" IsChecked="{Binding DoConnectPoints}" Foreground="White" Margin="10,0"/>
-                                            <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="ConnectPointsV2" IsChecked="{Binding DoConnectPointsV2}" Foreground="White" Margin="10,0"/>
+                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Connect Points" IsChecked="{Binding DoConnectPoints}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="ConnectPointsV2" IsChecked="{Binding DoConnectPointsV2}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
                                         </Grid>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Nearest Triangle" IsChecked="{Binding DoNearestTriangle}" Foreground="White" Margin="10,0"/>
-                                            <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="BowyerWatson" IsChecked="{Binding DoBowyerWatson}" Foreground="White" Margin="10,0"/>
+                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Nearest Triangle" IsChecked="{Binding DoNearestTriangle}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="BowyerWatson" IsChecked="{Binding DoBowyerWatson}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
                                         </Grid>
                                         <Grid ColumnDefinitions="1*, 1*">
-                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Delaunay (Delaunator)" IsChecked="{Binding DoDelaunayLib}" Foreground="White" Margin="10,0"/>
-                                            <!-- <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="Delaunay (Delaunator)" IsChecked="{Binding DoDelaunayLib}" Foreground="White" Margin="10,0"/> -->
+                                            <RadioButton GroupName="Algorithm" HorizontalAlignment="Left" Content="Delaunay (Delaunator)" IsChecked="{Binding DoDelaunayLib}" Foreground="{DynamicResource B.Text}" Margin="10,0"/>
+                                            <!-- <RadioButton Grid.Column="1" GroupName="Algorithm" HorizontalAlignment="Left" Content="Delaunay (Delaunator)" IsChecked="{Binding DoDelaunayLib}" Foreground="{DynamicResource B.Text}" Margin="10,0"/> -->
                                         </Grid>
                                     </StackPanel>
                                 </Border>
                             </StackPanel>
-                            <Button Grid.Row="1" IsVisible="{Binding !IsGenerationRunning}" Foreground="White" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Generate" Command="{Binding GenerateCommand}"/>
-                            <Button Grid.Row="1" IsVisible="{Binding IsGenerationRunning}" Foreground="White" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Cancel" Command="{Binding CancelGeneration}"/>
+                            <Button Grid.Row="1" IsVisible="{Binding !IsGenerationRunning}" Foreground="{DynamicResource B.Text}" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Generate" Command="{Binding GenerateCommand}"/>
+                            <Button Grid.Row="1" IsVisible="{Binding IsGenerationRunning}" Foreground="{DynamicResource B.Text}" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Cancel" Command="{Binding CancelGeneration}"/>
                         </Grid>
                     </ScrollViewer>
                 </Border>
             </Grid>
-            <Canvas Grid.Row="0" Grid.RowSpan="2" x:Name="Scene" Background="#dd000000" ClipToBounds="True" PointerPressed="Scene_OnPointerPressed" PointerMoved="Scene_OnPointerMoved" PointerReleased="Scene_OnPointerReleased" PointerWheelChanged="Scene_OnWheel">
+            <Canvas Grid.Row="0" Grid.RowSpan="2" x:Name="Scene" Background="{DynamicResource B.CanvasBg}" ClipToBounds="True" PointerPressed="Scene_OnPointerPressed" PointerMoved="Scene_OnPointerMoved" PointerReleased="Scene_OnPointerReleased" PointerWheelChanged="Scene_OnWheel">
                 <Canvas x:Name="SceneContent">
                     <Canvas.RenderTransform>
                         <TransformGroup>
@@ -150,7 +151,7 @@
                             <DataTemplate x:DataType="models:Geometries+Edge">
                                 <Line StartPoint="{Binding Start}"
                                       EndPoint="{Binding End}"
-                                      Stroke="GreenYellow" StrokeThickness="2"
+                                      Stroke="{DynamicResource B.Edge}" StrokeThickness="2"
                                       >
                                     <Line.RenderTransform>
                                         <TranslateTransform X="{Binding Start}" Y="{Binding End}"/>
@@ -171,7 +172,7 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="models:Geometries+Circle">
-                                <Ellipse Stroke="BlueViolet" StrokeThickness="1.5"
+                                <Ellipse Stroke="{DynamicResource B.Circle}" StrokeThickness="1.5"
                                          Width="{Binding Diameter}" 
                                          Height="{Binding Diameter}"
                                          >
@@ -195,7 +196,7 @@
                             <DataTemplate x:DataType="models:Geometries+Edge">
                                 <Line StartPoint="{Binding Start}"
                                       EndPoint="{Binding End}"
-                                      Stroke="DarkOrange" StrokeThickness="2"
+                                      Stroke="{DynamicResource B.Voronoi}" StrokeThickness="2"
                                       >
                                     <Line.RenderTransform>
                                         <TranslateTransform X="{Binding Start}" Y="{Binding End}"/>
@@ -216,7 +217,7 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="models:Geometries+Point">
-                                <Ellipse Fill="Transparent" Stroke="White" StrokeThickness="1"
+                                <Ellipse Fill="Transparent" Stroke="{DynamicResource B.PointStroke}" StrokeThickness="1"
                                          Width="{Binding Size}" 
                                          Height="{Binding Size}"
                                          >
@@ -240,7 +241,7 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="models:Geometries+Triangle">
                                 <Canvas>
-                                    <Polygon Points="{Binding Vertices}" Stroke="CornflowerBlue" StrokeThickness="1" Fill="Transparent"/>
+                                    <Polygon Points="{Binding Vertices}" Stroke="{DynamicResource B.Triangle}" StrokeThickness="1" Fill="Transparent"/>
                                 </Canvas>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -248,5 +249,6 @@
                 </Canvas>
             </Canvas>
         </Grid>
+        <Button HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="15" Command="{Binding SwitchThemeCommand}" Content="{Binding SwitchThemeBtnContent}" Width="50" Height="50" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
     </Panel>
 </Window>