From f8976ee40bbe09da0b54bb7893bb24359ff54f2d Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 15:33:29 -0500
Subject: [PATCH 1/9] trace mode clean-up.

---
 Components/BrushesFlyoutPanel.xaml            | 15 +++--
 Components/BrushesFlyoutPanel.xaml.cs         |  2 +
 Components/FlyoutPanel.xaml                   |  3 +-
 Components/LayerControlView.xaml              | 55 +++++++++------
 Components/LayerControlView.xaml.cs           |  2 +
 Components/ShapesFlyoutPanel.xaml             |  4 +-
 Logic/ViewModels/LayerPanelViewModel.cs       | 20 ++++--
 LunaDraw.csproj                               |  1 +
 MauiProgram.cs                                |  4 +-
 Pages/MainPage.xaml                           | 12 ++--
 Platforms/Windows/CompositionBrush.cs.cs      | 67 -------------------
 ...PlatformHelper.cs.cs => PlatformHelper.cs} |  0
 Platforms/Windows/TransparentBackdrop.cs.cs   | 40 -----------
 13 files changed, 78 insertions(+), 147 deletions(-)
 delete mode 100644 Platforms/Windows/CompositionBrush.cs.cs
 rename Platforms/Windows/{PlatformHelper.cs.cs => PlatformHelper.cs} (100%)
 delete mode 100644 Platforms/Windows/TransparentBackdrop.cs.cs

diff --git a/Components/BrushesFlyoutPanel.xaml b/Components/BrushesFlyoutPanel.xaml
index 931c6e0..a6a4ec2 100644
--- a/Components/BrushesFlyoutPanel.xaml
+++ b/Components/BrushesFlyoutPanel.xaml
@@ -5,7 +5,8 @@
              xmlns:models="clr-namespace:LunaDraw.Logic.Models"
              xmlns:components="clr-namespace:LunaDraw.Components"
              x:Class="LunaDraw.Components.BrushesFlyoutPanel"
-             x:DataType="viewModels:ToolbarViewModel">
+             x:DataType="viewModels:ToolbarViewModel"
+             x:Name="Root">
   <Border Background="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray800}}"
           Padding="12"
           StrokeShape="RoundRectangle"
@@ -43,15 +44,15 @@
                       Padding="4"
                       Margin="1">
                 <Border.GestureRecognizers>
-                  <TapGestureRecognizer Command="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=SelectBrushShapeCommand}"
+                  <TapGestureRecognizer Command="{Binding Source={x:Reference Root}, Path=ViewModel.SelectBrushShapeCommand, x:DataType=components:BrushesFlyoutPanel}"
                                         CommandParameter="{Binding .}" />
                 </Border.GestureRecognizers>
                 <components:BrushPreviewControl BrushShape="{Binding .}"
-                                                StrokeColor="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=StrokeColor}"
-                                                FillColor="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=FillColor}"
-                                                IsGlowEnabled="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=IsGlowEnabled}"
-                                                GlowColor="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=GlowColor}"
-                                                GlowRadius="{Binding Source={RelativeSource AncestorType={x:Type viewModels:ToolbarViewModel}}, Path=GlowRadius}"
+                                                StrokeColor="{Binding Source={x:Reference Root}, Path=ViewModel.StrokeColor, x:DataType=components:BrushesFlyoutPanel}"
+                                                FillColor="{Binding Source={x:Reference Root}, Path=ViewModel.FillColor, x:DataType=components:BrushesFlyoutPanel}"
+                                                IsGlowEnabled="{Binding Source={x:Reference Root}, Path=ViewModel.IsGlowEnabled, x:DataType=components:BrushesFlyoutPanel}"
+                                                GlowColor="{Binding Source={x:Reference Root}, Path=ViewModel.GlowColor, x:DataType=components:BrushesFlyoutPanel}"
+                                                GlowRadius="{Binding Source={x:Reference Root}, Path=ViewModel.GlowRadius, x:DataType=components:BrushesFlyoutPanel}"
                                                 Color="{AppThemeBinding Light=Black, Dark=White}"
                                                 HorizontalOptions="Fill"
                                                 VerticalOptions="Fill" />
diff --git a/Components/BrushesFlyoutPanel.xaml.cs b/Components/BrushesFlyoutPanel.xaml.cs
index 53923db..b520b08 100644
--- a/Components/BrushesFlyoutPanel.xaml.cs
+++ b/Components/BrushesFlyoutPanel.xaml.cs
@@ -27,6 +27,8 @@ namespace LunaDraw.Components;
 
 public partial class BrushesFlyoutPanel : ContentView
 {
+  public ToolbarViewModel? ViewModel => BindingContext as ToolbarViewModel;
+
   public BrushesFlyoutPanel()
   {
     InitializeComponent();
diff --git a/Components/FlyoutPanel.xaml b/Components/FlyoutPanel.xaml
index 272cf77..244fcca 100644
--- a/Components/FlyoutPanel.xaml
+++ b/Components/FlyoutPanel.xaml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:components="clr-namespace:LunaDraw.Components"
              x:Class="LunaDraw.Components.FlyoutPanel"
              x:Name="flyoutRoot">
   <Border x:Name="FlyoutContainer"
           Style="{StaticResource FlyoutBorderStyle}">
-    <ContentPresenter Content="{Binding Source={x:Reference flyoutRoot}, Path=FlyoutContent}"/>
+    <ContentPresenter Content="{Binding Source={x:Reference flyoutRoot}, Path=FlyoutContent, x:DataType=components:FlyoutPanel}"/>
   </Border>
 </ContentView>
  
\ No newline at end of file
diff --git a/Components/LayerControlView.xaml b/Components/LayerControlView.xaml
index da0938b..ea8afca 100644
--- a/Components/LayerControlView.xaml
+++ b/Components/LayerControlView.xaml
@@ -4,6 +4,7 @@
              xmlns:viewModels="clr-namespace:LunaDraw.Logic.ViewModels"
              xmlns:models="clr-namespace:LunaDraw.Logic.Models"
              xmlns:converters="clr-namespace:LunaDraw.Converters"
+             xmlns:components="clr-namespace:LunaDraw.Components"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="LunaDraw.Components.LayerControlView"
              x:DataType="viewModels:MainViewModel"
@@ -21,7 +22,7 @@
           Padding="10"
           StrokeShape="RoundRectangle 10"
           x:Name="LayerControlBorder"
-          WidthRequest="{Binding Source={x:Reference Root}, Path=IsLayerPanelExpanded, Converter={StaticResource BoolToLayerPanelWidthConverter}}">
+          WidthRequest="{Binding Source={x:Reference Root}, Path=IsLayerPanelExpanded, Converter={StaticResource BoolToLayerPanelWidthConverter}, x:DataType=components:LayerControlView}">
 
     <VerticalStackLayout>
       <!-- Header -->
@@ -105,7 +106,7 @@
 
                   <!-- Visible Toggle (Eye) -->
                   <Button Text="{Binding IsVisible, Converter={StaticResource BoolToEyeIconConverter}}"
-                          Command="{Binding Source={RelativeSource AncestorType={x:Type viewModels:MainViewModel}}, Path=LayerPanelVM.ToggleLayerVisibilityCommand}"
+                          Command="{Binding Source={x:Reference Root}, Path=ViewModel.LayerPanelVM.ToggleLayerVisibilityCommand, x:DataType=components:LayerControlView}"
                           CommandParameter="{Binding .}"
                           Padding="0"
                           BackgroundColor="Transparent"
@@ -118,7 +119,7 @@
 
                   <!-- Lock Toggle -->
                   <Button Text="{Binding IsLocked, Converter={StaticResource BoolToLockIconConverter}}"
-                          Command="{Binding Source={RelativeSource AncestorType={x:Type viewModels:MainViewModel}}, Path=LayerPanelVM.ToggleLayerLockCommand}"
+                          Command="{Binding Source={x:Reference Root}, Path=ViewModel.LayerPanelVM.ToggleLayerLockCommand, x:DataType=components:LayerControlView}"
                           CommandParameter="{Binding .}"
                           Padding="0"
                           BackgroundColor="Transparent"
@@ -134,7 +135,8 @@
           </CollectionView.ItemTemplate>
         </CollectionView>
 
-        <HorizontalStackLayout Spacing="10">
+        <HorizontalStackLayout Spacing="10"
+                               HorizontalOptions="FillAndExpand">
           <Button Text="+"
                   Command="{Binding LayerPanelVM.AddLayerCommand}"
                   ToolTipProperties.Text="Add Layer"
@@ -154,7 +156,7 @@
                   CornerRadius="10"
                   BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
                   TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
-                  HorizontalOptions="FillAndExpand">
+                  HorizontalOptions="End">
             <Button.Triggers>
               <Trigger TargetType="Button"
                        Property="IsEnabled"
@@ -164,21 +166,36 @@
               </Trigger>
             </Button.Triggers>
           </Button>
+          <Button HorizontalOptions="End"
+                  Text="⧉"
+                  Command="{Binding LayerPanelVM.ToggleTraceModeCommand}"
+                  ToolTipProperties.Text="Toggle Trace Mode"
+                  FontSize="30"
+                  HeightRequest="72"
+                  WidthRequest="72"
+                  CornerRadius="10"
+                  Padding="0"
+                  BorderWidth="0">
+            <Button.Triggers>
+              <DataTrigger TargetType="Button"
+                           Binding="{Binding LayerPanelVM.IsTransparentBackground}"
+                           Value="True">
+                <Setter Property="BackgroundColor"
+                        Value="{StaticResource Primary}"/>
+                <Setter Property="TextColor"
+                        Value="{StaticResource White}"/>
+              </DataTrigger>
+              <DataTrigger TargetType="Button"
+                           Binding="{Binding LayerPanelVM.IsTransparentBackground}"
+                           Value="False">
+                <Setter Property="BackgroundColor"
+                        Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                <Setter Property="TextColor"
+                        Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
+              </DataTrigger>
+            </Button.Triggers>
+          </Button>
         </HorizontalStackLayout>
-
-        <!-- Controls -->
-        <VerticalStackLayout Spacing="10"
-                             IsVisible="{Binding LayerPanelVM.IsTransparentBackgroundVisible}">
-          <!-- Transparent Background Toggle -->
-
-          <Label Text="Trace Mode"
-                 HorizontalOptions="Start"
-                 VerticalOptions="Center"
-                 TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"/>
-          <Slider Value="{Binding LayerPanelVM.WindowTransparency}"
-                  Minimum="25"
-                  Maximum="255"/>
-        </VerticalStackLayout>
       </VerticalStackLayout>
     </VerticalStackLayout>
   </Border>
diff --git a/Components/LayerControlView.xaml.cs b/Components/LayerControlView.xaml.cs
index 22a9a66..77ad4b3 100644
--- a/Components/LayerControlView.xaml.cs
+++ b/Components/LayerControlView.xaml.cs
@@ -28,6 +28,8 @@ namespace LunaDraw.Components;
 
   public partial class LayerControlView : ContentView
   {
+      public MainViewModel? ViewModel => BindingContext as MainViewModel;
+
       public static readonly BindableProperty IsLayerPanelExpandedProperty =
           BindableProperty.Create(nameof(IsLayerPanelExpanded), typeof(bool), typeof(LayerControlView), false, propertyChanged: OnIsLayerPanelExpandedChanged);
 
diff --git a/Components/ShapesFlyoutPanel.xaml b/Components/ShapesFlyoutPanel.xaml
index debb153..eabfa84 100644
--- a/Components/ShapesFlyoutPanel.xaml
+++ b/Components/ShapesFlyoutPanel.xaml
@@ -2,7 +2,9 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:components="clr-namespace:LunaDraw.Components"
-             x:Class="LunaDraw.Components.ShapesFlyoutPanel">
+             xmlns:viewModels="clr-namespace:LunaDraw.Logic.ViewModels"
+             x:Class="LunaDraw.Components.ShapesFlyoutPanel"
+             x:DataType="viewModels:ToolbarViewModel">
   <Border Background="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray800}}"
           Padding="12"
           StrokeShape="RoundRectangle"
diff --git a/Logic/ViewModels/LayerPanelViewModel.cs b/Logic/ViewModels/LayerPanelViewModel.cs
index a3dd0d9..b2a3d9a 100644
--- a/Logic/ViewModels/LayerPanelViewModel.cs
+++ b/Logic/ViewModels/LayerPanelViewModel.cs
@@ -104,6 +104,18 @@ public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPr
       }
     }, outputScheduler: RxApp.MainThreadScheduler);
 
+    ToggleTraceModeCommand = ReactiveCommand.Create(() =>
+    {
+      if (IsTransparentBackground)
+      {
+        WindowTransparency = 255;
+      }
+      else
+      {
+        WindowTransparency = 150;
+      }
+    }, outputScheduler: RxApp.MainThreadScheduler);
+
     // Initialize state from Preferences
     IsTransparentBackground = preferencesService.Get("IsTransparentBackgroundEnabled", false);
     if (!IsTransparentBackground)
@@ -175,15 +187,15 @@ private void UpdateWindowTransparency()
     {
       LunaDraw.PlatformHelper.EnableTrueTransparency(255);
     }
-#endif
+    #endif
   }
 
-  public static bool IsTransparentBackgroundVisible => Config.FeatureFlags.EnableTransparentBackground;
+  public bool IsTransparentBackgroundVisible => Config.FeatureFlags.EnableTransparentBackground;
 
-  public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }
-  public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
+  public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }  public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerForwardCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerBackwardCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerVisibilityCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerLockCommand { get; }
+  public ReactiveCommand<Unit, Unit> ToggleTraceModeCommand { get; }
 }
diff --git a/LunaDraw.csproj b/LunaDraw.csproj
index e622d49..2c509b4 100644
--- a/LunaDraw.csproj
+++ b/LunaDraw.csproj
@@ -42,6 +42,7 @@
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <DefaultItemExcludes>$(DefaultItemExcludes);Tests\**</DefaultItemExcludes>
+    <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0-windows10.0.19041.0'">
diff --git a/MauiProgram.cs b/MauiProgram.cs
index e84f7dc..6b7f18a 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -67,8 +67,8 @@ public static MauiApp CreateMauiApp()
           {
             wndLifeCycleBuilder.OnWindowCreated(window =>
               {
-                  window.SystemBackdrop = new WinUI.TransparentBackdrop();
-                if (Microsoft.Maui.Storage.Preferences.Get("IsTransparentBackgroundEnabled", false))
+                window.SystemBackdrop = new DesktopAcrylicBackdrop();
+                if (Preferences.Get("IsTransparentBackgroundEnabled", false))
                 {
                   PlatformHelper.EnableTrueTransparency(180);   // Fully transparent
                 }
diff --git a/Pages/MainPage.xaml b/Pages/MainPage.xaml
index 7832a39..a36039a 100644
--- a/Pages/MainPage.xaml
+++ b/Pages/MainPage.xaml
@@ -35,29 +35,29 @@
 
     <!-- Settings Flyout Panel as True Overlay -->
     <components:FlyoutPanel x:Name="SettingsFlyoutHost"
-                            IsOpen="{Binding BindingContext.IsSettingsOpen, Source={x:Reference toolbarView}}"
+                            IsOpen="{Binding ToolbarViewModel.IsSettingsOpen}"
                             TargetElement="{x:Reference toolbarView}"
                             AnchorName="SettingsButton">
       <components:SettingsFlyoutPanel x:Name="SettingsFlyoutContent"
-                                      BindingContext="{Binding Source={x:Reference toolbarView}, Path=BindingContext}"/>
+                                      BindingContext="{Binding ToolbarViewModel}"/>
     </components:FlyoutPanel>
 
     <!-- Shapes Flyout Panel as True Overlay -->
     <components:FlyoutPanel x:Name="ShapesFlyoutHost"
-                            IsOpen="{Binding BindingContext.IsShapesFlyoutOpen, Source={x:Reference toolbarView}}"
+                            IsOpen="{Binding ToolbarViewModel.IsShapesFlyoutOpen}"
                             TargetElement="{x:Reference toolbarView}"
                             AnchorName="ShapesButton">
       <components:ShapesFlyoutPanel x:Name="ShapesFlyoutContent"
-                                    BindingContext="{Binding Source={x:Reference toolbarView}, Path=BindingContext}"/>
+                                    BindingContext="{Binding ToolbarViewModel}"/>
     </components:FlyoutPanel>
 
     <!-- Brushes Flyout Panel as True Overlay -->
     <components:FlyoutPanel x:Name="BrushesFlyoutHost"
-                            IsOpen="{Binding BindingContext.IsBrushesFlyoutOpen, Source={x:Reference toolbarView}}"
+                            IsOpen="{Binding ToolbarViewModel.IsBrushesFlyoutOpen}"
                             TargetElement="{x:Reference toolbarView}"
                             AnchorName="BrushButton">
       <components:BrushesFlyoutPanel x:Name="BrushesFlyoutContent"
-                                     BindingContext="{Binding Source={x:Reference toolbarView}, Path=BindingContext}"/>
+                                     BindingContext="{Binding ToolbarViewModel}"/>
     </components:FlyoutPanel>
 
     <!-- Navigation Control (Bottom Right) -->
diff --git a/Platforms/Windows/CompositionBrush.cs.cs b/Platforms/Windows/CompositionBrush.cs.cs
deleted file mode 100644
index 8cf226f..0000000
--- a/Platforms/Windows/CompositionBrush.cs.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
- *  Copyright (c) 2025 CodeSoupCafe LLC
- *  
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *  
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- *  
- */
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
-
-// Alias namespaces to avoid ambiguity and ensure correct types are used
-using WinComp = Windows.UI.Composition;
-using WinUIComp = Microsoft.UI.Composition;
-
-namespace LunaDraw.WinUI;
-
-public abstract class CompositionBrushBackdrop : SystemBackdrop
-{
-  private WinComp.CompositionBrush? brush;
-  private WinComp.Compositor? compositor;
-
-  protected abstract WinComp.CompositionBrush CreateBrush(WinComp.Compositor compositor);
-
-  protected override void OnTargetConnected(WinUIComp.ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
-  {
-    base.OnTargetConnected(connectedTarget, xamlRoot);
-
-    compositor = new WinComp.Compositor();
-
-    brush = CreateBrush(compositor);
-
-    connectedTarget.SystemBackdrop = brush;
-  }
-
-  protected override void OnTargetDisconnected(WinUIComp.ICompositionSupportsSystemBackdrop disconnectedTarget)
-  {
-    base.OnTargetDisconnected(disconnectedTarget);
-
-    if (brush != null)
-    {
-      brush.Dispose();
-      brush = null;
-    }
-
-    if (compositor != null)
-    {
-      compositor.Dispose();
-      compositor = null;
-    }
-  }
-}
diff --git a/Platforms/Windows/PlatformHelper.cs.cs b/Platforms/Windows/PlatformHelper.cs
similarity index 100%
rename from Platforms/Windows/PlatformHelper.cs.cs
rename to Platforms/Windows/PlatformHelper.cs
diff --git a/Platforms/Windows/TransparentBackdrop.cs.cs b/Platforms/Windows/TransparentBackdrop.cs.cs
deleted file mode 100644
index f9c0f91..0000000
--- a/Platforms/Windows/TransparentBackdrop.cs.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- *  Copyright (c) 2025 CodeSoupCafe LLC
- *  
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *  
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- *  
- */
-
-using WinComp = Windows.UI.Composition;
-
-namespace LunaDraw.WinUI;
-
-/// <summary>
-/// Transparent or tinted backdrop for .NET 10
-/// </summary>
-public partial class TransparentBackdrop : CompositionBrushBackdrop
-{
-  protected override WinComp.CompositionBrush CreateBrush(WinComp.Compositor compositor)
-  {
-    // Use HostBackdropBrush to sample the area behind the window.
-    // This allows the user to see through the window (typically with blur).
-    // The TintColor property is unused here; apply tint via XAML.
-    return compositor.CreateHostBackdropBrush();
-  }
-}
\ No newline at end of file

From be1862c5c8fd192897600f9327d5560c63eb6f4d Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 17:32:02 -0500
Subject: [PATCH 2/9] advanced settings modal

---
 Components/AdvancedSettingsPopup.xaml         |  37 +++
 Components/AdvancedSettingsPopup.xaml.cs      |  18 ++
 Components/FlyoutPanel.xaml.cs                |  65 +++--
 Components/LayerControlView.xaml              | 143 ++++++-----
 Components/ToolbarView.xaml                   |  71 ++++--
 Logic/Messages/ShowAdvancedSettingsMessage.cs |   5 +
 Logic/Messages/ViewOptionsChangedMessage.cs   |  13 +
 Logic/ViewModels/MainViewModel.cs             |  40 +++
 Logic/ViewModels/ToolbarViewModel.cs          |  19 ++
 README.md                                     |   7 +-
 Resources/Strings/AppResources.Designer.cs    | 237 ++++++++++++++++++
 Resources/Strings/AppResources.resx           | 148 +++++++++++
 Resources/Styles/Styles.xaml                  |   1 -
 13 files changed, 691 insertions(+), 113 deletions(-)
 create mode 100644 Components/AdvancedSettingsPopup.xaml
 create mode 100644 Components/AdvancedSettingsPopup.xaml.cs
 create mode 100644 Logic/Messages/ShowAdvancedSettingsMessage.cs
 create mode 100644 Logic/Messages/ViewOptionsChangedMessage.cs
 create mode 100644 Resources/Strings/AppResources.Designer.cs
 create mode 100644 Resources/Strings/AppResources.resx

diff --git a/Components/AdvancedSettingsPopup.xaml b/Components/AdvancedSettingsPopup.xaml
new file mode 100644
index 0000000..88d6b84
--- /dev/null
+++ b/Components/AdvancedSettingsPopup.xaml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+               xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+               xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+               xmlns:viewModels="clr-namespace:LunaDraw.Logic.ViewModels"
+               xmlns:strings="clr-namespace:LunaDraw.Resources.Strings"
+               x:Class="LunaDraw.Components.AdvancedSettingsPopup"
+               x:DataType="viewModels:MainViewModel"
+               CanBeDismissedByTappingOutsideOfPopup="True">
+  <VerticalStackLayout Spacing="15">
+    <Grid ColumnDefinitions="*, Auto"
+          RowDefinitions="Auto, Auto"
+          RowSpacing="15">
+      <Label Grid.Row="0"
+             TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray900}}"
+             Grid.Column="0"
+             Text="{x:Static strings:AppResources.Label_ShowLayersPanel}"
+             VerticalOptions="Center"/>
+      <Switch Grid.Row="0"
+              Grid.Column="1"
+              IsToggled="{Binding ShowLayersPanel}"/>
+
+      <Label Grid.Row="1"
+             TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray900}}"
+             Grid.Column="0"
+             Text="{x:Static strings:AppResources.Label_ShowButtonLabels}"
+             VerticalOptions="Center"/>
+      <Switch Grid.Row="1"
+              Grid.Column="1"
+              IsToggled="{Binding ShowButtonLabels}"/>
+    </Grid>
+
+    <Button Text="{x:Static strings:AppResources.Label_Close}"
+            Clicked="OnCloseClicked"
+            Margin="0,10,0,0"/>
+  </VerticalStackLayout>
+</toolkit:Popup>
\ No newline at end of file
diff --git a/Components/AdvancedSettingsPopup.xaml.cs b/Components/AdvancedSettingsPopup.xaml.cs
new file mode 100644
index 0000000..3edb464
--- /dev/null
+++ b/Components/AdvancedSettingsPopup.xaml.cs
@@ -0,0 +1,18 @@
+using CommunityToolkit.Maui.Views;
+using LunaDraw.Logic.ViewModels;
+
+namespace LunaDraw.Components;
+
+public partial class AdvancedSettingsPopup : Popup
+{
+  public AdvancedSettingsPopup(MainViewModel viewModel)
+  {
+    InitializeComponent();
+    BindingContext = viewModel;
+  }
+
+  private void OnCloseClicked(object sender, EventArgs e)
+  {
+    this.CloseAsync();
+  }
+}
diff --git a/Components/FlyoutPanel.xaml.cs b/Components/FlyoutPanel.xaml.cs
index b0654f8..024311d 100644
--- a/Components/FlyoutPanel.xaml.cs
+++ b/Components/FlyoutPanel.xaml.cs
@@ -72,7 +72,6 @@ public FlyoutPanel()
     AbsoluteLayout.SetLayoutBounds(this, new Rect(-1000, -1000, -1, -1));
   }
 
-
   public View FlyoutContent
   {
     get => (View)GetValue(FlyoutContentProperty);
@@ -236,47 +235,47 @@ private async Task PositionFlyout()
     // 1. Try positioning to the right of the target (preferred)
     if (flyoutBounds.Right > screenWidth - margin)
     {
-        // It overflows right. Try positioning to the left of the target.
-        double leftX = targetBounds.Left - flyoutBounds.Width - 10;
-        if (leftX >= margin)
-        {
-            finalX = leftX;
-        }
-        else
+      // It overflows right. Try positioning to the left of the target.
+      double leftX = targetBounds.Left - flyoutBounds.Width - 10;
+      if (leftX >= margin)
+      {
+        finalX = leftX;
+      }
+      else
+      {
+        // Neither side fits perfectly.
+        // Position at the left-most valid position or right-most valid position?
+        // Let's constrain to the screen width.
+        finalX = Math.Max(margin, Math.Min(x, screenWidth - flyoutBounds.Width - margin));
+
+        // If the flyout is wider than the screen (minus margins), constrain width.
+        if (flyoutBounds.Width > screenWidth - 2 * margin)
         {
-            // Neither side fits perfectly.
-            // Position at the left-most valid position or right-most valid position?
-            // Let's constrain to the screen width.
-            finalX = Math.Max(margin, Math.Min(x, screenWidth - flyoutBounds.Width - margin));
-            
-            // If the flyout is wider than the screen (minus margins), constrain width.
-            if (flyoutBounds.Width > screenWidth - 2 * margin)
-            {
-                finalX = margin;
-                finalWidth = screenWidth - 2 * margin;
-            }
+          finalX = margin;
+          finalWidth = screenWidth - 2 * margin;
         }
+      }
     }
 
     // --- Vertical Positioning Strategy ---
-    
+
     // If the flyout overflows the bottom edge
     if (flyoutBounds.Bottom > screenHeight - margin)
     {
-        // Try moving it up
-        double diff = flyoutBounds.Bottom - (screenHeight - margin);
-        double newY = y - diff;
+      // Try moving it up
+      double diff = flyoutBounds.Bottom - (screenHeight - margin);
+      double newY = y - diff;
 
-        if (newY >= margin)
-        {
-            finalY = newY;
-        }
-        else
-        {
-            // Moving up hits the top edge. Constrain Height.
-            finalY = margin;
-            finalHeight = screenHeight - 2 * margin;
-        }
+      if (newY >= margin)
+      {
+        finalY = newY;
+      }
+      else
+      {
+        // Moving up hits the top edge. Constrain Height.
+        finalY = margin;
+        finalHeight = screenHeight - 2 * margin;
+      }
     }
 
     // Re-apply the adjusted bounds
diff --git a/Components/LayerControlView.xaml b/Components/LayerControlView.xaml
index ea8afca..0661c49 100644
--- a/Components/LayerControlView.xaml
+++ b/Components/LayerControlView.xaml
@@ -5,6 +5,7 @@
              xmlns:models="clr-namespace:LunaDraw.Logic.Models"
              xmlns:converters="clr-namespace:LunaDraw.Converters"
              xmlns:components="clr-namespace:LunaDraw.Components"
+             xmlns:strings="clr-namespace:LunaDraw.Resources.Strings"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="LunaDraw.Components.LayerControlView"
              x:DataType="viewModels:MainViewModel"
@@ -22,6 +23,7 @@
           Padding="10"
           StrokeShape="RoundRectangle 10"
           x:Name="LayerControlBorder"
+          IsVisible="{Binding ShowLayersPanel}"
           WidthRequest="{Binding Source={x:Reference Root}, Path=IsLayerPanelExpanded, Converter={StaticResource BoolToLayerPanelWidthConverter}, x:DataType=components:LayerControlView}">
 
     <VerticalStackLayout>
@@ -32,11 +34,12 @@
         <Grid.GestureRecognizers>
           <TapGestureRecognizer Tapped="OnCollapseClicked"/>
         </Grid.GestureRecognizers>
-        <Label Text="Layers"
+        <Label Text="{x:Static strings:AppResources.Layers_Title}"
                FontAttributes="Bold"
                VerticalOptions="Center"/>
         <Button x:Name="CollapseButton"
                 Text="▶"
+                ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_CollapseLayers}"
                 BackgroundColor="Transparent"
                 TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"
                 Clicked="OnCollapseClicked"
@@ -108,6 +111,7 @@
                   <Button Text="{Binding IsVisible, Converter={StaticResource BoolToEyeIconConverter}}"
                           Command="{Binding Source={x:Reference Root}, Path=ViewModel.LayerPanelVM.ToggleLayerVisibilityCommand, x:DataType=components:LayerControlView}"
                           CommandParameter="{Binding .}"
+                          ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_LayerVisibility}"
                           Padding="0"
                           BackgroundColor="Transparent"
                           TextColor="Black"
@@ -121,6 +125,7 @@
                   <Button Text="{Binding IsLocked, Converter={StaticResource BoolToLockIconConverter}}"
                           Command="{Binding Source={x:Reference Root}, Path=ViewModel.LayerPanelVM.ToggleLayerLockCommand, x:DataType=components:LayerControlView}"
                           CommandParameter="{Binding .}"
+                          ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_LayerLock}"
                           Padding="0"
                           BackgroundColor="Transparent"
                           TextColor="Black"
@@ -137,64 +142,84 @@
 
         <HorizontalStackLayout Spacing="10"
                                HorizontalOptions="FillAndExpand">
-          <Button Text="+"
-                  Command="{Binding LayerPanelVM.AddLayerCommand}"
-                  ToolTipProperties.Text="Add Layer"
-                  FontSize="30"
-                  HeightRequest="72"
-                  WidthRequest="72"
-                  CornerRadius="10"
-                  BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
-                  TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
-                  HorizontalOptions="FillAndExpand"/>
-          <Button Text="🗑️"
-                  Command="{Binding LayerPanelVM.RemoveLayerCommand}"
-                  ToolTipProperties.Text="Remove Layer"
-                  FontSize="24"
-                  HeightRequest="72"
-                  WidthRequest="72"
-                  CornerRadius="10"
-                  BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
-                  TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
-                  HorizontalOptions="End">
-            <Button.Triggers>
-              <Trigger TargetType="Button"
-                       Property="IsEnabled"
-                       Value="False">
-                <Setter Property="Opacity"
-                        Value="0.5"/>
-              </Trigger>
-            </Button.Triggers>
-          </Button>
-          <Button HorizontalOptions="End"
-                  Text="⧉"
-                  Command="{Binding LayerPanelVM.ToggleTraceModeCommand}"
-                  ToolTipProperties.Text="Toggle Trace Mode"
-                  FontSize="30"
-                  HeightRequest="72"
-                  WidthRequest="72"
-                  CornerRadius="10"
-                  Padding="0"
-                  BorderWidth="0">
-            <Button.Triggers>
-              <DataTrigger TargetType="Button"
-                           Binding="{Binding LayerPanelVM.IsTransparentBackground}"
-                           Value="True">
-                <Setter Property="BackgroundColor"
-                        Value="{StaticResource Primary}"/>
-                <Setter Property="TextColor"
-                        Value="{StaticResource White}"/>
-              </DataTrigger>
-              <DataTrigger TargetType="Button"
-                           Binding="{Binding LayerPanelVM.IsTransparentBackground}"
-                           Value="False">
-                <Setter Property="BackgroundColor"
-                        Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
-                <Setter Property="TextColor"
-                        Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
-              </DataTrigger>
-            </Button.Triggers>
-          </Button>
+          <VerticalStackLayout HorizontalOptions="FillAndExpand">
+            <Button Text="+"
+                    Command="{Binding LayerPanelVM.AddLayerCommand}"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_AddLayer}"
+                    FontSize="30"
+                    HeightRequest="72"
+                    WidthRequest="72"
+                    CornerRadius="10"
+                    BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
+                    HorizontalOptions="Center"/>
+             <Label Text="{x:Static strings:AppResources.ToolTip_AddLayer}"
+                    FontSize="12"
+                    HorizontalTextAlignment="Center"
+                    IsVisible="{Binding ShowButtonLabels}"/>
+          </VerticalStackLayout>
+          
+          <VerticalStackLayout HorizontalOptions="End">
+            <Button Text="🗑️"
+                    Command="{Binding LayerPanelVM.RemoveLayerCommand}"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_RemoveLayer}"
+                    FontSize="24"
+                    HeightRequest="72"
+                    WidthRequest="72"
+                    CornerRadius="10"
+                    BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
+                    HorizontalOptions="Center">
+              <Button.Triggers>
+                <Trigger TargetType="Button"
+                         Property="IsEnabled"
+                         Value="False">
+                  <Setter Property="Opacity"
+                          Value="0.5"/>
+                </Trigger>
+              </Button.Triggers>
+            </Button>
+            <Label Text="{x:Static strings:AppResources.Label_Delete}"
+                   FontSize="12"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
+          </VerticalStackLayout>
+          
+          <VerticalStackLayout HorizontalOptions="End" Margin="20,0,0,0">
+            <Button Text="⧉"
+                    Command="{Binding LayerPanelVM.ToggleTraceModeCommand}"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_ToggleTraceMode}"
+                    FontSize="30"
+                    HeightRequest="72"
+                    WidthRequest="72"
+                    CornerRadius="10"
+                    Padding="0"
+                    BorderWidth="0"
+                    HorizontalOptions="Center">
+              <Button.Triggers>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding LayerPanelVM.IsTransparentBackground}"
+                             Value="True">
+                  <Setter Property="BackgroundColor"
+                          Value="{StaticResource Primary}"/>
+                  <Setter Property="TextColor"
+                          Value="{StaticResource White}"/>
+                </DataTrigger>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding LayerPanelVM.IsTransparentBackground}"
+                             Value="False">
+                  <Setter Property="BackgroundColor"
+                          Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                  <Setter Property="TextColor"
+                          Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
+                </DataTrigger>
+              </Button.Triggers>
+            </Button>
+            <Label Text="Trace"
+                   FontSize="12"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
+          </VerticalStackLayout>
         </HorizontalStackLayout>
       </VerticalStackLayout>
     </VerticalStackLayout>
diff --git a/Components/ToolbarView.xaml b/Components/ToolbarView.xaml
index 01c832b..08cba44 100644
--- a/Components/ToolbarView.xaml
+++ b/Components/ToolbarView.xaml
@@ -7,6 +7,7 @@
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:controls="clr-namespace:Maui.ColorPicker;assembly=Maui.ColorPicker"
              xmlns:local="clr-namespace:LunaDraw.Components"
+             xmlns:strings="clr-namespace:LunaDraw.Resources.Strings"
              xmlns:pages="clr-namespace:LunaDraw.Pages;assembly=LunaDraw"
              x:Class="LunaDraw.Views.ToolbarView"
              x:DataType="viewModels:ToolbarViewModel">
@@ -65,20 +66,24 @@
             <Button x:Name="SelectButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="⬚"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_SelectTool}"
                     Command="{Binding SelectToolCommand}"
                     CommandParameter="{Binding AvailableTools[0]}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='SelectTool'}">
             </Button>
             <Label Text="{Binding AvailableTools[0].Name}"
-                   HorizontalTextAlignment="Center"/>
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="SettingsButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="🌈"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Styles}"
                     Command="{Binding ShowSettingsCommand}"/>
-            <Label Text="Styles"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Styles}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
            <StackLayout HorizontalOptions="Center">
             <Border x:Name="BrushButton"
@@ -87,6 +92,7 @@
                     Padding="8"
                     Margin="0,4"
                     StrokeShape="RoundRectangle 12"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_BrushSettings}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='FreehandTool'}">
                 <Border.GestureRecognizers>
                     <TapGestureRecognizer Command="{Binding ShowBrushesFlyoutCommand}"/>
@@ -97,7 +103,8 @@
                                            VerticalOptions="Fill"/>
             </Border>
             <Label Text="{Binding AvailableTools[1].Name}"
-                   HorizontalTextAlignment="Center"/>
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
           <StackLayout HorizontalOptions="Center">
             <Border x:Name="ShapesButton"
@@ -106,6 +113,7 @@
                     Padding="8"
                     Margin="0,4"
                     StrokeShape="RoundRectangle 12"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Shapes}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='Shapes'}">
                 <Border.GestureRecognizers>
                     <TapGestureRecognizer Command="{Binding ShowShapesFlyoutCommand}"/>
@@ -117,47 +125,56 @@
                                            HorizontalOptions="Fill"
                                            VerticalOptions="Fill"/>
             </Border>
-            <Label Text="Shapes"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Shapes}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="ImageButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="🖼️"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_ImportImage}"
                     Command="{Binding ImportImageCommand}"/>
-            <Label Text="Image"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Image}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="SaveButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="💾"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_SaveImage}"
                     Command="{Binding SaveImageCommand}"/>
-            <Label Text="Save"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Save}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
          <StackLayout HorizontalOptions="Center">
             <Button x:Name="EraserButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="🧽"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Eraser}"
                     Command="{Binding SelectToolCommand}"
                     CommandParameter="{Binding AvailableTools[6]}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='EraserBrushTool'}">
             </Button>
             <Label Text="{Binding AvailableTools[6].Name}"
-                   HorizontalTextAlignment="Center"/>
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="DeleteButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="🗑️"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_DeleteSelected}"
                     Command="{Binding DeleteSelectedCommand}"/>
-            <Label Text="Delete"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Delete}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
           <BoxView HeightRequest="2"
@@ -168,19 +185,39 @@
             <Button x:Name="UndoButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="↺"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Undo}"
                     Command="{Binding UndoCommand}">
             </Button>
-            <Label Text="Undo"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Undo}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="RedoButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="↻"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Redo}"
                     Command="{Binding RedoCommand}">
             </Button>
-            <Label Text="Redo"
-                   HorizontalTextAlignment="Center"/>
+            <Label Text="{x:Static strings:AppResources.Label_Redo}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
+          </StackLayout>
+
+          <BoxView HeightRequest="2"
+                   Color="Gray"
+                   Margin="0,4"/>
+                   
+          <StackLayout HorizontalOptions="Center">
+            <Button x:Name="ViewOptionsButton"
+                    Style="{StaticResource ToolbarButtonStyle}"
+                    Text="⚙️"
+                    ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_ViewOptions}"
+                    Command="{Binding ShowAdvancedSettingsCommand}">
+            </Button>
+            <Label Text="{x:Static strings:AppResources.Label_ViewOptions}"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
         </VerticalStackLayout>
       </ScrollView>
diff --git a/Logic/Messages/ShowAdvancedSettingsMessage.cs b/Logic/Messages/ShowAdvancedSettingsMessage.cs
new file mode 100644
index 0000000..77b1d8e
--- /dev/null
+++ b/Logic/Messages/ShowAdvancedSettingsMessage.cs
@@ -0,0 +1,5 @@
+namespace LunaDraw.Logic.Messages;
+
+public class ShowAdvancedSettingsMessage
+{
+}
diff --git a/Logic/Messages/ViewOptionsChangedMessage.cs b/Logic/Messages/ViewOptionsChangedMessage.cs
new file mode 100644
index 0000000..e9b0370
--- /dev/null
+++ b/Logic/Messages/ViewOptionsChangedMessage.cs
@@ -0,0 +1,13 @@
+namespace LunaDraw.Logic.Messages;
+
+public class ViewOptionsChangedMessage
+{
+  public bool ShowButtonLabels { get; }
+  public bool ShowLayersPanel { get; }
+
+  public ViewOptionsChangedMessage(bool showButtonLabels, bool showLayersPanel)
+  {
+    ShowButtonLabels = showButtonLabels;
+    ShowLayersPanel = showLayersPanel;
+  }
+}
diff --git a/Logic/ViewModels/MainViewModel.cs b/Logic/ViewModels/MainViewModel.cs
index 2be2030..f7dde08 100644
--- a/Logic/ViewModels/MainViewModel.cs
+++ b/Logic/ViewModels/MainViewModel.cs
@@ -35,6 +35,7 @@
 
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
+using CommunityToolkit.Maui.Extensions;
 
 namespace LunaDraw.Logic.ViewModels;
 
@@ -47,6 +48,7 @@ public class MainViewModel : ReactiveObject
   public NavigationModel NavigationModel { get; }
   public SelectionObserver SelectionObserver { get; }
   private readonly IMessageBus messageBus;
+  private readonly IPreferencesService preferencesService;
 
   // Sub-ViewModels
   public LayerPanelViewModel LayerPanelVM { get; }
@@ -60,6 +62,31 @@ public class MainViewModel : ReactiveObject
 
   public SKRect CanvasSize { get; set; }
 
+  // UI State
+  private bool showButtonLabels;
+  public bool ShowButtonLabels
+  {
+    get => showButtonLabels;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref showButtonLabels, value);
+      preferencesService.Set("ShowButtonLabels", value);
+      messageBus.SendMessage(new ViewOptionsChangedMessage(value, ShowLayersPanel));
+    }
+  }
+
+  private bool showLayersPanel;
+  public bool ShowLayersPanel
+  {
+    get => showLayersPanel;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref showLayersPanel, value);
+      preferencesService.Set("ShowLayersPanel", value);
+      messageBus.SendMessage(new ViewOptionsChangedMessage(ShowButtonLabels, value));
+    }
+  }
+
   // Facades for View/CodeBehind access
   public ObservableCollection<Layer> Layers => LayerFacade.Layers;
 
@@ -76,6 +103,7 @@ public MainViewModel(
     NavigationModel navigationModel,
     SelectionObserver selectionObserver,
     IMessageBus messageBus,
+    IPreferencesService preferencesService,
     LayerPanelViewModel layerPanelVM,
     SelectionViewModel selectionVM,
     HistoryViewModel historyVM)
@@ -86,13 +114,25 @@ public MainViewModel(
     NavigationModel = navigationModel;
     SelectionObserver = selectionObserver;
     this.messageBus = messageBus;
+    this.preferencesService = preferencesService;
     LayerPanelVM = layerPanelVM;
     SelectionVM = selectionVM;
     HistoryVM = historyVM;
 
+    // Use Property setters to trigger ViewOptionsChangedMessage so ToolbarViewModel syncs up
+    ShowButtonLabels = this.preferencesService.Get("ShowButtonLabels", false);
+    ShowLayersPanel = this.preferencesService.Get("ShowLayersPanel", false);
+
     ZoomInCommand = ReactiveCommand.Create(ZoomIn);
     ZoomOutCommand = ReactiveCommand.Create(ZoomOut);
     ResetZoomCommand = ReactiveCommand.Create(ResetZoom);
+
+    // Listen for ShowAdvancedSettingsMessage
+    this.messageBus.Listen<ShowAdvancedSettingsMessage>().Subscribe(async _ =>
+    {
+      var popup = new Components.AdvancedSettingsPopup(this);
+      await Application.Current.Windows[0].Page?.ShowPopupAsync(popup);
+    });
   }
 
 
diff --git a/Logic/ViewModels/ToolbarViewModel.cs b/Logic/ViewModels/ToolbarViewModel.cs
index 54c8948..07374f9 100644
--- a/Logic/ViewModels/ToolbarViewModel.cs
+++ b/Logic/ViewModels/ToolbarViewModel.cs
@@ -186,6 +186,7 @@ public virtual float HueJitter
   public ReactiveCommand<BrushShape, Unit> SelectBrushShapeCommand { get; }
   public ReactiveCommand<Unit, Unit> ImportImageCommand { get; }
   public ReactiveCommand<Unit, Unit> SaveImageCommand { get; }
+  public ReactiveCommand<Unit, Unit> ShowAdvancedSettingsCommand { get; }
 
   // UI state properties
   private bool isSettingsOpen = false;
@@ -195,6 +196,13 @@ public bool IsSettingsOpen
     set => this.RaiseAndSetIfChanged(ref isSettingsOpen, value);
   }
 
+  private bool showButtonLabels = true;
+  public bool ShowButtonLabels
+  {
+    get => showButtonLabels;
+    set => this.RaiseAndSetIfChanged(ref showButtonLabels, value);
+  }
+
   private bool isShapesFlyoutOpen = false;
   public bool IsShapesFlyoutOpen
   {
@@ -236,6 +244,12 @@ public ToolbarViewModel(
     this.navigationModel = navigationModel;
     this.fileSaver = fileSaver;
 
+    // Listen for ViewOptions changes
+    this.messageBus.Listen<ViewOptionsChangedMessage>().Subscribe(msg =>
+    {
+      ShowButtonLabels = msg.ShowButtonLabels;
+    });
+
     // Initialize Tools and Shapes
     AvailableTools =
     [
@@ -383,6 +397,11 @@ public ToolbarViewModel(
       IsBrushesFlyoutOpen = false;
     });
 
+    ShowAdvancedSettingsCommand = ReactiveCommand.Create(() =>
+    {
+       messageBus.SendMessage(new ShowAdvancedSettingsMessage());
+    });
+
     SelectRectangleCommand = ReactiveCommand.Create(() =>
     {
       var tool = AvailableTools.FirstOrDefault(t => t is RectangleTool) ?? new RectangleTool(messageBus);
diff --git a/README.md b/README.md
index 57d4d6e..10569dc 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,15 @@
 LunaDraw is a child-centric drawing application designed for children aged 3–8. It provides a safe, ad-free, and magical environment for creativity, featuring special effects brushes, easy-to-use tools, and a "Movie Mode" that replays the drawing process.
 
 > ### **<span style="color:maroon">Missing Features / Parity / Testing / Deployment</span>**
+>
 > This application is a work in-progress and has several missing features yet to be implemented. Only Windows has been tested on one device. No mobile testing has been done. As the application is new and the holidays draw closer, it may be another month or two before app store submission.
-> 
+>
 > The running list can be found below:
 >
 > - [Missing Features](Documentation/MissingFeatures.md)
 
-
 > ### **Vibe-Coded**
+>
 > The application is heavily vibe-coded and guided by best practices in the [Cline Rules](.clinerules/.clinerules.md) using [SPARC Agentic Development](https://gist.github.com/ruvnet/7d4e1d5c9233ab0a1d2a66bf5ec3e58f); mostly using [Gemini 3](https://gemini.google.com/). Hallucinations are always possible. It is recognized and should be by all that AI is still sometimes as helpful as a sack of hair.
 >
 > There are some very poor implementations by the AI such as string names of commands.
@@ -98,4 +99,4 @@ For more detailed information, please refer to the `Documentation` directory:
 ## Deployment
 
 1. Build the project using Visual Studio or VS Code.
-2. Deploy the generated application on the respective platform (Windows, Android, iOS, MacCatalyst).
\ No newline at end of file
+2. Deploy the generated application on the respective platform (Windows, Android, iOS, MacCatalyst).
diff --git a/Resources/Strings/AppResources.Designer.cs b/Resources/Strings/AppResources.Designer.cs
new file mode 100644
index 0000000..d8ba392
--- /dev/null
+++ b/Resources/Strings/AppResources.Designer.cs
@@ -0,0 +1,237 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LunaDraw.Resources.Strings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class AppResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal AppResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LunaDraw.Resources.Strings.AppResources", typeof(AppResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static string Layers_Title {
+            get {
+                return ResourceManager.GetString("Layers_Title", resourceCulture);
+            }
+        }
+        
+        internal static string ToolTip_AddLayer {
+            get {
+                return ResourceManager.GetString("ToolTip_AddLayer", resourceCulture);
+            }
+        }
+        
+        internal static string ToolTip_RemoveLayer {
+            get {
+                return ResourceManager.GetString("ToolTip_RemoveLayer", resourceCulture);
+            }
+        }
+        
+        internal static string ToolTip_ToggleTraceMode {
+            get {
+                return ResourceManager.GetString("ToolTip_ToggleTraceMode", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_CollapseLayers {
+            get {
+                return ResourceManager.GetString("ToolTip_CollapseLayers", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_LayerVisibility {
+            get {
+                return ResourceManager.GetString("ToolTip_LayerVisibility", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_LayerLock {
+            get {
+                return ResourceManager.GetString("ToolTip_LayerLock", resourceCulture);
+            }
+        }
+
+        internal static string Label_Styles {
+            get {
+                return ResourceManager.GetString("Label_Styles", resourceCulture);
+            }
+        }
+
+        internal static string Label_Shapes {
+            get {
+                return ResourceManager.GetString("Label_Shapes", resourceCulture);
+            }
+        }
+
+        internal static string Label_Image {
+            get {
+                return ResourceManager.GetString("Label_Image", resourceCulture);
+            }
+        }
+
+        internal static string Label_Save {
+            get {
+                return ResourceManager.GetString("Label_Save", resourceCulture);
+            }
+        }
+
+        internal static string Label_Delete {
+            get {
+                return ResourceManager.GetString("Label_Delete", resourceCulture);
+            }
+        }
+
+        internal static string Label_Undo {
+            get {
+                return ResourceManager.GetString("Label_Undo", resourceCulture);
+            }
+        }
+
+        internal static string Label_Redo {
+            get {
+                return ResourceManager.GetString("Label_Redo", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_SelectTool {
+            get {
+                return ResourceManager.GetString("ToolTip_SelectTool", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_Styles {
+            get {
+                return ResourceManager.GetString("ToolTip_Styles", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_BrushSettings {
+            get {
+                return ResourceManager.GetString("ToolTip_BrushSettings", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_Shapes {
+            get {
+                return ResourceManager.GetString("ToolTip_Shapes", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_ImportImage {
+            get {
+                return ResourceManager.GetString("ToolTip_ImportImage", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_SaveImage {
+            get {
+                return ResourceManager.GetString("ToolTip_SaveImage", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_Eraser {
+            get {
+                return ResourceManager.GetString("ToolTip_Eraser", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_DeleteSelected {
+            get {
+                return ResourceManager.GetString("ToolTip_DeleteSelected", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_Undo {
+            get {
+                return ResourceManager.GetString("ToolTip_Undo", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_Redo {
+            get {
+                return ResourceManager.GetString("ToolTip_Redo", resourceCulture);
+            }
+        }
+        
+        internal static string Label_ViewOptions {
+            get {
+                return ResourceManager.GetString("Label_ViewOptions", resourceCulture);
+            }
+        }
+
+        internal static string Label_ShowLayersPanel {
+            get {
+                return ResourceManager.GetString("Label_ShowLayersPanel", resourceCulture);
+            }
+        }
+
+        internal static string Label_ShowButtonLabels {
+            get {
+                return ResourceManager.GetString("Label_ShowButtonLabels", resourceCulture);
+            }
+        }
+
+        internal static string ToolTip_ViewOptions {
+            get {
+                return ResourceManager.GetString("ToolTip_ViewOptions", resourceCulture);
+            }
+        }
+
+        internal static string Label_Close {
+            get {
+                return ResourceManager.GetString("Label_Close", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Resources/Strings/AppResources.resx b/Resources/Strings/AppResources.resx
new file mode 100644
index 0000000..122d55a
--- /dev/null
+++ b/Resources/Strings/AppResources.resx
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Layers_Title" xml:space="preserve">
+    <value>Layers</value>
+  </data>
+  <data name="ToolTip_AddLayer" xml:space="preserve">
+    <value>Add Layer</value>
+  </data>
+  <data name="ToolTip_RemoveLayer" xml:space="preserve">
+    <value>Remove Layer</value>
+  </data>
+  <data name="ToolTip_ToggleTraceMode" xml:space="preserve">
+    <value>Toggle Trace Mode</value>
+  </data>
+  <data name="ToolTip_CollapseLayers" xml:space="preserve">
+    <value>Collapse Layers Panel</value>
+  </data>
+  <data name="ToolTip_LayerVisibility" xml:space="preserve">
+    <value>Toggle Visibility</value>
+  </data>
+  <data name="ToolTip_LayerLock" xml:space="preserve">
+    <value>Toggle Lock</value>
+  </data>
+  <data name="Label_Styles" xml:space="preserve">
+    <value>Styles</value>
+  </data>
+  <data name="Label_Shapes" xml:space="preserve">
+    <value>Shapes</value>
+  </data>
+  <data name="Label_Image" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="Label_Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Label_Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Label_Undo" xml:space="preserve">
+    <value>Undo</value>
+  </data>
+  <data name="Label_Redo" xml:space="preserve">
+    <value>Redo</value>
+  </data>
+  <data name="ToolTip_SelectTool" xml:space="preserve">
+    <value>Select Tool</value>
+  </data>
+  <data name="ToolTip_Styles" xml:space="preserve">
+    <value>Style Settings</value>
+  </data>
+  <data name="ToolTip_BrushSettings" xml:space="preserve">
+    <value>Brush Settings</value>
+  </data>
+  <data name="ToolTip_Shapes" xml:space="preserve">
+    <value>Shapes</value>
+  </data>
+  <data name="ToolTip_ImportImage" xml:space="preserve">
+    <value>Import Image</value>
+  </data>
+  <data name="ToolTip_SaveImage" xml:space="preserve">
+    <value>Save Image</value>
+  </data>
+  <data name="ToolTip_Eraser" xml:space="preserve">
+    <value>Eraser</value>
+  </data>
+  <data name="ToolTip_DeleteSelected" xml:space="preserve">
+    <value>Delete Selected</value>
+  </data>
+  <data name="ToolTip_Undo" xml:space="preserve">
+    <value>Undo</value>
+  </data>
+  <data name="ToolTip_Redo" xml:space="preserve">
+    <value>Redo</value>
+  </data>
+  <data name="Label_ViewOptions" xml:space="preserve">
+    <value>View Options</value>
+  </data>
+  <data name="Label_ShowLayersPanel" xml:space="preserve">
+    <value>Show Layers Panel</value>
+  </data>
+  <data name="Label_ShowButtonLabels" xml:space="preserve">
+    <value>Show Button Labels</value>
+  </data>
+  <data name="ToolTip_ViewOptions" xml:space="preserve">
+    <value>View Options</value>
+  </data>
+  <data name="Label_Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Resources/Styles/Styles.xaml b/Resources/Styles/Styles.xaml
index fc9fa18..4613384 100644
--- a/Resources/Styles/Styles.xaml
+++ b/Resources/Styles/Styles.xaml
@@ -588,7 +588,6 @@
             Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}"/>
   </Style>
 
-
   <!-- Style for buttons within fly-outs -->
   <Style x:Key="FlyoutButtonStyle"
          TargetType="Button">

From dc8c9527488239e8d3ea9247c41748af0dff5fa1 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 17:36:00 -0500
Subject: [PATCH 3/9] syntax. license

---
 Components/AdvancedSettingsPopup.xaml.cs      |  23 +
 Components/BrushPreviewControl.cs             |  16 +-
 Components/BrushesFlyoutPanel.xaml            |  10 +-
 Components/BrushesFlyoutPanel.xaml.cs         |   2 +-
 Components/LayerControlView.xaml              |  15 +-
 Components/LayerControlView.xaml.cs           | 100 ++--
 Components/MiniMapView.xaml                   |  14 +-
 Components/SettingsFlyoutPanel.xaml           | 446 +++++++++---------
 Components/SettingsFlyoutPanel.xaml.cs        | 146 +++---
 Components/ShapesFlyoutPanel.xaml             |  54 +--
 Components/ShapesFlyoutPanel.xaml.cs          |  10 +-
 Components/ToolbarView.xaml                   |  47 +-
 Converters/ActiveShapeIconConverter.cs        |  32 +-
 Converters/BoolToEyeIconConverter.cs          |  28 +-
 Converters/BoolToLockIconConverter.cs         |  28 +-
 Converters/ColorToHexConverter.cs             |  66 +--
 Converters/IsToolActiveConverter.cs           |  40 +-
 Converters/ToolToColorConverter.cs            |  62 +--
 Logic/Config/FeatureFlags.cs                  |  25 +-
 Logic/Messages/BrushSettingsChangedMessage.cs |  72 +--
 Logic/Messages/BrushShapeChangedMessage.cs    |   8 +-
 Logic/Messages/CanvasInvalidateMessage.cs     |  14 +-
 Logic/Messages/DrawingStateChangedMessage.cs  |  12 +-
 Logic/Messages/ElementAddedMessage.cs         |  16 +-
 Logic/Messages/ElementRemovedMessage.cs       |  16 +-
 Logic/Messages/LayerChangedMessage.cs         |  14 +-
 Logic/Messages/SelectionChangedMessage.cs     |  14 +-
 Logic/Messages/ShowAdvancedSettingsMessage.cs |  23 +
 Logic/Messages/ToolChangedMessage.cs          |  14 +-
 Logic/Messages/ViewOptionsChangedMessage.cs   |  23 +
 Logic/Services/IPreferencesService.cs         |  23 +
 Logic/Services/PreferencesService.cs          |  23 +
 Logic/Tools/RectangleTool.cs                  |   2 +-
 Logic/ViewModels/LayerPanelViewModel.cs       |   5 +-
 Logic/ViewModels/ToolbarViewModel.cs          |   2 +-
 Resources/Strings/AppResources.Designer.cs    |  23 +
 36 files changed, 817 insertions(+), 651 deletions(-)

diff --git a/Components/AdvancedSettingsPopup.xaml.cs b/Components/AdvancedSettingsPopup.xaml.cs
index 3edb464..72bbac5 100644
--- a/Components/AdvancedSettingsPopup.xaml.cs
+++ b/Components/AdvancedSettingsPopup.xaml.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 using CommunityToolkit.Maui.Views;
 using LunaDraw.Logic.ViewModels;
 
diff --git a/Components/BrushPreviewControl.cs b/Components/BrushPreviewControl.cs
index 6cfc048..fc02806 100644
--- a/Components/BrushPreviewControl.cs
+++ b/Components/BrushPreviewControl.cs
@@ -138,14 +138,14 @@ protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
     // Draw Glow if enabled
     if (IsGlowEnabled)
     {
-        using var glowPaint = new SKPaint
-        {
-            Style = SKPaintStyle.StrokeAndFill,
-            Color = GlowColor,
-            IsAntialias = true,
-            MaskFilter = SKMaskFilter.CreateBlur(SKBlurStyle.Normal, GlowRadius)
-        };
-        canvas.DrawPath(BrushShape.Path, glowPaint);
+      using var glowPaint = new SKPaint
+      {
+        Style = SKPaintStyle.StrokeAndFill,
+        Color = GlowColor,
+        IsAntialias = true,
+        MaskFilter = SKMaskFilter.CreateBlur(SKBlurStyle.Normal, GlowRadius)
+      };
+      canvas.DrawPath(BrushShape.Path, glowPaint);
     }
 
     using var paint = new SKPaint
diff --git a/Components/BrushesFlyoutPanel.xaml b/Components/BrushesFlyoutPanel.xaml
index a6a4ec2..f2e6acc 100644
--- a/Components/BrushesFlyoutPanel.xaml
+++ b/Components/BrushesFlyoutPanel.xaml
@@ -22,7 +22,7 @@
       <BoxView HeightRequest="1"
                Color="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
                Margin="0,5"/>
-               
+
       <CollectionView ItemsSource="{Binding AvailableBrushShapes}"
                       HeightRequest="420"
                       HorizontalOptions="Fill"
@@ -31,7 +31,7 @@
           <GridItemsLayout Orientation="Vertical"
                            Span="4"
                            VerticalItemSpacing="10"
-                           HorizontalItemSpacing="10" />
+                           HorizontalItemSpacing="10"/>
         </CollectionView.ItemsLayout>
         <CollectionView.ItemTemplate>
           <DataTemplate x:DataType="models:BrushShape">
@@ -45,7 +45,7 @@
                       Margin="1">
                 <Border.GestureRecognizers>
                   <TapGestureRecognizer Command="{Binding Source={x:Reference Root}, Path=ViewModel.SelectBrushShapeCommand, x:DataType=components:BrushesFlyoutPanel}"
-                                        CommandParameter="{Binding .}" />
+                                        CommandParameter="{Binding .}"/>
                 </Border.GestureRecognizers>
                 <components:BrushPreviewControl BrushShape="{Binding .}"
                                                 StrokeColor="{Binding Source={x:Reference Root}, Path=ViewModel.StrokeColor, x:DataType=components:BrushesFlyoutPanel}"
@@ -55,12 +55,12 @@
                                                 GlowRadius="{Binding Source={x:Reference Root}, Path=ViewModel.GlowRadius, x:DataType=components:BrushesFlyoutPanel}"
                                                 Color="{AppThemeBinding Light=Black, Dark=White}"
                                                 HorizontalOptions="Fill"
-                                                VerticalOptions="Fill" />
+                                                VerticalOptions="Fill"/>
               </Border>
               <Label Text="{Binding Name}"
                      FontSize="12"
                      HorizontalTextAlignment="Center"
-                     LineBreakMode="TailTruncation" />
+                     LineBreakMode="TailTruncation"/>
             </StackLayout>
           </DataTemplate>
         </CollectionView.ItemTemplate>
diff --git a/Components/BrushesFlyoutPanel.xaml.cs b/Components/BrushesFlyoutPanel.xaml.cs
index b520b08..7a9e5c6 100644
--- a/Components/BrushesFlyoutPanel.xaml.cs
+++ b/Components/BrushesFlyoutPanel.xaml.cs
@@ -39,7 +39,7 @@ private void OnBrushesFlyoutPanelLoaded(object? sender, EventArgs e)
   {
     if (BindingContext is ToolbarViewModel toolbarViewModel)
     {
-        // No settings to load here anymore, just brush shapes which are data bound
+      // No settings to load here anymore, just brush shapes which are data bound
     }
   }
 }
diff --git a/Components/LayerControlView.xaml b/Components/LayerControlView.xaml
index 0661c49..aaf1a7c 100644
--- a/Components/LayerControlView.xaml
+++ b/Components/LayerControlView.xaml
@@ -153,12 +153,12 @@
                     BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"
                     TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
                     HorizontalOptions="Center"/>
-             <Label Text="{x:Static strings:AppResources.ToolTip_AddLayer}"
-                    FontSize="12"
-                    HorizontalTextAlignment="Center"
-                    IsVisible="{Binding ShowButtonLabels}"/>
+            <Label Text="{x:Static strings:AppResources.ToolTip_AddLayer}"
+                   FontSize="12"
+                   HorizontalTextAlignment="Center"
+                   IsVisible="{Binding ShowButtonLabels}"/>
           </VerticalStackLayout>
-          
+
           <VerticalStackLayout HorizontalOptions="End">
             <Button Text="🗑️"
                     Command="{Binding LayerPanelVM.RemoveLayerCommand}"
@@ -184,8 +184,9 @@
                    HorizontalTextAlignment="Center"
                    IsVisible="{Binding ShowButtonLabels}"/>
           </VerticalStackLayout>
-          
-          <VerticalStackLayout HorizontalOptions="End" Margin="20,0,0,0">
+
+          <VerticalStackLayout HorizontalOptions="End"
+              Margin="20,0,0,0">
             <Button Text="⧉"
                     Command="{Binding LayerPanelVM.ToggleTraceModeCommand}"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_ToggleTraceMode}"
diff --git a/Components/LayerControlView.xaml.cs b/Components/LayerControlView.xaml.cs
index 77ad4b3..79664b6 100644
--- a/Components/LayerControlView.xaml.cs
+++ b/Components/LayerControlView.xaml.cs
@@ -26,67 +26,67 @@
 
 namespace LunaDraw.Components;
 
-  public partial class LayerControlView : ContentView
-  {
-      public MainViewModel? ViewModel => BindingContext as MainViewModel;
+public partial class LayerControlView : ContentView
+{
+  public MainViewModel? ViewModel => BindingContext as MainViewModel;
 
-      public static readonly BindableProperty IsLayerPanelExpandedProperty =
-          BindableProperty.Create(nameof(IsLayerPanelExpanded), typeof(bool), typeof(LayerControlView), false, propertyChanged: OnIsLayerPanelExpandedChanged);
+  public static readonly BindableProperty IsLayerPanelExpandedProperty =
+      BindableProperty.Create(nameof(IsLayerPanelExpanded), typeof(bool), typeof(LayerControlView), false, propertyChanged: OnIsLayerPanelExpandedChanged);
 
-      public bool IsLayerPanelExpanded
-      {
-          get => (bool)GetValue(IsLayerPanelExpandedProperty);
-          set => SetValue(IsLayerPanelExpandedProperty, value);
-      }
+  public bool IsLayerPanelExpanded
+  {
+    get => (bool)GetValue(IsLayerPanelExpandedProperty);
+    set => SetValue(IsLayerPanelExpandedProperty, value);
+  }
 
-      public List<MaskingMode> MaskingModes { get; } = Enum.GetValues<MaskingMode>().Cast<MaskingMode>().ToList();
+  public List<MaskingMode> MaskingModes { get; } = Enum.GetValues<MaskingMode>().Cast<MaskingMode>().ToList();
 
-      public LayerControlView()
-      {
-          InitializeComponent();
-      }
+  public LayerControlView()
+  {
+    InitializeComponent();
+  }
 
-      private static void OnIsLayerPanelExpandedChanged(BindableObject bindable, object oldValue, object newValue)
-      {
-          var control = (LayerControlView)bindable;
-          control.ContentGrid.IsVisible = (bool)newValue;
-          control.CollapseButton.Text = (bool)newValue ? "▼" : "▶";
-      }
+  private static void OnIsLayerPanelExpandedChanged(BindableObject bindable, object oldValue, object newValue)
+  {
+    var control = (LayerControlView)bindable;
+    control.ContentGrid.IsVisible = (bool)newValue;
+    control.CollapseButton.Text = (bool)newValue ? "▼" : "▶";
+  }
 
-      private void OnCollapseClicked(object sender, EventArgs e)
-      {
-          IsLayerPanelExpanded = !IsLayerPanelExpanded;
-      }
+  private void OnCollapseClicked(object sender, EventArgs e)
+  {
+    IsLayerPanelExpanded = !IsLayerPanelExpanded;
+  }
 
-      private void OnDragStarting(object sender, DragStartingEventArgs e)
+  private void OnDragStarting(object sender, DragStartingEventArgs e)
+  {
+    if (sender is Element element && element.BindingContext is Layer layer)
+    {
+      e.Data.Properties["SourceLayer"] = layer;
+      // Ensure the dragged layer is selected
+      if (this.BindingContext is MainViewModel viewModel)
       {
-          if (sender is Element element && element.BindingContext is Layer layer)
-          {
-              e.Data.Properties["SourceLayer"] = layer;
-              // Ensure the dragged layer is selected
-              if (this.BindingContext is MainViewModel viewModel)
-              {
-                  viewModel.CurrentLayer = layer;
-              }
-          }
+        viewModel.CurrentLayer = layer;
       }
+    }
+  }
 
-      private void OnDragOver(object sender, DragEventArgs e)
-      {
-          e.AcceptedOperation = DataPackageOperation.Copy;
-      }
+  private void OnDragOver(object sender, DragEventArgs e)
+  {
+    e.AcceptedOperation = DataPackageOperation.Copy;
+  }
 
-      private void OnDrop(object sender, DropEventArgs e)
+  private void OnDrop(object sender, DropEventArgs e)
+  {
+    if (e.Data.Properties.TryGetValue("SourceLayer", out var sourceObj) && sourceObj is Layer sourceLayer)
+    {
+      if (sender is Element element && element.BindingContext is Layer targetLayer)
       {
-          if (e.Data.Properties.TryGetValue("SourceLayer", out var sourceObj) && sourceObj is Layer sourceLayer)
-          {
-              if (sender is Element element && element.BindingContext is Layer targetLayer)
-              {
-                  if (this.BindingContext is MainViewModel viewModel)
-                  {
-                       viewModel.ReorderLayer(sourceLayer, targetLayer);
-                  }
-              }
-          }
+        if (this.BindingContext is MainViewModel viewModel)
+        {
+          viewModel.ReorderLayer(sourceLayer, targetLayer);
+        }
       }
+    }
   }
+}
diff --git a/Components/MiniMapView.xaml b/Components/MiniMapView.xaml
index e17521c..825e120 100644
--- a/Components/MiniMapView.xaml
+++ b/Components/MiniMapView.xaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:skiasharp="clr-namespace:SkiaSharp.Views.Maui.Controls;assembly=SkiaSharp.Views.Maui.Controls"
              x:Class="LunaDraw.Components.MiniMapView">
-    <Grid BackgroundColor="White"
-          Opacity="0.9">
-        <skiasharp:SKCanvasView x:Name="miniMapCanvas"
-                                PaintSurface="OnPaintSurface"
-                                EnableTouchEvents="True"
-                                Touch="OnTouch" />
-    </Grid>
+  <Grid BackgroundColor="White"
+        Opacity="0.9">
+    <skiasharp:SKCanvasView x:Name="miniMapCanvas"
+                            PaintSurface="OnPaintSurface"
+                            EnableTouchEvents="True"
+                            Touch="OnTouch"/>
+  </Grid>
 </ContentView>
diff --git a/Components/SettingsFlyoutPanel.xaml b/Components/SettingsFlyoutPanel.xaml
index 29fd1f6..87f9a44 100644
--- a/Components/SettingsFlyoutPanel.xaml
+++ b/Components/SettingsFlyoutPanel.xaml
@@ -3,227 +3,227 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:controls="clr-namespace:Maui.ColorPicker;assembly=Maui.ColorPicker"
              x:Class="LunaDraw.Components.SettingsFlyoutPanel">
-       <Border Background="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray800}}"
-               Padding="15"
-               StrokeShape="RoundRectangle"
-               Stroke="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
-               StrokeThickness="1"
-               MaximumHeightRequest="600">
-              <ScrollView VerticalScrollBarVisibility="Default">
-                     <StackLayout Spacing="12">
-                            <Label Text="Brush Settings"
-                                   FontAttributes="Bold"
-                                   HorizontalTextAlignment="Center"/>
-
-                            <BoxView HeightRequest="1"
-                                     Color="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
-                                     Margin="0,5"/>
-
-                            <Label Text="Brush Color"
-                                   FontAttributes="Bold"/>
-                            <controls:ColorPicker x:Name="StrokeColorPicker"
-                                                  ColorFlowDirection="Horizontal"
-                                                  ColorSpectrumStyle="ShadeToHueStyle"
-                                                  PointerRingBorderUnits="0.3"
-                                                  PointerRingDiameterUnits="0.7"
-                                                  HeightRequest="80"
-                                                  WidthRequest="250"
-                                                  PickedColorChanged="OnStrokeColorChanged"/>
-
-                            <StackLayout Orientation="Horizontal">
-                                   <Label Text="Fill Color"
-                                          FontAttributes="Bold"
-                                          VerticalOptions="Center"/>
-                                   <Button Text="No Fill"
-                                           HorizontalOptions="EndAndExpand"
-                                           Padding="10,0"
-                                           HeightRequest="30"
-                                           Clicked="OnNoFillClicked"/>
-                            </StackLayout>
-                            <controls:ColorPicker x:Name="FillColorPicker"
-                                                  ColorFlowDirection="Horizontal"
-                                                  ColorSpectrumStyle="ShadeToHueStyle"
-                                                  PointerRingBorderUnits="0.3"
-                                                  PointerRingDiameterUnits="0.7"
-                                                  HeightRequest="80"
-                                                  WidthRequest="250"
-                                                  PickedColorChanged="OnFillColorChanged"/>
-
-                            <Label Text="Size"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="SizeSlider"
-                                    Minimum="1"
-                                    Maximum="100"
-                                    HeightRequest="30"
-                                    ValueChanged="OnSizeChanged"/>
-
-                            <Label Text="Transparency"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="TransparencySlider"
-                                    Minimum="0"
-                                    Maximum="255"
-                                    HeightRequest="30"
-                                    ValueChanged="OnTransparencyChanged"/>
-
-                            <Label Text="Flow"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="FlowSlider"
-                                    Minimum="0"
-                                    Maximum="255"
-                                    HeightRequest="30"
-                                    ValueChanged="OnFlowChanged"/>
-
-                            <Label Text="Spacing"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="SpacingSlider"
-                                    Minimum="0.1"
-                                    Maximum="2.0"
-                                    HeightRequest="30"
-                                    ValueChanged="OnSpacingChanged"/>
-
-                            <BoxView HeightRequest="1"
-                                     Color="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
-                                     Margin="0,5"/>
-
-                            <Label Text="Scatter"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="ScatterSlider"
-                                    Minimum="0"
-                                    Maximum="50"
-                                    ValueChanged="OnScatterChanged"/>
-
-                            <Label Text="Size Jitter"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="SizeJitterSlider"
-                                    Minimum="0"
-                                    Maximum="1"
-                                    ValueChanged="OnSizeJitterChanged"/>
-
-                            <Label Text="Angle Jitter"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="AngleJitterSlider"
-                                    Minimum="0"
-                                    Maximum="0.5"
-                                    ValueChanged="OnAngleJitterChanged"/>
-
-                            <Label Text="Hue Jitter"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="HueJitterSlider"
-                                    Minimum="0"
-                                    Maximum="1"
-                                    ValueChanged="OnHueJitterChanged"/>
-
-                            <Label Text="Magical Effects"
-                                   FontAttributes="Bold"
-                                   FontSize="16"
-                                   HorizontalTextAlignment="Center"/>
-
-                            <StackLayout Orientation="Horizontal"
-                                         Spacing="10">
-                                   <Label Text="Rainbow Mode"
-                                          VerticalOptions="Center"
-                                          FontAttributes="Bold"/>
-                                   <Switch x:Name="RainbowSwitch"
-                                           Toggled="OnRainbowSwitchToggled"
-                                           HorizontalOptions="EndAndExpand"/>
-                            </StackLayout>
-
-                            <StackLayout Orientation="Horizontal"
-                                         Spacing="10">
-                                   <Label Text="Glow Effect"
-                                          VerticalOptions="Center"
-                                          FontAttributes="Bold"/>
-                                   <Switch x:Name="GlowSwitch"
-                                           Toggled="OnGlowSwitchToggled"
-                                           HorizontalOptions="EndAndExpand"/>
-                            </StackLayout>
-
-                            <Label Text="Glow Radius"
-                                   FontAttributes="Bold"/>
-                            <Slider x:Name="GlowRadiusSlider"
-                                    Minimum="1"
-                                    Maximum="50"
-                                    ValueChanged="OnGlowRadiusChanged"/>
-
-                            <Label Text="Glow Color"
-                                   FontAttributes="Bold"/>
-                            <StackLayout x:Name="GlowColorContainer"
-                                         Orientation="Horizontal"
-                                         Spacing="10"
-                                         HorizontalOptions="Center">
-                                   <!-- Preset Colors -->
-                                   <Border Stroke="Gray"
-                                           StrokeShape="RoundRectangle 15"
-                                           StrokeThickness="1"
-                                           HeightRequest="30"
-                                           WidthRequest="30">
-                                          <BoxView Color="#FFFF00"
-                                                   HorizontalOptions="Fill"
-                                                   VerticalOptions="Fill">
-                                                 <BoxView.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="OnGlowColorTapped"
-                                                                              CommandParameter="#FFFF00"/>
-                                                 </BoxView.GestureRecognizers>
-                                          </BoxView>
-                                   </Border>
-                                   <Border Stroke="Gray"
-                                           StrokeShape="RoundRectangle 15"
-                                           StrokeThickness="1"
-                                           HeightRequest="30"
-                                           WidthRequest="30">
-                                          <BoxView Color="#00FFFF"
-                                                   HorizontalOptions="Fill"
-                                                   VerticalOptions="Fill">
-                                                 <BoxView.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="OnGlowColorTapped"
-                                                                              CommandParameter="#00FFFF"/>
-                                                 </BoxView.GestureRecognizers>
-                                          </BoxView>
-                                   </Border>
-                                   <Border Stroke="Gray"
-                                           StrokeShape="RoundRectangle 15"
-                                           StrokeThickness="1"
-                                           HeightRequest="30"
-                                           WidthRequest="30">
-                                          <BoxView Color="#FF00FF"
-                                                   HorizontalOptions="Fill"
-                                                   VerticalOptions="Fill">
-                                                 <BoxView.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="OnGlowColorTapped"
-                                                                              CommandParameter="#FF00FF"/>
-                                                 </BoxView.GestureRecognizers>
-                                          </BoxView>
-                                   </Border>
-                                   <Border Stroke="Gray"
-                                           StrokeShape="RoundRectangle 15"
-                                           StrokeThickness="1"
-                                           HeightRequest="30"
-                                           WidthRequest="30">
-                                          <BoxView Color="#00FF00"
-                                                   HorizontalOptions="Fill"
-                                                   VerticalOptions="Fill">
-                                                 <BoxView.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="OnGlowColorTapped"
-                                                                              CommandParameter="#00FF00"/>
-                                                 </BoxView.GestureRecognizers>
-                                          </BoxView>
-                                   </Border>
-                                   <Border Stroke="Gray"
-                                           StrokeShape="RoundRectangle 15"
-                                           StrokeThickness="1"
-                                           HeightRequest="30"
-                                           WidthRequest="30">
-                                          <BoxView Color="#FFFFFF"
-                                                   HorizontalOptions="Fill"
-                                                   VerticalOptions="Fill">
-                                                 <BoxView.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="OnGlowColorTapped"
-                                                                              CommandParameter="#FFFFFF"/>
-                                                 </BoxView.GestureRecognizers>
-                                          </BoxView>
-                                   </Border>
-                            </StackLayout>
-                     </StackLayout>
-              </ScrollView>
-       </Border>
+  <Border Background="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray800}}"
+          Padding="15"
+          StrokeShape="RoundRectangle"
+          Stroke="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
+          StrokeThickness="1"
+          MaximumHeightRequest="600">
+    <ScrollView VerticalScrollBarVisibility="Default">
+      <StackLayout Spacing="12">
+        <Label Text="Brush Settings"
+               FontAttributes="Bold"
+               HorizontalTextAlignment="Center"/>
+
+        <BoxView HeightRequest="1"
+                 Color="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
+                 Margin="0,5"/>
+
+        <Label Text="Brush Color"
+               FontAttributes="Bold"/>
+        <controls:ColorPicker x:Name="StrokeColorPicker"
+                              ColorFlowDirection="Horizontal"
+                              ColorSpectrumStyle="ShadeToHueStyle"
+                              PointerRingBorderUnits="0.3"
+                              PointerRingDiameterUnits="0.7"
+                              HeightRequest="80"
+                              WidthRequest="250"
+                              PickedColorChanged="OnStrokeColorChanged"/>
+
+        <StackLayout Orientation="Horizontal">
+          <Label Text="Fill Color"
+                 FontAttributes="Bold"
+                 VerticalOptions="Center"/>
+          <Button Text="No Fill"
+                  HorizontalOptions="EndAndExpand"
+                  Padding="10,0"
+                  HeightRequest="30"
+                  Clicked="OnNoFillClicked"/>
+        </StackLayout>
+        <controls:ColorPicker x:Name="FillColorPicker"
+                              ColorFlowDirection="Horizontal"
+                              ColorSpectrumStyle="ShadeToHueStyle"
+                              PointerRingBorderUnits="0.3"
+                              PointerRingDiameterUnits="0.7"
+                              HeightRequest="80"
+                              WidthRequest="250"
+                              PickedColorChanged="OnFillColorChanged"/>
+
+        <Label Text="Size"
+               FontAttributes="Bold"/>
+        <Slider x:Name="SizeSlider"
+                Minimum="1"
+                Maximum="100"
+                HeightRequest="30"
+                ValueChanged="OnSizeChanged"/>
+
+        <Label Text="Transparency"
+               FontAttributes="Bold"/>
+        <Slider x:Name="TransparencySlider"
+                Minimum="0"
+                Maximum="255"
+                HeightRequest="30"
+                ValueChanged="OnTransparencyChanged"/>
+
+        <Label Text="Flow"
+               FontAttributes="Bold"/>
+        <Slider x:Name="FlowSlider"
+                Minimum="0"
+                Maximum="255"
+                HeightRequest="30"
+                ValueChanged="OnFlowChanged"/>
+
+        <Label Text="Spacing"
+               FontAttributes="Bold"/>
+        <Slider x:Name="SpacingSlider"
+                Minimum="0.1"
+                Maximum="2.0"
+                HeightRequest="30"
+                ValueChanged="OnSpacingChanged"/>
+
+        <BoxView HeightRequest="1"
+                 Color="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"
+                 Margin="0,5"/>
+
+        <Label Text="Scatter"
+               FontAttributes="Bold"/>
+        <Slider x:Name="ScatterSlider"
+                Minimum="0"
+                Maximum="50"
+                ValueChanged="OnScatterChanged"/>
+
+        <Label Text="Size Jitter"
+               FontAttributes="Bold"/>
+        <Slider x:Name="SizeJitterSlider"
+                Minimum="0"
+                Maximum="1"
+                ValueChanged="OnSizeJitterChanged"/>
+
+        <Label Text="Angle Jitter"
+               FontAttributes="Bold"/>
+        <Slider x:Name="AngleJitterSlider"
+                Minimum="0"
+                Maximum="0.5"
+                ValueChanged="OnAngleJitterChanged"/>
+
+        <Label Text="Hue Jitter"
+               FontAttributes="Bold"/>
+        <Slider x:Name="HueJitterSlider"
+                Minimum="0"
+                Maximum="1"
+                ValueChanged="OnHueJitterChanged"/>
+
+        <Label Text="Magical Effects"
+               FontAttributes="Bold"
+               FontSize="16"
+               HorizontalTextAlignment="Center"/>
+
+        <StackLayout Orientation="Horizontal"
+                     Spacing="10">
+          <Label Text="Rainbow Mode"
+                 VerticalOptions="Center"
+                 FontAttributes="Bold"/>
+          <Switch x:Name="RainbowSwitch"
+                  Toggled="OnRainbowSwitchToggled"
+                  HorizontalOptions="EndAndExpand"/>
+        </StackLayout>
+
+        <StackLayout Orientation="Horizontal"
+                     Spacing="10">
+          <Label Text="Glow Effect"
+                 VerticalOptions="Center"
+                 FontAttributes="Bold"/>
+          <Switch x:Name="GlowSwitch"
+                  Toggled="OnGlowSwitchToggled"
+                  HorizontalOptions="EndAndExpand"/>
+        </StackLayout>
+
+        <Label Text="Glow Radius"
+               FontAttributes="Bold"/>
+        <Slider x:Name="GlowRadiusSlider"
+                Minimum="1"
+                Maximum="50"
+                ValueChanged="OnGlowRadiusChanged"/>
+
+        <Label Text="Glow Color"
+               FontAttributes="Bold"/>
+        <StackLayout x:Name="GlowColorContainer"
+                     Orientation="Horizontal"
+                     Spacing="10"
+                     HorizontalOptions="Center">
+          <!-- Preset Colors -->
+          <Border Stroke="Gray"
+                  StrokeShape="RoundRectangle 15"
+                  StrokeThickness="1"
+                  HeightRequest="30"
+                  WidthRequest="30">
+            <BoxView Color="#FFFF00"
+                     HorizontalOptions="Fill"
+                     VerticalOptions="Fill">
+              <BoxView.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnGlowColorTapped"
+                                      CommandParameter="#FFFF00"/>
+              </BoxView.GestureRecognizers>
+            </BoxView>
+          </Border>
+          <Border Stroke="Gray"
+                  StrokeShape="RoundRectangle 15"
+                  StrokeThickness="1"
+                  HeightRequest="30"
+                  WidthRequest="30">
+            <BoxView Color="#00FFFF"
+                     HorizontalOptions="Fill"
+                     VerticalOptions="Fill">
+              <BoxView.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnGlowColorTapped"
+                                      CommandParameter="#00FFFF"/>
+              </BoxView.GestureRecognizers>
+            </BoxView>
+          </Border>
+          <Border Stroke="Gray"
+                  StrokeShape="RoundRectangle 15"
+                  StrokeThickness="1"
+                  HeightRequest="30"
+                  WidthRequest="30">
+            <BoxView Color="#FF00FF"
+                     HorizontalOptions="Fill"
+                     VerticalOptions="Fill">
+              <BoxView.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnGlowColorTapped"
+                                      CommandParameter="#FF00FF"/>
+              </BoxView.GestureRecognizers>
+            </BoxView>
+          </Border>
+          <Border Stroke="Gray"
+                  StrokeShape="RoundRectangle 15"
+                  StrokeThickness="1"
+                  HeightRequest="30"
+                  WidthRequest="30">
+            <BoxView Color="#00FF00"
+                     HorizontalOptions="Fill"
+                     VerticalOptions="Fill">
+              <BoxView.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnGlowColorTapped"
+                                      CommandParameter="#00FF00"/>
+              </BoxView.GestureRecognizers>
+            </BoxView>
+          </Border>
+          <Border Stroke="Gray"
+                  StrokeShape="RoundRectangle 15"
+                  StrokeThickness="1"
+                  HeightRequest="30"
+                  WidthRequest="30">
+            <BoxView Color="#FFFFFF"
+                     HorizontalOptions="Fill"
+                     VerticalOptions="Fill">
+              <BoxView.GestureRecognizers>
+                <TapGestureRecognizer Tapped="OnGlowColorTapped"
+                                      CommandParameter="#FFFFFF"/>
+              </BoxView.GestureRecognizers>
+            </BoxView>
+          </Border>
+        </StackLayout>
+      </StackLayout>
+    </ScrollView>
+  </Border>
 </ContentView>
diff --git a/Components/SettingsFlyoutPanel.xaml.cs b/Components/SettingsFlyoutPanel.xaml.cs
index a8fc38b..109700b 100644
--- a/Components/SettingsFlyoutPanel.xaml.cs
+++ b/Components/SettingsFlyoutPanel.xaml.cs
@@ -85,13 +85,13 @@ public partial class SettingsFlyoutPanel : ContentView
   private IMessageBus? messageBus;
   private IMessageBus? MessageBus
   {
-      get
-      {
-          if (messageBus != null) return messageBus;
-          messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
-                       ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
-          return messageBus;
-      }
+    get
+    {
+      if (messageBus != null) return messageBus;
+      messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
+                   ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
+      return messageBus;
+    }
   }
 
   public SettingsFlyoutPanel()
@@ -163,99 +163,99 @@ public float Spacing
 
   private static void OnStrokeColorPropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is SKColor color)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is SKColor color)
-          {
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeColor: color));
-              if (panel.StrokeColorPicker != null)
-                  panel.StrokeColorPicker.PickedColor = SKColorToMauiColor(color);
-          }
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeColor: color));
+        if (panel.StrokeColorPicker != null)
+          panel.StrokeColorPicker.PickedColor = SKColorToMauiColor(color);
       }
-      catch { }
+    }
+    catch { }
   }
 
   private static void OnFillColorPropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel toolbarViewModel)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel toolbarViewModel)
-          {
-              var fill = newValue as SKColor?;
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(fillColor: fill));
-              if (newValue is SKColor fillColor && panel.FillColorPicker != null)
-                  panel.FillColorPicker.PickedColor = SKColorToMauiColor(fillColor);
-          }
+        var fill = newValue as SKColor?;
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(fillColor: fill));
+        if (newValue is SKColor fillColor && panel.FillColorPicker != null)
+          panel.FillColorPicker.PickedColor = SKColorToMauiColor(fillColor);
       }
-      catch { }
+    }
+    catch { }
   }
 
   private static void OnTransparencyPropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is byte transparency)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is byte transparency)
-          {
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
-              if (panel.TransparencySlider != null)
-                  panel.TransparencySlider.Value = transparency;
-          }
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
+        if (panel.TransparencySlider != null)
+          panel.TransparencySlider.Value = transparency;
       }
-      catch { }
+    }
+    catch { }
   }
 
   private static void OnSizePropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel && newValue is float size)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel && newValue is float size)
-          {
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
-              if (panel.SizeSlider != null)
-                  panel.SizeSlider.Value = size;
-          }
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
+        if (panel.SizeSlider != null)
+          panel.SizeSlider.Value = size;
       }
-      catch { }
+    }
+    catch { }
   }
 
   private static void OnFlowPropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel && newValue is byte flow)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel && newValue is byte flow)
-          {
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(flow: flow));
-              if (panel.FlowSlider != null)
-                  panel.FlowSlider.Value = flow;
-          }
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(flow: flow));
+        if (panel.FlowSlider != null)
+          panel.FlowSlider.Value = flow;
       }
-      catch { }
+    }
+    catch { }
   }
 
   private static void OnSpacingPropertyChanged(BindableObject bindable, object oldValue, object newValue)
   {
-      try
+    try
+    {
+      var panel = (SettingsFlyoutPanel)bindable;
+      if (panel.BindingContext is ToolbarViewModel && newValue is float spacing)
       {
-          var panel = (SettingsFlyoutPanel)bindable;
-          if (panel.BindingContext is ToolbarViewModel && newValue is float spacing)
-          {
-              if (panel.MessageBus != null)
-                  panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
-              if (panel.SpacingSlider != null)
-                  panel.SpacingSlider.Value = spacing;
-          }
+        if (panel.MessageBus != null)
+          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
+        if (panel.SpacingSlider != null)
+          panel.SpacingSlider.Value = spacing;
       }
-      catch { }
+    }
+    catch { }
   }
 
   private void OnStrokeColorChanged(object sender, EventArgs e)
@@ -353,26 +353,26 @@ private void OnGlowColorTapped(object sender, TappedEventArgs e)
 
   private void OnRainbowSwitchToggled(object sender, ToggledEventArgs e)
   {
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(isRainbowEnabled: e.Value));
+    MessageBus?.SendMessage(new BrushSettingsChangedMessage(isRainbowEnabled: e.Value));
   }
 
   private void OnScatterChanged(object sender, ValueChangedEventArgs e)
   {
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(scatterRadius: (float)e.NewValue));
+    MessageBus?.SendMessage(new BrushSettingsChangedMessage(scatterRadius: (float)e.NewValue));
   }
 
   private void OnSizeJitterChanged(object sender, ValueChangedEventArgs e)
   {
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(sizeJitter: (float)e.NewValue));
+    MessageBus?.SendMessage(new BrushSettingsChangedMessage(sizeJitter: (float)e.NewValue));
   }
 
   private void OnAngleJitterChanged(object sender, ValueChangedEventArgs e)
   {
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(angleJitter: (float)e.NewValue));
+    MessageBus?.SendMessage(new BrushSettingsChangedMessage(angleJitter: (float)e.NewValue));
   }
 
   private void OnHueJitterChanged(object sender, ValueChangedEventArgs e)
   {
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(hueJitter: (float)e.NewValue));
+    MessageBus?.SendMessage(new BrushSettingsChangedMessage(hueJitter: (float)e.NewValue));
   }
 }
diff --git a/Components/ShapesFlyoutPanel.xaml b/Components/ShapesFlyoutPanel.xaml
index eabfa84..8dc494a 100644
--- a/Components/ShapesFlyoutPanel.xaml
+++ b/Components/ShapesFlyoutPanel.xaml
@@ -30,15 +30,15 @@
                   Stroke="Gray"
                   StrokeThickness="1"
                   Padding="8">
-              <Border.GestureRecognizers>
-                  <TapGestureRecognizer Command="{Binding SelectRectangleCommand}"/>
-              </Border.GestureRecognizers>
-              <components:ShapePreviewControl ShapeName="Rectangle"
-                                              StrokeColor="{Binding StrokeColor}"
-                                              FillColor="{Binding FillColor}"
-                                              StrokeWidth="{Binding StrokeWidth}"
-                                              HorizontalOptions="Fill"
-                                              VerticalOptions="Fill"/>
+            <Border.GestureRecognizers>
+              <TapGestureRecognizer Command="{Binding SelectRectangleCommand}"/>
+            </Border.GestureRecognizers>
+            <components:ShapePreviewControl ShapeName="Rectangle"
+                                            StrokeColor="{Binding StrokeColor}"
+                                            FillColor="{Binding FillColor}"
+                                            StrokeWidth="{Binding StrokeWidth}"
+                                            HorizontalOptions="Fill"
+                                            VerticalOptions="Fill"/>
           </Border>
           <Label Text="Rectangle"
                  FontSize="12"
@@ -53,15 +53,15 @@
                   Stroke="Gray"
                   StrokeThickness="1"
                   Padding="8">
-              <Border.GestureRecognizers>
-                  <TapGestureRecognizer Command="{Binding SelectCircleCommand}"/>
-              </Border.GestureRecognizers>
-              <components:ShapePreviewControl ShapeName="Circle"
-                                              StrokeColor="{Binding StrokeColor}"
-                                              FillColor="{Binding FillColor}"
-                                              StrokeWidth="{Binding StrokeWidth}"
-                                              HorizontalOptions="Fill"
-                                              VerticalOptions="Fill"/>
+            <Border.GestureRecognizers>
+              <TapGestureRecognizer Command="{Binding SelectCircleCommand}"/>
+            </Border.GestureRecognizers>
+            <components:ShapePreviewControl ShapeName="Circle"
+                                            StrokeColor="{Binding StrokeColor}"
+                                            FillColor="{Binding FillColor}"
+                                            StrokeWidth="{Binding StrokeWidth}"
+                                            HorizontalOptions="Fill"
+                                            VerticalOptions="Fill"/>
           </Border>
           <Label Text="Circle"
                  FontSize="12"
@@ -76,15 +76,15 @@
                   Stroke="Gray"
                   StrokeThickness="1"
                   Padding="8">
-              <Border.GestureRecognizers>
-                  <TapGestureRecognizer Command="{Binding SelectLineCommand}"/>
-              </Border.GestureRecognizers>
-              <components:ShapePreviewControl ShapeName="Line"
-                                              StrokeColor="{Binding StrokeColor}"
-                                              FillColor="{Binding FillColor}"
-                                              StrokeWidth="{Binding StrokeWidth}"
-                                              HorizontalOptions="Fill"
-                                              VerticalOptions="Fill"/>
+            <Border.GestureRecognizers>
+              <TapGestureRecognizer Command="{Binding SelectLineCommand}"/>
+            </Border.GestureRecognizers>
+            <components:ShapePreviewControl ShapeName="Line"
+                                            StrokeColor="{Binding StrokeColor}"
+                                            FillColor="{Binding FillColor}"
+                                            StrokeWidth="{Binding StrokeWidth}"
+                                            HorizontalOptions="Fill"
+                                            VerticalOptions="Fill"/>
           </Border>
           <Label Text="Line"
                  FontSize="12"
diff --git a/Components/ShapesFlyoutPanel.xaml.cs b/Components/ShapesFlyoutPanel.xaml.cs
index 8fa92cf..28d6278 100644
--- a/Components/ShapesFlyoutPanel.xaml.cs
+++ b/Components/ShapesFlyoutPanel.xaml.cs
@@ -23,10 +23,10 @@
 
 namespace LunaDraw.Components;
 
-  public partial class ShapesFlyoutPanel : ContentView
+public partial class ShapesFlyoutPanel : ContentView
+{
+  public ShapesFlyoutPanel()
   {
-      public ShapesFlyoutPanel()
-      {
-          InitializeComponent();
-      }
+    InitializeComponent();
   }
+}
diff --git a/Components/ToolbarView.xaml b/Components/ToolbarView.xaml
index 08cba44..e8ed826 100644
--- a/Components/ToolbarView.xaml
+++ b/Components/ToolbarView.xaml
@@ -38,9 +38,12 @@
         <Setter Property="TextColor"
                 Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
         <Style.Triggers>
-             <Trigger TargetType="Button" Property="IsEnabled" Value="False">
-                 <Setter Property="Opacity" Value="0.3" />
-             </Trigger>
+          <Trigger TargetType="Button"
+              Property="IsEnabled"
+              Value="False">
+            <Setter Property="Opacity"
+                Value="0.3"/>
+          </Trigger>
         </Style.Triggers>
       </Style>
     </ResourceDictionary>
@@ -85,7 +88,7 @@
                    HorizontalTextAlignment="Center"
                    IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
-           <StackLayout HorizontalOptions="Center">
+          <StackLayout HorizontalOptions="Center">
             <Border x:Name="BrushButton"
                     WidthRequest="72"
                     HeightRequest="72"
@@ -94,13 +97,13 @@
                     StrokeShape="RoundRectangle 12"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_BrushSettings}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='FreehandTool'}">
-                <Border.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ShowBrushesFlyoutCommand}"/>
-                </Border.GestureRecognizers>
-                <local:BrushPreviewControl BrushShape="{Binding CurrentBrushShape}"
-                                           StrokeColor="{Binding StrokeColor}"
-                                           HorizontalOptions="Fill"
-                                           VerticalOptions="Fill"/>
+              <Border.GestureRecognizers>
+                <TapGestureRecognizer Command="{Binding ShowBrushesFlyoutCommand}"/>
+              </Border.GestureRecognizers>
+              <local:BrushPreviewControl BrushShape="{Binding CurrentBrushShape}"
+                                         StrokeColor="{Binding StrokeColor}"
+                                         HorizontalOptions="Fill"
+                                         VerticalOptions="Fill"/>
             </Border>
             <Label Text="{Binding AvailableTools[1].Name}"
                    HorizontalTextAlignment="Center"
@@ -115,15 +118,15 @@
                     StrokeShape="RoundRectangle 12"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Shapes}"
                     BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='Shapes'}">
-                <Border.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ShowShapesFlyoutCommand}"/>
-                </Border.GestureRecognizers>
-                <local:ShapePreviewControl ActiveTool="{Binding LastActiveShapeTool}"
-                                           StrokeColor="{Binding StrokeColor}"
-                                           FillColor="{Binding FillColor}"
-                                           StrokeWidth="{Binding StrokeWidth}"
-                                           HorizontalOptions="Fill"
-                                           VerticalOptions="Fill"/>
+              <Border.GestureRecognizers>
+                <TapGestureRecognizer Command="{Binding ShowShapesFlyoutCommand}"/>
+              </Border.GestureRecognizers>
+              <local:ShapePreviewControl ActiveTool="{Binding LastActiveShapeTool}"
+                                         StrokeColor="{Binding StrokeColor}"
+                                         FillColor="{Binding FillColor}"
+                                         StrokeWidth="{Binding StrokeWidth}"
+                                         HorizontalOptions="Fill"
+                                         VerticalOptions="Fill"/>
             </Border>
             <Label Text="{x:Static strings:AppResources.Label_Shapes}"
                    HorizontalTextAlignment="Center"
@@ -152,7 +155,7 @@
                    IsVisible="{Binding ShowButtonLabels}"/>
           </StackLayout>
 
-         <StackLayout HorizontalOptions="Center">
+          <StackLayout HorizontalOptions="Center">
             <Button x:Name="EraserButton"
                     Style="{StaticResource ToolbarButtonStyle}"
                     Text="🧽"
@@ -207,7 +210,7 @@
           <BoxView HeightRequest="2"
                    Color="Gray"
                    Margin="0,4"/>
-                   
+
           <StackLayout HorizontalOptions="Center">
             <Button x:Name="ViewOptionsButton"
                     Style="{StaticResource ToolbarButtonStyle}"
diff --git a/Converters/ActiveShapeIconConverter.cs b/Converters/ActiveShapeIconConverter.cs
index 188a52e..82f0d51 100644
--- a/Converters/ActiveShapeIconConverter.cs
+++ b/Converters/ActiveShapeIconConverter.cs
@@ -28,23 +28,23 @@ namespace LunaDraw.Converters;
 
 public class ActiveShapeIconConverter : IValueConverter
 {
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+  public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    if (value is IDrawingTool tool)
     {
-        if (value is IDrawingTool tool)
-        {
-            if (tool is RectangleTool) return "▭";
-            if (tool is EllipseTool) return "◯";
-            if (tool is LineTool) return "／";
-        }
-
-        // Default icon for the shapes button if no specific shape tool is active,
-        // or if the active tool is not a shape (though the text binding usually only matters when it IS a shape, 
-        // or if we want to revert to the default group icon)
-        return "🔷";
+      if (tool is RectangleTool) return "▭";
+      if (tool is EllipseTool) return "◯";
+      if (tool is LineTool) return "／";
     }
 
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+    // Default icon for the shapes button if no specific shape tool is active,
+    // or if the active tool is not a shape (though the text binding usually only matters when it IS a shape, 
+    // or if we want to revert to the default group icon)
+    return "🔷";
+  }
+
+  public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    throw new NotImplementedException();
+  }
 }
diff --git a/Converters/BoolToEyeIconConverter.cs b/Converters/BoolToEyeIconConverter.cs
index 3fcd45c..3c91d45 100644
--- a/Converters/BoolToEyeIconConverter.cs
+++ b/Converters/BoolToEyeIconConverter.cs
@@ -25,19 +25,19 @@
 
 namespace LunaDraw.Converters;
 
-  public class BoolToEyeIconConverter : IValueConverter
+public class BoolToEyeIconConverter : IValueConverter
+{
+  public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
   {
-      public object Convert(object ?value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          if (value is bool isVisible)
-          {
-              return isVisible ? "👁" : "○"; // Eye vs Empty Circle
-          }
-          return "○";
-      }
+    if (value is bool isVisible)
+    {
+      return isVisible ? "👁" : "○"; // Eye vs Empty Circle
+    }
+    return "○";
+  }
 
-      public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          return value is string str && str == "👁";
-      }
-  }
\ No newline at end of file
+  public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    return value is string str && str == "👁";
+  }
+}
\ No newline at end of file
diff --git a/Converters/BoolToLockIconConverter.cs b/Converters/BoolToLockIconConverter.cs
index 3d879e3..9e8da3e 100644
--- a/Converters/BoolToLockIconConverter.cs
+++ b/Converters/BoolToLockIconConverter.cs
@@ -25,19 +25,19 @@
 
 namespace LunaDraw.Converters;
 
-  public class BoolToLockIconConverter : IValueConverter
+public class BoolToLockIconConverter : IValueConverter
+{
+  public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
   {
-      public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          if (value is bool isLocked)
-          {
-              return isLocked ? "🔒" : "🔓";
-          }
-          return "🔓";
-      }
+    if (value is bool isLocked)
+    {
+      return isLocked ? "🔒" : "🔓";
+    }
+    return "🔓";
+  }
 
-      public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          throw new NotImplementedException();
-      }
-  }
\ No newline at end of file
+  public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    throw new NotImplementedException();
+  }
+}
\ No newline at end of file
diff --git a/Converters/ColorToHexConverter.cs b/Converters/ColorToHexConverter.cs
index 60b92b6..c30bc26 100644
--- a/Converters/ColorToHexConverter.cs
+++ b/Converters/ColorToHexConverter.cs
@@ -26,44 +26,44 @@
 
 namespace LunaDraw.Converters;
 
-  public class ColorToHexConverter : IValueConverter
+public class ColorToHexConverter : IValueConverter
+{
+  public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
   {
-      public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          if (value == null) return string.Empty;
-
-          if (value is SKColor color)
-          {
-              return $"#{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
-          }
+    if (value == null) return string.Empty;
 
-          return string.Empty;
-      }
+    if (value is SKColor color)
+    {
+      return $"#{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
+    }
 
-      public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-      {
-          if (value is string hexString && !string.IsNullOrWhiteSpace(hexString))
-          {
-              hexString = hexString.TrimStart('#');
+    return string.Empty;
+  }
 
-              if (hexString.Length == 6)
-              {
-                  try
-                  {
-                      byte r = System.Convert.ToByte(hexString.Substring(0, 2), 16);
-                      byte g = System.Convert.ToByte(hexString.Substring(2, 2), 16);
-                      byte b = System.Convert.ToByte(hexString.Substring(4, 2), 16);
-                      return new SKColor(r, g, b);
-                  }
-                  catch
-                  {
-                      // Return a safe default color on conversion failure
-                      return SKColors.Black;
-                  }
-              }
-          }
+  public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    if (value is string hexString && !string.IsNullOrWhiteSpace(hexString))
+    {
+      hexString = hexString.TrimStart('#');
 
-          // Return a safe default color if the input is invalid or empty
+      if (hexString.Length == 6)
+      {
+        try
+        {
+          byte r = System.Convert.ToByte(hexString.Substring(0, 2), 16);
+          byte g = System.Convert.ToByte(hexString.Substring(2, 2), 16);
+          byte b = System.Convert.ToByte(hexString.Substring(4, 2), 16);
+          return new SKColor(r, g, b);
+        }
+        catch
+        {
+          // Return a safe default color on conversion failure
           return SKColors.Black;
+        }
       }
+    }
+
+    // Return a safe default color if the input is invalid or empty
+    return SKColors.Black;
   }
+}
diff --git a/Converters/IsToolActiveConverter.cs b/Converters/IsToolActiveConverter.cs
index 28f9d22..9ecdf30 100644
--- a/Converters/IsToolActiveConverter.cs
+++ b/Converters/IsToolActiveConverter.cs
@@ -28,28 +28,28 @@ namespace LunaDraw.Converters;
 
 public class IsToolActiveConverter : IValueConverter
 {
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is not IDrawingTool activeTool)
-            return false;
-
-        if (parameter is string targetToolName)
-        {
-            // Handle special case for "Shapes" group
-            if (targetToolName == "Shapes")
-            {
-                return activeTool is RectangleTool or EllipseTool or LineTool;
-            }
+  public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    if (value is not IDrawingTool activeTool)
+      return false;
 
-            var activeTypeName = activeTool.GetType().Name;
-            return string.Equals(activeTypeName, targetToolName, StringComparison.Ordinal);
-        }
+    if (parameter is string targetToolName)
+    {
+      // Handle special case for "Shapes" group
+      if (targetToolName == "Shapes")
+      {
+        return activeTool is RectangleTool or EllipseTool or LineTool;
+      }
 
-        return false;
+      var activeTypeName = activeTool.GetType().Name;
+      return string.Equals(activeTypeName, targetToolName, StringComparison.Ordinal);
     }
 
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+    return false;
+  }
+
+  public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    throw new NotImplementedException();
+  }
 }
diff --git a/Converters/ToolToColorConverter.cs b/Converters/ToolToColorConverter.cs
index cd37e70..4ad68fc 100644
--- a/Converters/ToolToColorConverter.cs
+++ b/Converters/ToolToColorConverter.cs
@@ -28,41 +28,41 @@ namespace LunaDraw.Converters;
 
 public class ToolToColorConverter : IValueConverter
 {
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+  public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    bool isActive = false;
+
+    if (value is IDrawingTool activeTool && parameter is string targetToolName)
     {
-        bool isActive = false;
+      if (targetToolName == "Shapes")
+      {
+        isActive = activeTool is RectangleTool or EllipseTool or LineTool;
+      }
+      else
+      {
+        isActive = string.Equals(activeTool.GetType().Name, targetToolName, StringComparison.Ordinal);
+      }
+    }
 
-        if (value is IDrawingTool activeTool && parameter is string targetToolName)
-        {
-            if (targetToolName == "Shapes")
-            {
-                isActive = activeTool is RectangleTool or EllipseTool or LineTool;
-            }
-            else
-            {
-                isActive = string.Equals(activeTool.GetType().Name, targetToolName, StringComparison.Ordinal);
-            }
-        }
+    if (isActive)
+    {
+      if (Application.Current?.Resources.TryGetValue("Secondary", out var color) == true)
+        return color;
+      return Colors.Orange; // Fallback
+    }
 
-        if (isActive)
-        {
-            if (Application.Current?.Resources.TryGetValue("Secondary", out var color) == true)
-                return color;
-            return Colors.Orange; // Fallback
-        }
+    // Inactive Color
+    var isDark = Application.Current?.RequestedTheme == AppTheme.Dark;
+    var key = isDark ? "Gray700" : "Gray200";
 
-        // Inactive Color
-        var isDark = Application.Current?.RequestedTheme == AppTheme.Dark;
-        var key = isDark ? "Gray700" : "Gray200";
-      
-        if (Application.Current?.Resources.TryGetValue(key, out var inactiveColor) == true)
-            return inactiveColor;
+    if (Application.Current?.Resources.TryGetValue(key, out var inactiveColor) == true)
+      return inactiveColor;
 
-        return isDark ? Colors.DarkGray : Colors.LightGray; // Fallback
-    }
+    return isDark ? Colors.DarkGray : Colors.LightGray; // Fallback
+  }
 
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+  public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+  {
+    throw new NotImplementedException();
+  }
 }
diff --git a/Logic/Config/FeatureFlags.cs b/Logic/Config/FeatureFlags.cs
index 0c7d1ae..656b144 100644
--- a/Logic/Config/FeatureFlags.cs
+++ b/Logic/Config/FeatureFlags.cs
@@ -1,6 +1,29 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 namespace LunaDraw.Logic.Config;
 
 public static class FeatureFlags
 {
-    public static bool EnableTransparentBackground { get; set; } = false;
+  public static bool EnableTransparentBackground { get; set; } = false;
 }
diff --git a/Logic/Messages/BrushSettingsChangedMessage.cs b/Logic/Messages/BrushSettingsChangedMessage.cs
index af5b8a8..8d91ce9 100644
--- a/Logic/Messages/BrushSettingsChangedMessage.cs
+++ b/Logic/Messages/BrushSettingsChangedMessage.cs
@@ -25,39 +25,39 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when brush settings (color, transparency) change.
-  /// </summary>
-  public class BrushSettingsChangedMessage(
-      SKColor? strokeColor = null,
-      SKColor? fillColor = null,
-      byte? transparency = null,
-      byte? flow = null,
-      float? spacing = null,
-      float? strokeWidth = null,
-      bool? isGlowEnabled = null,
-      SKColor? glowColor = null,
-      float? glowRadius = null,
-      bool? isRainbowEnabled = null,
-      float? scatterRadius = null,
-      float? sizeJitter = null,
-      float? angleJitter = null,
-      float? hueJitter = null,
-      bool shouldClearFillColor = false)
-  {
-      public SKColor? StrokeColor { get; } = strokeColor;
-      public SKColor? FillColor { get; } = fillColor;
-      public byte? Transparency { get; } = transparency;
-      public byte? Flow { get; } = flow;
-      public float? Spacing { get; } = spacing;
-      public float? StrokeWidth { get; } = strokeWidth;
-      public bool? IsGlowEnabled { get; } = isGlowEnabled;
-      public SKColor? GlowColor { get; } = glowColor;
-      public float? GlowRadius { get; } = glowRadius;
-      public bool? IsRainbowEnabled { get; } = isRainbowEnabled;
-      public float? ScatterRadius { get; } = scatterRadius;
-      public float? SizeJitter { get; } = sizeJitter;
-      public float? AngleJitter { get; } = angleJitter;
-      public float? HueJitter { get; } = hueJitter;
-      public bool ShouldClearFillColor { get; } = shouldClearFillColor;
-  }
+/// <summary>
+/// Message sent when brush settings (color, transparency) change.
+/// </summary>
+public class BrushSettingsChangedMessage(
+    SKColor? strokeColor = null,
+    SKColor? fillColor = null,
+    byte? transparency = null,
+    byte? flow = null,
+    float? spacing = null,
+    float? strokeWidth = null,
+    bool? isGlowEnabled = null,
+    SKColor? glowColor = null,
+    float? glowRadius = null,
+    bool? isRainbowEnabled = null,
+    float? scatterRadius = null,
+    float? sizeJitter = null,
+    float? angleJitter = null,
+    float? hueJitter = null,
+    bool shouldClearFillColor = false)
+{
+  public SKColor? StrokeColor { get; } = strokeColor;
+  public SKColor? FillColor { get; } = fillColor;
+  public byte? Transparency { get; } = transparency;
+  public byte? Flow { get; } = flow;
+  public float? Spacing { get; } = spacing;
+  public float? StrokeWidth { get; } = strokeWidth;
+  public bool? IsGlowEnabled { get; } = isGlowEnabled;
+  public SKColor? GlowColor { get; } = glowColor;
+  public float? GlowRadius { get; } = glowRadius;
+  public bool? IsRainbowEnabled { get; } = isRainbowEnabled;
+  public float? ScatterRadius { get; } = scatterRadius;
+  public float? SizeJitter { get; } = sizeJitter;
+  public float? AngleJitter { get; } = angleJitter;
+  public float? HueJitter { get; } = hueJitter;
+  public bool ShouldClearFillColor { get; } = shouldClearFillColor;
+}
diff --git a/Logic/Messages/BrushShapeChangedMessage.cs b/Logic/Messages/BrushShapeChangedMessage.cs
index 57cf612..b01d8dc 100644
--- a/Logic/Messages/BrushShapeChangedMessage.cs
+++ b/Logic/Messages/BrushShapeChangedMessage.cs
@@ -25,7 +25,7 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  public class BrushShapeChangedMessage(BrushShape shape)
-  {
-      public BrushShape Shape { get; } = shape;
-  }
+public class BrushShapeChangedMessage(BrushShape shape)
+{
+  public BrushShape Shape { get; } = shape;
+}
diff --git a/Logic/Messages/CanvasInvalidateMessage.cs b/Logic/Messages/CanvasInvalidateMessage.cs
index 2b0ae9c..6d3f109 100644
--- a/Logic/Messages/CanvasInvalidateMessage.cs
+++ b/Logic/Messages/CanvasInvalidateMessage.cs
@@ -23,10 +23,10 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent to request the canvas to invalidate and redraw.
-  /// </summary>
-  public class CanvasInvalidateMessage
-  {
-      // No properties needed, just a signal
-  }
+/// <summary>
+/// Message sent to request the canvas to invalidate and redraw.
+/// </summary>
+public class CanvasInvalidateMessage
+{
+  // No properties needed, just a signal
+}
diff --git a/Logic/Messages/DrawingStateChangedMessage.cs b/Logic/Messages/DrawingStateChangedMessage.cs
index 51344d7..ac24e21 100644
--- a/Logic/Messages/DrawingStateChangedMessage.cs
+++ b/Logic/Messages/DrawingStateChangedMessage.cs
@@ -23,9 +23,9 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// A message to indicate that the drawable state of the canvas has changed and a history snapshot should be taken.
-  /// </summary>
-  public class DrawingStateChangedMessage
-  {
-  }
+/// <summary>
+/// A message to indicate that the drawable state of the canvas has changed and a history snapshot should be taken.
+/// </summary>
+public class DrawingStateChangedMessage
+{
+}
diff --git a/Logic/Messages/ElementAddedMessage.cs b/Logic/Messages/ElementAddedMessage.cs
index 40abca2..4dfee30 100644
--- a/Logic/Messages/ElementAddedMessage.cs
+++ b/Logic/Messages/ElementAddedMessage.cs
@@ -25,11 +25,11 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when a new element is added to a layer.
-  /// </summary>
-  public class ElementAddedMessage(IDrawableElement element, Layer targetLayer)
-  {
-      public IDrawableElement Element { get; } = element;
-      public Layer TargetLayer { get; } = targetLayer;
-  }
+/// <summary>
+/// Message sent when a new element is added to a layer.
+/// </summary>
+public class ElementAddedMessage(IDrawableElement element, Layer targetLayer)
+{
+  public IDrawableElement Element { get; } = element;
+  public Layer TargetLayer { get; } = targetLayer;
+}
diff --git a/Logic/Messages/ElementRemovedMessage.cs b/Logic/Messages/ElementRemovedMessage.cs
index 526611f..8a63329 100644
--- a/Logic/Messages/ElementRemovedMessage.cs
+++ b/Logic/Messages/ElementRemovedMessage.cs
@@ -25,11 +25,11 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when an element is removed from a layer.
-  /// </summary>
-  public class ElementRemovedMessage(IDrawableElement element, Layer sourceLayer)
-  {
-      public IDrawableElement Element { get; } = element;
-      public Layer SourceLayer { get; } = sourceLayer;
-  }
+/// <summary>
+/// Message sent when an element is removed from a layer.
+/// </summary>
+public class ElementRemovedMessage(IDrawableElement element, Layer sourceLayer)
+{
+  public IDrawableElement Element { get; } = element;
+  public Layer SourceLayer { get; } = sourceLayer;
+}
diff --git a/Logic/Messages/LayerChangedMessage.cs b/Logic/Messages/LayerChangedMessage.cs
index ad6f7e2..f7dc5f9 100644
--- a/Logic/Messages/LayerChangedMessage.cs
+++ b/Logic/Messages/LayerChangedMessage.cs
@@ -25,10 +25,10 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when a layer's properties (e.g., visibility, lock status) change.
-  /// </summary>
-  public class LayerChangedMessage(Layer changedLayer)
-  {
-      public Layer ChangedLayer { get; } = changedLayer;
-  }
+/// <summary>
+/// Message sent when a layer's properties (e.g., visibility, lock status) change.
+/// </summary>
+public class LayerChangedMessage(Layer changedLayer)
+{
+  public Layer ChangedLayer { get; } = changedLayer;
+}
diff --git a/Logic/Messages/SelectionChangedMessage.cs b/Logic/Messages/SelectionChangedMessage.cs
index 77c157c..2a1a7af 100644
--- a/Logic/Messages/SelectionChangedMessage.cs
+++ b/Logic/Messages/SelectionChangedMessage.cs
@@ -25,10 +25,10 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when the selection of elements changes.
-  /// </summary>
-  public class SelectionChangedMessage(IEnumerable<IDrawableElement> selectedElements)
-  {
-      public IEnumerable<IDrawableElement> SelectedElements { get; } = selectedElements;
-  }
+/// <summary>
+/// Message sent when the selection of elements changes.
+/// </summary>
+public class SelectionChangedMessage(IEnumerable<IDrawableElement> selectedElements)
+{
+  public IEnumerable<IDrawableElement> SelectedElements { get; } = selectedElements;
+}
diff --git a/Logic/Messages/ShowAdvancedSettingsMessage.cs b/Logic/Messages/ShowAdvancedSettingsMessage.cs
index 77b1d8e..ee83ec6 100644
--- a/Logic/Messages/ShowAdvancedSettingsMessage.cs
+++ b/Logic/Messages/ShowAdvancedSettingsMessage.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 namespace LunaDraw.Logic.Messages;
 
 public class ShowAdvancedSettingsMessage
diff --git a/Logic/Messages/ToolChangedMessage.cs b/Logic/Messages/ToolChangedMessage.cs
index 9357c5e..d00bffd 100644
--- a/Logic/Messages/ToolChangedMessage.cs
+++ b/Logic/Messages/ToolChangedMessage.cs
@@ -25,10 +25,10 @@
 
 namespace LunaDraw.Logic.Messages;
 
-  /// <summary>
-  /// Message sent when the active drawing tool changes.
-  /// </summary>
-  public class ToolChangedMessage(IDrawingTool newTool)
-  {
-      public IDrawingTool NewTool { get; } = newTool;
-  }
+/// <summary>
+/// Message sent when the active drawing tool changes.
+/// </summary>
+public class ToolChangedMessage(IDrawingTool newTool)
+{
+  public IDrawingTool NewTool { get; } = newTool;
+}
diff --git a/Logic/Messages/ViewOptionsChangedMessage.cs b/Logic/Messages/ViewOptionsChangedMessage.cs
index e9b0370..26987d8 100644
--- a/Logic/Messages/ViewOptionsChangedMessage.cs
+++ b/Logic/Messages/ViewOptionsChangedMessage.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 namespace LunaDraw.Logic.Messages;
 
 public class ViewOptionsChangedMessage
diff --git a/Logic/Services/IPreferencesService.cs b/Logic/Services/IPreferencesService.cs
index 8762798..f06de51 100644
--- a/Logic/Services/IPreferencesService.cs
+++ b/Logic/Services/IPreferencesService.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 namespace LunaDraw.Logic.Services;
 
 public interface IPreferencesService
diff --git a/Logic/Services/PreferencesService.cs b/Logic/Services/PreferencesService.cs
index a334e03..b86a314 100644
--- a/Logic/Services/PreferencesService.cs
+++ b/Logic/Services/PreferencesService.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 using Microsoft.Maui.Storage;
 
 namespace LunaDraw.Logic.Services;
diff --git a/Logic/Tools/RectangleTool.cs b/Logic/Tools/RectangleTool.cs
index cf32f4e..b633c94 100644
--- a/Logic/Tools/RectangleTool.cs
+++ b/Logic/Tools/RectangleTool.cs
@@ -32,7 +32,7 @@ public class RectangleTool(IMessageBus messageBus) : ShapeTool<DrawableRectangle
   public override string Name => "Rectangle";
   public override ToolType Type => ToolType.Rectangle;
 
-      protected override DrawableRectangle CreateShape(ToolContext context)
+  protected override DrawableRectangle CreateShape(ToolContext context)
   {
     return new DrawableRectangle
     {
diff --git a/Logic/ViewModels/LayerPanelViewModel.cs b/Logic/ViewModels/LayerPanelViewModel.cs
index b2a3d9a..bb19fc8 100644
--- a/Logic/ViewModels/LayerPanelViewModel.cs
+++ b/Logic/ViewModels/LayerPanelViewModel.cs
@@ -187,12 +187,13 @@ private void UpdateWindowTransparency()
     {
       LunaDraw.PlatformHelper.EnableTrueTransparency(255);
     }
-    #endif
+#endif
   }
 
   public bool IsTransparentBackgroundVisible => Config.FeatureFlags.EnableTransparentBackground;
 
-  public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }  public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
+  public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }
+  public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerForwardCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerBackwardCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerVisibilityCommand { get; }
diff --git a/Logic/ViewModels/ToolbarViewModel.cs b/Logic/ViewModels/ToolbarViewModel.cs
index 07374f9..3b25ce6 100644
--- a/Logic/ViewModels/ToolbarViewModel.cs
+++ b/Logic/ViewModels/ToolbarViewModel.cs
@@ -399,7 +399,7 @@ public ToolbarViewModel(
 
     ShowAdvancedSettingsCommand = ReactiveCommand.Create(() =>
     {
-       messageBus.SendMessage(new ShowAdvancedSettingsMessage());
+      messageBus.SendMessage(new ShowAdvancedSettingsMessage());
     });
 
     SelectRectangleCommand = ReactiveCommand.Create(() =>
diff --git a/Resources/Strings/AppResources.Designer.cs b/Resources/Strings/AppResources.Designer.cs
index d8ba392..eefb608 100644
--- a/Resources/Strings/AppResources.Designer.cs
+++ b/Resources/Strings/AppResources.Designer.cs
@@ -1,3 +1,26 @@
+/* 
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *  
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *  
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *  
+ */
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

From 8ab80f8269b2a5c8536efc872de85d3e17e6fc46 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 19:22:24 -0500
Subject: [PATCH 4/9] light dark mode cleanup setting

---
 App.xaml.cs                           |  8 ++++
 Components/AdvancedSettingsPopup.xaml | 21 +++++++--
 Components/ToolbarView.xaml           | 43 ++++++++++++++---
 Converters/ToolToColorConverter.cs    | 68 ---------------------------
 Logic/Services/IPreferencesService.cs |  2 +
 Logic/Services/PreferencesService.cs  |  2 +
 Logic/ViewModels/MainViewModel.cs     | 30 ++++++++++++
 7 files changed, 95 insertions(+), 79 deletions(-)
 delete mode 100644 Converters/ToolToColorConverter.cs

diff --git a/App.xaml.cs b/App.xaml.cs
index e597ea3..52383bb 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -28,6 +28,14 @@ public partial class App : Application
 	public App()
 	{
 		InitializeComponent();
+
+        var theme = Microsoft.Maui.Storage.Preferences.Get("AppTheme", "Automatic");
+        UserAppTheme = theme switch
+        {
+            "Light" => AppTheme.Light,
+            "Dark" => AppTheme.Dark,
+            _ => AppTheme.Unspecified
+        };
 	}
 
 	protected override Window CreateWindow(IActivationState? activationState)
diff --git a/Components/AdvancedSettingsPopup.xaml b/Components/AdvancedSettingsPopup.xaml
index 88d6b84..6765595 100644
--- a/Components/AdvancedSettingsPopup.xaml
+++ b/Components/AdvancedSettingsPopup.xaml
@@ -6,13 +6,14 @@
                xmlns:strings="clr-namespace:LunaDraw.Resources.Strings"
                x:Class="LunaDraw.Components.AdvancedSettingsPopup"
                x:DataType="viewModels:MainViewModel"
-               CanBeDismissedByTappingOutsideOfPopup="True">
+               CanBeDismissedByTappingOutsideOfPopup="True"
+               BackgroundColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray900}}">
   <VerticalStackLayout Spacing="15">
     <Grid ColumnDefinitions="*, Auto"
-          RowDefinitions="Auto, Auto"
+          RowDefinitions="Auto, Auto, Auto"
           RowSpacing="15">
       <Label Grid.Row="0"
-             TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray900}}"
+             TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"
              Grid.Column="0"
              Text="{x:Static strings:AppResources.Label_ShowLayersPanel}"
              VerticalOptions="Center"/>
@@ -21,13 +22,25 @@
               IsToggled="{Binding ShowLayersPanel}"/>
 
       <Label Grid.Row="1"
-             TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray900}}"
+             TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"
              Grid.Column="0"
              Text="{x:Static strings:AppResources.Label_ShowButtonLabels}"
              VerticalOptions="Center"/>
       <Switch Grid.Row="1"
               Grid.Column="1"
               IsToggled="{Binding ShowButtonLabels}"/>
+
+      <Label Grid.Row="2"
+             TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"
+             Grid.Column="0"
+             Text="Theme"
+             VerticalOptions="Center"/>
+      <Picker Grid.Row="2"
+              Grid.Column="1"
+              ItemsSource="{Binding AvailableThemes}"
+              SelectedItem="{Binding SelectedTheme}"
+              TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}"
+              Title="Select Theme"/>
     </Grid>
 
     <Button Text="{x:Static strings:AppResources.Label_Close}"
diff --git a/Components/ToolbarView.xaml b/Components/ToolbarView.xaml
index e8ed826..6080dbe 100644
--- a/Components/ToolbarView.xaml
+++ b/Components/ToolbarView.xaml
@@ -16,7 +16,6 @@
       <conv:ToolNameToIconConverter x:Key="ToolNameToIconConverter"/>
       <conv:IsToolActiveConverter x:Key="IsToolActiveConverter"/>
       <conv:ActiveShapeIconConverter x:Key="ActiveShapeIconConverter"/>
-      <conv:ToolToColorConverter x:Key="ToolToColorConverter"/>
 
       <!-- Kid-friendly button style with large hit areas for vertical toolbar -->
       <Style x:Key="ToolbarButtonStyle"
@@ -71,8 +70,15 @@
                     Text="⬚"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_SelectTool}"
                     Command="{Binding SelectToolCommand}"
-                    CommandParameter="{Binding AvailableTools[0]}"
-                    BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='SelectTool'}">
+                    CommandParameter="{Binding AvailableTools[0]}">
+              <Button.Triggers>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='SelectTool'}"
+                             Value="True">
+                  <Setter Property="BackgroundColor"
+                          Value="{StaticResource Secondary}"/>
+                </DataTrigger>
+              </Button.Triggers>
             </Button>
             <Label Text="{Binding AvailableTools[0].Name}"
                    HorizontalTextAlignment="Center"
@@ -96,10 +102,18 @@
                     Margin="0,4"
                     StrokeShape="RoundRectangle 12"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_BrushSettings}"
-                    BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='FreehandTool'}">
+                    BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}">
               <Border.GestureRecognizers>
                 <TapGestureRecognizer Command="{Binding ShowBrushesFlyoutCommand}"/>
               </Border.GestureRecognizers>
+              <Border.Triggers>
+                <DataTrigger TargetType="Border"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='FreehandTool'}"
+                             Value="True">
+                  <Setter Property="BackgroundColor"
+                          Value="{StaticResource Secondary}"/>
+                </DataTrigger>
+              </Border.Triggers>
               <local:BrushPreviewControl BrushShape="{Binding CurrentBrushShape}"
                                          StrokeColor="{Binding StrokeColor}"
                                          HorizontalOptions="Fill"
@@ -117,10 +131,18 @@
                     Margin="0,4"
                     StrokeShape="RoundRectangle 12"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Shapes}"
-                    BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='Shapes'}">
+                    BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}">
               <Border.GestureRecognizers>
                 <TapGestureRecognizer Command="{Binding ShowShapesFlyoutCommand}"/>
               </Border.GestureRecognizers>
+              <Border.Triggers>
+                <DataTrigger TargetType="Border"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='Shapes'}"
+                             Value="True">
+                  <Setter Property="BackgroundColor"
+                          Value="{StaticResource Secondary}"/>
+                </DataTrigger>
+              </Border.Triggers>
               <local:ShapePreviewControl ActiveTool="{Binding LastActiveShapeTool}"
                                          StrokeColor="{Binding StrokeColor}"
                                          FillColor="{Binding FillColor}"
@@ -161,8 +183,15 @@
                     Text="🧽"
                     ToolTipProperties.Text="{x:Static strings:AppResources.ToolTip_Eraser}"
                     Command="{Binding SelectToolCommand}"
-                    CommandParameter="{Binding AvailableTools[6]}"
-                    BackgroundColor="{Binding ActiveTool, Mode=OneWay, Converter={StaticResource ToolToColorConverter}, ConverterParameter='EraserBrushTool'}">
+                    CommandParameter="{Binding AvailableTools[6]}">
+              <Button.Triggers>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='EraserBrushTool'}"
+                             Value="True">
+                  <Setter Property="BackgroundColor"
+                          Value="{StaticResource Secondary}"/>
+                </DataTrigger>
+              </Button.Triggers>
             </Button>
             <Label Text="{Binding AvailableTools[6].Name}"
                    HorizontalTextAlignment="Center"
diff --git a/Converters/ToolToColorConverter.cs b/Converters/ToolToColorConverter.cs
deleted file mode 100644
index 4ad68fc..0000000
--- a/Converters/ToolToColorConverter.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- *  Copyright (c) 2025 CodeSoupCafe LLC
- *  
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *  
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- *  
- */
-
-using System.Globalization;
-using LunaDraw.Logic.Tools;
-
-namespace LunaDraw.Converters;
-
-public class ToolToColorConverter : IValueConverter
-{
-  public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-  {
-    bool isActive = false;
-
-    if (value is IDrawingTool activeTool && parameter is string targetToolName)
-    {
-      if (targetToolName == "Shapes")
-      {
-        isActive = activeTool is RectangleTool or EllipseTool or LineTool;
-      }
-      else
-      {
-        isActive = string.Equals(activeTool.GetType().Name, targetToolName, StringComparison.Ordinal);
-      }
-    }
-
-    if (isActive)
-    {
-      if (Application.Current?.Resources.TryGetValue("Secondary", out var color) == true)
-        return color;
-      return Colors.Orange; // Fallback
-    }
-
-    // Inactive Color
-    var isDark = Application.Current?.RequestedTheme == AppTheme.Dark;
-    var key = isDark ? "Gray700" : "Gray200";
-
-    if (Application.Current?.Resources.TryGetValue(key, out var inactiveColor) == true)
-      return inactiveColor;
-
-    return isDark ? Colors.DarkGray : Colors.LightGray; // Fallback
-  }
-
-  public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-  {
-    throw new NotImplementedException();
-  }
-}
diff --git a/Logic/Services/IPreferencesService.cs b/Logic/Services/IPreferencesService.cs
index f06de51..38f17c3 100644
--- a/Logic/Services/IPreferencesService.cs
+++ b/Logic/Services/IPreferencesService.cs
@@ -27,4 +27,6 @@ public interface IPreferencesService
 {
     bool Get(string key, bool defaultValue);
     void Set(string key, bool value);
+    string Get(string key, string defaultValue);
+    void Set(string key, string value);
 }
diff --git a/Logic/Services/PreferencesService.cs b/Logic/Services/PreferencesService.cs
index b86a314..a7396fc 100644
--- a/Logic/Services/PreferencesService.cs
+++ b/Logic/Services/PreferencesService.cs
@@ -29,4 +29,6 @@ public class PreferencesService : IPreferencesService
 {
     public bool Get(string key, bool defaultValue) => Preferences.Get(key, defaultValue);
     public void Set(string key, bool value) => Preferences.Set(key, value);
+    public string Get(string key, string defaultValue) => Preferences.Get(key, defaultValue);
+    public void Set(string key, string value) => Preferences.Set(key, value);
 }
diff --git a/Logic/ViewModels/MainViewModel.cs b/Logic/ViewModels/MainViewModel.cs
index f7dde08..fb5500f 100644
--- a/Logic/ViewModels/MainViewModel.cs
+++ b/Logic/ViewModels/MainViewModel.cs
@@ -63,7 +63,22 @@ public class MainViewModel : ReactiveObject
   public SKRect CanvasSize { get; set; }
 
   // UI State
+  public List<string> AvailableThemes { get; } = new List<string> { "Automatic", "Light", "Dark" };
+
+  private string selectedTheme;
+  public string SelectedTheme
+  {
+    get => selectedTheme;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref selectedTheme, value);
+      preferencesService.Set("AppTheme", value);
+      UpdateAppTheme(value);
+    }
+  }
+
   private bool showButtonLabels;
+
   public bool ShowButtonLabels
   {
     get => showButtonLabels;
@@ -122,6 +137,8 @@ public MainViewModel(
     // Use Property setters to trigger ViewOptionsChangedMessage so ToolbarViewModel syncs up
     ShowButtonLabels = this.preferencesService.Get("ShowButtonLabels", false);
     ShowLayersPanel = this.preferencesService.Get("ShowLayersPanel", false);
+    var savedTheme = this.preferencesService.Get("AppTheme", "Automatic");
+    SelectedTheme = AvailableThemes.FirstOrDefault(t => t == savedTheme) ?? AvailableThemes[0];
 
     ZoomInCommand = ReactiveCommand.Create(ZoomIn);
     ZoomOutCommand = ReactiveCommand.Create(ZoomOut);
@@ -189,6 +206,19 @@ public ToolContext CreateToolContext()
     };
   }
 
+  private void UpdateAppTheme(string theme)
+  {
+    if (Application.Current != null)
+    {
+      Application.Current.UserAppTheme = theme switch
+      {
+        "Light" => AppTheme.Light,
+        "Dark" => AppTheme.Dark,
+        _ => AppTheme.Unspecified
+      };
+    }
+  }
+
   private void ZoomIn() => Zoom(1.2f);
   private void ZoomOut() => Zoom(1f / 1.2f);
 

From 17fca4f3e9d2929ab47aae4909d2a5afa33973db Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 19:28:02 -0500
Subject: [PATCH 5/9] test fixes

---
 tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs | 1 +
 tests/LunaDraw.Tests/CanvasInputHandlerTests.cs       | 1 +
 tests/LunaDraw.Tests/MainViewModelTests.cs            | 3 +++
 tests/LunaDraw.Tests/ToolbarViewModelTests.cs         | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
index 3e96ce2..dc6854c 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
@@ -73,6 +73,7 @@ public CanvasInputHandlerRobustTests()
       // Ensure MessageBus returns observables for ToolbarViewModel constructor
       mockMessageBus.Setup(x => x.Listen<BrushSettingsChangedMessage>()).Returns(Observable.Empty<BrushSettingsChangedMessage>());
       mockMessageBus.Setup(x => x.Listen<BrushShapeChangedMessage>()).Returns(Observable.Empty<BrushShapeChangedMessage>());
+      mockMessageBus.Setup(x => x.Listen<ViewOptionsChangedMessage>()).Returns(Observable.Empty<ViewOptionsChangedMessage>());
 
       mockToolbarViewModel = new Mock<ToolbarViewModel>(
           mockLayerFacade.Object,
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
index a7c9c6a..ac469f8 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
@@ -74,6 +74,7 @@ public CanvasInputHandlerTests()
             // Ensure MessageBus returns observables for ToolbarViewModel constructor
             mockMessageBus.Setup(x => x.Listen<BrushSettingsChangedMessage>()).Returns(Observable.Empty<BrushSettingsChangedMessage>());
             mockMessageBus.Setup(x => x.Listen<BrushShapeChangedMessage>()).Returns(Observable.Empty<BrushShapeChangedMessage>());
+            mockMessageBus.Setup(x => x.Listen<ViewOptionsChangedMessage>()).Returns(Observable.Empty<ViewOptionsChangedMessage>());
 
             selectionObserver = new SelectionObserver();
             navigationModel = new NavigationModel();
diff --git a/tests/LunaDraw.Tests/MainViewModelTests.cs b/tests/LunaDraw.Tests/MainViewModelTests.cs
index 71e51f0..d2b4b8a 100644
--- a/tests/LunaDraw.Tests/MainViewModelTests.cs
+++ b/tests/LunaDraw.Tests/MainViewModelTests.cs
@@ -82,6 +82,8 @@ public MainViewModelTests()
       // We need to verify that messageBus.Listen returns observables because ToolbarViewModel constructor subscribes to them
       messageBusMock.Setup(x => x.Listen<BrushSettingsChangedMessage>()).Returns(Observable.Empty<BrushSettingsChangedMessage>());
       messageBusMock.Setup(x => x.Listen<BrushShapeChangedMessage>()).Returns(Observable.Empty<BrushShapeChangedMessage>());
+      messageBusMock.Setup(x => x.Listen<ViewOptionsChangedMessage>()).Returns(Observable.Empty<ViewOptionsChangedMessage>());
+      messageBusMock.Setup(x => x.Listen<ShowAdvancedSettingsMessage>()).Returns(Observable.Empty<ShowAdvancedSettingsMessage>());
 
       mockToolbarViewModel = new Mock<ToolbarViewModel>(
           layerFacadeMock.Object,
@@ -103,6 +105,7 @@ public MainViewModelTests()
           navigationModel,
           selectionObserver,
           messageBusMock.Object,
+          preferencesServiceMock.Object,
           layerPanelVM,
           selectionVM,
           historyVM
diff --git a/tests/LunaDraw.Tests/ToolbarViewModelTests.cs b/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
index bd85363..1320049 100644
--- a/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
+++ b/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
@@ -65,6 +65,8 @@ public ToolbarViewModelTests()
           .Returns(Observable.Empty<BrushSettingsChangedMessage>());
       messageBusMock.Setup(x => x.Listen<BrushShapeChangedMessage>())
           .Returns(Observable.Empty<BrushShapeChangedMessage>());
+      messageBusMock.Setup(x => x.Listen<ViewOptionsChangedMessage>())
+          .Returns(Observable.Empty<ViewOptionsChangedMessage>());
 
       // Setup dependencies for ViewModels
       var selectionObserver = new SelectionObserver();

From 0524909f9b431dd26bb22335b4b887c81c725a82 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 21:47:33 -0500
Subject: [PATCH 6/9] prefernces refactor from AI slop. theme bg fix. zoom
 clamps

---
 App.xaml.cs                                   |  32 +--
 Components/MiniMapView.xaml.cs                |  17 +-
 Components/ToolbarView.xaml                   |   7 +-
 Converters/ToolNameToIconConverter.cs         |  63 -----
 Logic/Config/FeatureFlags.cs                  |  29 --
 Logic/Extensions/PreferencesExtensions.cs     |  22 ++
 Logic/Extensions/SkiaSharpExtensions.cs       |  67 +++++
 Logic/Handlers/CanvasInputHandler.cs          |  17 +-
 Logic/Models/DrawableImage.cs                 |   2 +-
 Logic/Utils/BitmapCache.cs                    |  72 +----
 .../IPreferencesFacade.cs}                    |  14 +-
 .../PreferencesFacade.cs}                     |  43 ++-
 Logic/ViewModels/LayerPanelViewModel.cs       |  17 +-
 Logic/ViewModels/MainViewModel.cs             |  35 ++-
 Logic/ViewModels/ToolbarViewModel.cs          |   2 +-
 MauiProgram.cs                                |   2 +-
 Pages/MainPage.xaml.cs                        |  12 +-
 .../LunaDraw.Tests/CanvasInputHandlerTests.cs | 247 ++++++++++++++++--
 .../LayerPanelViewModelTests.cs               | 210 +++++++--------
 tests/LunaDraw.Tests/MainViewModelTests.cs    |   8 +-
 20 files changed, 571 insertions(+), 347 deletions(-)
 delete mode 100644 Converters/ToolNameToIconConverter.cs
 delete mode 100644 Logic/Config/FeatureFlags.cs
 create mode 100644 Logic/Extensions/PreferencesExtensions.cs
 rename Logic/{Services/IPreferencesService.cs => Utils/IPreferencesFacade.cs} (82%)
 rename Logic/{Services/PreferencesService.cs => Utils/PreferencesFacade.cs} (54%)

diff --git a/App.xaml.cs b/App.xaml.cs
index 52383bb..01aa7db 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -21,25 +21,27 @@
  *  
  */
 
+using LunaDraw.Logic.Services;
+
 namespace LunaDraw;
 
 public partial class App : Application
 {
-	public App()
-	{
-		InitializeComponent();
+  public App(IPreferencesFacade preferencesFacade)
+  {
+    InitializeComponent();
 
-        var theme = Microsoft.Maui.Storage.Preferences.Get("AppTheme", "Automatic");
-        UserAppTheme = theme switch
-        {
-            "Light" => AppTheme.Light,
-            "Dark" => AppTheme.Dark,
-            _ => AppTheme.Unspecified
-        };
-	}
+    var theme = preferencesFacade.Get(AppPreference.AppTheme);
+    UserAppTheme = theme switch
+    {
+      "Light" => AppTheme.Light,
+      "Dark" => AppTheme.Dark,
+      _ => AppTheme.Unspecified
+    };
+  }
 
-	protected override Window CreateWindow(IActivationState? activationState)
-	{
-		return new Window(new AppShell());
-	}
+  protected override Window CreateWindow(IActivationState? activationState)
+  {
+    return new Window(new AppShell());
+  }
 }
\ No newline at end of file
diff --git a/Components/MiniMapView.xaml.cs b/Components/MiniMapView.xaml.cs
index 65bb4c6..28e4d19 100644
--- a/Components/MiniMapView.xaml.cs
+++ b/Components/MiniMapView.xaml.cs
@@ -23,7 +23,9 @@
 
 using System.Reactive.Linq;
 
+using LunaDraw.Logic.Extensions;
 using LunaDraw.Logic.Messages;
+using LunaDraw.Logic.Services;
 using LunaDraw.Logic.ViewModels;
 
 using ReactiveUI;
@@ -52,6 +54,18 @@ private IMessageBus? MessageBus
     }
   }
 
+  private IPreferencesFacade? preferencesFacade;
+  private IPreferencesFacade? PreferencesFacade
+  {
+    get
+    {
+      if (preferencesFacade != null) return preferencesFacade;
+      preferencesFacade = Handler?.MauiContext?.Services.GetService<IPreferencesFacade>()
+                   ?? IPlatformApplication.Current?.Services.GetService<IPreferencesFacade>();
+      return preferencesFacade;
+    }
+  }
+
   public MiniMapView()
   {
     InitializeComponent();
@@ -83,7 +97,8 @@ private void OnPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
       density = (float)(info.Width / view.Width);
     }
 
-    canvas.Clear(SKColors.White);
+    var bgColor = PreferencesFacade?.GetCanvasBackgroundColor(viewModel.LayerPanelVM.IsTransparentBackground) ?? SKColors.White;
+    canvas.Clear(bgColor);
 
     // Calculate bounds of all elements
     var contentBounds = SKRect.Empty;
diff --git a/Components/ToolbarView.xaml b/Components/ToolbarView.xaml
index 6080dbe..b836349 100644
--- a/Components/ToolbarView.xaml
+++ b/Components/ToolbarView.xaml
@@ -13,7 +13,6 @@
              x:DataType="viewModels:ToolbarViewModel">
   <ContentView.Resources>
     <ResourceDictionary>
-      <conv:ToolNameToIconConverter x:Key="ToolNameToIconConverter"/>
       <conv:IsToolActiveConverter x:Key="IsToolActiveConverter"/>
       <conv:ActiveShapeIconConverter x:Key="ActiveShapeIconConverter"/>
 
@@ -38,10 +37,10 @@
                 Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
         <Style.Triggers>
           <Trigger TargetType="Button"
-              Property="IsEnabled"
-              Value="False">
+                   Property="IsEnabled"
+                   Value="False">
             <Setter Property="Opacity"
-                Value="0.3"/>
+                    Value="0.3"/>
           </Trigger>
         </Style.Triggers>
       </Style>
diff --git a/Converters/ToolNameToIconConverter.cs b/Converters/ToolNameToIconConverter.cs
deleted file mode 100644
index c84c453..0000000
--- a/Converters/ToolNameToIconConverter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 
- *  Copyright (c) 2025 CodeSoupCafe LLC
- *  
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *  
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- *  
- */
-
-using System.Globalization;
-
-namespace LunaDraw.Converters;
-
-// Simple converter that maps tool names to an icon glyph (emoji for now).
-// This keeps UI independent of a specific icon font and allows swapping to Syncfusion glyphs later.
-public class ToolNameToIconConverter : IValueConverter
-{
-  private static readonly Dictionary<string, string> Map = new(StringComparer.OrdinalIgnoreCase)
-      {
-          { "Select", "🔲" },
-          { "Line", "／" },
-          { "Rectangle", "▭" },
-          { "Ellipse", "◯" },
-          { "Freehand", "✏️" },
-          { "Eraser", "🧽" },
-          { "Fill", "🖌️" },
-          // Fallback for unknown tools
-          { "Default", "🔧" }
-      };
-
-  public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-  {
-    if (value is string name && !string.IsNullOrWhiteSpace(name))
-    {
-      if (Map.TryGetValue(name, out var glyph))
-        return glyph;
-
-      // Try to return the first character as a fallback
-      return name.Length > 0 ? name.Substring(0, 1) : Map["Default"];
-    }
-
-    return Map["Default"];
-  }
-
-  public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-  {
-    throw new NotSupportedException();
-  }
-}
diff --git a/Logic/Config/FeatureFlags.cs b/Logic/Config/FeatureFlags.cs
deleted file mode 100644
index 656b144..0000000
--- a/Logic/Config/FeatureFlags.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- *  Copyright (c) 2025 CodeSoupCafe LLC
- *  
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *  
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- *  
- */
-
-namespace LunaDraw.Logic.Config;
-
-public static class FeatureFlags
-{
-  public static bool EnableTransparentBackground { get; set; } = false;
-}
diff --git a/Logic/Extensions/PreferencesExtensions.cs b/Logic/Extensions/PreferencesExtensions.cs
new file mode 100644
index 0000000..7e902b6
--- /dev/null
+++ b/Logic/Extensions/PreferencesExtensions.cs
@@ -0,0 +1,22 @@
+using LunaDraw.Logic.Services;
+using SkiaSharp;
+
+namespace LunaDraw.Logic.Extensions;
+
+public static class PreferencesExtensions
+{
+    public static SKColor GetCanvasBackgroundColor(this IPreferencesFacade preferences, bool isTransparentBackground)
+    {
+        if (isTransparentBackground) return SKColors.Transparent;
+
+        var selectedTheme = Application.Current?.RequestedTheme;
+        var settingTheme = preferences.Get(AppPreference.AppTheme);
+
+        if (settingTheme != PreferencesFacade.Defaults[AppPreference.AppTheme])
+        {
+            selectedTheme = settingTheme == AppTheme.Dark.ToString() ? AppTheme.Dark : AppTheme.Light;
+        }
+
+        return selectedTheme == AppTheme.Dark ? SKColors.Black : SKColors.White;
+    }
+}
diff --git a/Logic/Extensions/SkiaSharpExtensions.cs b/Logic/Extensions/SkiaSharpExtensions.cs
index 88f2097..1c0c04e 100644
--- a/Logic/Extensions/SkiaSharpExtensions.cs
+++ b/Logic/Extensions/SkiaSharpExtensions.cs
@@ -27,6 +27,73 @@ namespace LunaDraw.Logic.Extensions;
 
 public static class SkiaSharpExtensions
 {
+  public static SKBitmap LoadBitmapDownsampled(string path, int targetWidth, int targetHeight)
+  {
+    try
+    {
+      if (!File.Exists(path))
+      {
+        System.Diagnostics.Debug.WriteLine($"[BitmapCache] File not found: {path}");
+
+        return new SKBitmap();
+      }
+
+      using var stream = File.OpenRead(path);
+      using var codec = SKCodec.Create(stream);
+
+      if (codec == null)
+      {
+        System.Diagnostics.Debug.WriteLine($"[BitmapCache] Failed to create codec for: {path}");
+
+        return new SKBitmap();
+      }
+
+      var info = codec.Info;
+
+      // Calculate scale
+      float scale = 1.0f;
+      if (targetWidth > 0 && targetHeight > 0)
+      {
+        float scaleX = (float)targetWidth / info.Width;
+        float scaleY = (float)targetHeight / info.Height;
+        scale = Math.Min(scaleX, scaleY);
+      }
+
+      if (scale >= 1.0f || (targetWidth == 0 && targetHeight == 0))
+      {
+        return SKBitmap.Decode(codec);
+      }
+
+      // Get supported dimensions for this scale
+      var supportedInfo = codec.GetScaledDimensions(scale);
+
+      // Use the supported dimensions for decoding
+      var decodeInfo = new SKImageInfo(supportedInfo.Width, supportedInfo.Height, info.ColorType, info.AlphaType);
+
+      var bitmap = new SKBitmap(decodeInfo);
+      var result = codec.GetPixels(decodeInfo, bitmap.GetPixels());
+
+      if (result == SKCodecResult.Success || result == SKCodecResult.IncompleteInput)
+      {
+        return bitmap;
+      }
+      else
+      {
+        System.Diagnostics.Debug.WriteLine($"[BitmapCache] GetPixels failed: {result}");
+        bitmap.Dispose();
+        // Fallback: try full decode if downsample fails? 
+        // Or maybe the scale was just invalid. 
+        return new SKBitmap();
+      }
+    }
+    catch (Exception ex)
+    {
+      System.Diagnostics.Debug.WriteLine($"[BitmapCache] Exception loading bitmap: {ex}");
+
+      return new SKBitmap();
+    }
+  }
+
   public static int GetAlphaPixelCount(this SKPixmap pixmap)
   {
     return GetAlphaPixelCounts(pixmap)[0];
diff --git a/Logic/Handlers/CanvasInputHandler.cs b/Logic/Handlers/CanvasInputHandler.cs
index 1f130c9..f90b6b8 100644
--- a/Logic/Handlers/CanvasInputHandler.cs
+++ b/Logic/Handlers/CanvasInputHandler.cs
@@ -207,8 +207,8 @@ private void HandleMultiTouch()
     float rotation = angle - startAngle;
 
     // Aggressive deadzones to filter out noise
-    if (Math.Abs(scale - 1.0f) < 0.05f) scale = 1.0f;
-    if (Math.Abs(rotation) < 0.2f) rotation = 0f; // ~11 degrees
+    if (Math.Abs(scale - 1.0f) < 0.01f) scale = 1.0f; // Reduced from 0.05f
+    if (Math.Abs(rotation) < 0.05f) rotation = 0f; // Reduced from 0.2f (~3 degrees)
 
     // Build transform around start centroid
     var transform = SKMatrix.CreateIdentity();
@@ -248,6 +248,19 @@ private void HandleMultiTouch()
       // Calculate target matrix
       var targetMatrix = SKMatrix.Concat(transform, startMatrix);
 
+      // Clamp scale
+      float currentScale = targetMatrix.ScaleX; // Assuming uniform scale
+      if (currentScale < 0.1f)
+      {
+          float correction = 0.1f / currentScale;
+          targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
+      }
+      else if (currentScale > 20.0f)
+      {
+          float correction = 20.0f / currentScale;
+          targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
+      }
+
       // Smooth the output using exponential moving average
       var smoothedMatrix = LerpMatrix(previousOutputMatrix, targetMatrix, SmoothingFactor);
       previousOutputMatrix = smoothedMatrix;
diff --git a/Logic/Models/DrawableImage.cs b/Logic/Models/DrawableImage.cs
index 7b6ff4c..309f2c8 100644
--- a/Logic/Models/DrawableImage.cs
+++ b/Logic/Models/DrawableImage.cs
@@ -100,7 +100,7 @@ public void Draw(SKCanvas canvas)
     // Draw the Bitmap
     using (var image = SKImage.FromBitmap(Bitmap))
     {
-      canvas.DrawImage(image, bounds, new SKSamplingOptions(SKFilterMode.Linear), paint);
+      canvas.DrawImage(image, bounds, new SKSamplingOptions(SKCubicResampler.Mitchell), paint);
     }
 
     // Draw Border if set
diff --git a/Logic/Utils/BitmapCache.cs b/Logic/Utils/BitmapCache.cs
index f0be4c9..5eef2db 100644
--- a/Logic/Utils/BitmapCache.cs
+++ b/Logic/Utils/BitmapCache.cs
@@ -23,6 +23,7 @@
 
 using SkiaSharp;
 using System.Collections.Concurrent;
+using LunaDraw.Logic.Extensions;
 
 namespace LunaDraw.Logic.Utils;
 
@@ -46,7 +47,7 @@ public SKBitmap GetBitmap(string path, int targetWidth, int targetHeight)
       return bitmap;
     }
 
-    var newBitmap = BitmapCache.LoadDownsampledBitmap(path, targetWidth, targetHeight);
+    var newBitmap = SkiaSharpExtensions.LoadBitmapDownsampled(path, targetWidth, targetHeight);
     if (newBitmap != null)
     {
       cache.AddOrUpdate(key,
@@ -68,7 +69,7 @@ public async Task<SKBitmap> GetBitmapAsync(string path, int targetWidth, int tar
 
     return await Task.Run(() =>
     {
-      var newBitmap = BitmapCache.LoadDownsampledBitmap(path, targetWidth, targetHeight);
+      var newBitmap = SkiaSharpExtensions.LoadBitmapDownsampled(path, targetWidth, targetHeight);
       if (newBitmap != null)
       {
         cache.AddOrUpdate(key,
@@ -85,73 +86,6 @@ private static string GenerateKey(string path, int width, int height)
     return $"{path}_{width}x{height}";
   }
 
-  private static SKBitmap LoadDownsampledBitmap(string path, int targetWidth, int targetHeight)
-  {
-    try
-    {
-      if (!File.Exists(path))
-      {
-        System.Diagnostics.Debug.WriteLine($"[BitmapCache] File not found: {path}");
-
-        return new SKBitmap();
-      }
-
-      using var stream = File.OpenRead(path);
-      using var codec = SKCodec.Create(stream);
-
-      if (codec == null)
-      {
-        System.Diagnostics.Debug.WriteLine($"[BitmapCache] Failed to create codec for: {path}");
-
-        return new SKBitmap();
-      }
-
-      var info = codec.Info;
-
-      // Calculate scale
-      float scale = 1.0f;
-      if (targetWidth > 0 && targetHeight > 0)
-      {
-        float scaleX = (float)targetWidth / info.Width;
-        float scaleY = (float)targetHeight / info.Height;
-        scale = Math.Min(scaleX, scaleY);
-      }
-
-      if (scale >= 1.0f || (targetWidth == 0 && targetHeight == 0))
-      {
-        return SKBitmap.Decode(codec);
-      }
-
-      // Get supported dimensions for this scale
-      var supportedInfo = codec.GetScaledDimensions(scale);
-
-      // Use the supported dimensions for decoding
-      var decodeInfo = new SKImageInfo(supportedInfo.Width, supportedInfo.Height, info.ColorType, info.AlphaType);
-
-      var bitmap = new SKBitmap(decodeInfo);
-      var result = codec.GetPixels(decodeInfo, bitmap.GetPixels());
-
-      if (result == SKCodecResult.Success || result == SKCodecResult.IncompleteInput)
-      {
-        return bitmap;
-      }
-      else
-      {
-        System.Diagnostics.Debug.WriteLine($"[BitmapCache] GetPixels failed: {result}");
-        bitmap.Dispose();
-        // Fallback: try full decode if downsample fails? 
-        // Or maybe the scale was just invalid. 
-        return new SKBitmap();
-      }
-    }
-    catch (Exception ex)
-    {
-      System.Diagnostics.Debug.WriteLine($"[BitmapCache] Exception loading bitmap: {ex}");
-
-      return new SKBitmap();
-    }
-  }
-
   public void ClearCache()
   {
     foreach (var weakRef in cache.Values)
diff --git a/Logic/Services/IPreferencesService.cs b/Logic/Utils/IPreferencesFacade.cs
similarity index 82%
rename from Logic/Services/IPreferencesService.cs
rename to Logic/Utils/IPreferencesFacade.cs
index 38f17c3..542ef1c 100644
--- a/Logic/Services/IPreferencesService.cs
+++ b/Logic/Utils/IPreferencesFacade.cs
@@ -23,10 +23,14 @@
 
 namespace LunaDraw.Logic.Services;
 
-public interface IPreferencesService
+public interface IPreferencesFacade
 {
-    bool Get(string key, bool defaultValue);
-    void Set(string key, bool value);
-    string Get(string key, string defaultValue);
-    void Set(string key, string value);
+
+  string Get(AppPreference key);
+
+  T Get<T>(AppPreference key);
+
+  void Set(AppPreference key, bool value);
+
+  void Set<T>(AppPreference key, T? value) => Preferences.Set(key.ToString(), value?.ToString());
 }
diff --git a/Logic/Services/PreferencesService.cs b/Logic/Utils/PreferencesFacade.cs
similarity index 54%
rename from Logic/Services/PreferencesService.cs
rename to Logic/Utils/PreferencesFacade.cs
index a7396fc..b6da4c6 100644
--- a/Logic/Services/PreferencesService.cs
+++ b/Logic/Utils/PreferencesFacade.cs
@@ -21,14 +21,43 @@
  *  
  */
 
-using Microsoft.Maui.Storage;
-
 namespace LunaDraw.Logic.Services;
 
-public class PreferencesService : IPreferencesService
+public enum AppPreference
+{
+  AppTheme,
+  ShowButtonLabels,
+  ShowLayersPanel,
+  IsTransparentBackgroundEnabled
+}
+
+public class AppPreferenceDefault
 {
-    public bool Get(string key, bool defaultValue) => Preferences.Get(key, defaultValue);
-    public void Set(string key, bool value) => Preferences.Set(key, value);
-    public string Get(string key, string defaultValue) => Preferences.Get(key, defaultValue);
-    public void Set(string key, string value) => Preferences.Set(key, value);
+  public dynamic this[AppPreference appPreference]
+  {
+    get
+    {
+      return appPreference switch
+      {
+        AppPreference.AppTheme => "Automatic",
+        AppPreference.ShowButtonLabels => false,
+        AppPreference.ShowLayersPanel => false,
+        AppPreference.IsTransparentBackgroundEnabled => false,
+        _ => ""
+      };
+    }
+  }
+}
+
+public class PreferencesFacade : IPreferencesFacade
+{
+  public static AppPreferenceDefault Defaults => new();
+
+  public string Get(AppPreference key) => Preferences.Get(key.ToString(), Defaults[key]);
+
+  public T Get<T>(AppPreference key) => Preferences.Get(key.ToString(), Defaults[key]);
+
+  public void Set(AppPreference key, bool value) => Preferences.Set(key.ToString(), value);
+
+  public void Set<T>(AppPreference key, T? value) => Preferences.Set(key.ToString(), value?.ToString());
 }
diff --git a/Logic/ViewModels/LayerPanelViewModel.cs b/Logic/ViewModels/LayerPanelViewModel.cs
index bb19fc8..29685b1 100644
--- a/Logic/ViewModels/LayerPanelViewModel.cs
+++ b/Logic/ViewModels/LayerPanelViewModel.cs
@@ -37,13 +37,13 @@ public class LayerPanelViewModel : ReactiveObject
 {
   private readonly ILayerFacade layerFacade;
   private readonly IMessageBus messageBus;
-  private readonly IPreferencesService preferencesService;
+  private readonly IPreferencesFacade preferencesFacade;
 
-  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPreferencesService preferencesService)
+  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPreferencesFacade preferencesFacade)
   {
     this.layerFacade = layerFacade;
     this.messageBus = messageBus;
-    this.preferencesService = preferencesService;
+    this.preferencesFacade = preferencesFacade;
 
     layerFacade.WhenAnyValue(x => x.CurrentLayer)
         .Subscribe(_ => this.RaisePropertyChanged(nameof(CurrentLayer)));
@@ -112,12 +112,14 @@ public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPr
       }
       else
       {
-        WindowTransparency = 150;
+        WindowTransparency = 125;
       }
+
+      messageBus.SendMessage(new CanvasInvalidateMessage());
     }, outputScheduler: RxApp.MainThreadScheduler);
 
     // Initialize state from Preferences
-    IsTransparentBackground = preferencesService.Get("IsTransparentBackgroundEnabled", false);
+    IsTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
     if (!IsTransparentBackground)
     {
       windowTransparency = 255;
@@ -139,11 +141,10 @@ public bool IsTransparentBackground
     set
     {
       this.RaiseAndSetIfChanged(ref isTransparentBackground, value);
-      preferencesService.Set("IsTransparentBackgroundEnabled", value);
+      preferencesFacade.Set(AppPreference.IsTransparentBackgroundEnabled, value);
 
       if (!isTransparentBackground)
       {
-
         WindowTransparency = 255;
         UpdateWindowTransparency();
       }
@@ -190,8 +191,6 @@ private void UpdateWindowTransparency()
 #endif
   }
 
-  public bool IsTransparentBackgroundVisible => Config.FeatureFlags.EnableTransparentBackground;
-
   public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }
   public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerForwardCommand { get; }
diff --git a/Logic/ViewModels/MainViewModel.cs b/Logic/ViewModels/MainViewModel.cs
index fb5500f..c448a71 100644
--- a/Logic/ViewModels/MainViewModel.cs
+++ b/Logic/ViewModels/MainViewModel.cs
@@ -48,7 +48,7 @@ public class MainViewModel : ReactiveObject
   public NavigationModel NavigationModel { get; }
   public SelectionObserver SelectionObserver { get; }
   private readonly IMessageBus messageBus;
-  private readonly IPreferencesService preferencesService;
+  private readonly IPreferencesFacade preferencesFacade;
 
   // Sub-ViewModels
   public LayerPanelViewModel LayerPanelVM { get; }
@@ -65,14 +65,14 @@ public class MainViewModel : ReactiveObject
   // UI State
   public List<string> AvailableThemes { get; } = new List<string> { "Automatic", "Light", "Dark" };
 
-  private string selectedTheme;
+  private string selectedTheme = "Automatic";
   public string SelectedTheme
   {
     get => selectedTheme;
     set
     {
       this.RaiseAndSetIfChanged(ref selectedTheme, value);
-      preferencesService.Set("AppTheme", value);
+      preferencesFacade.Set(AppPreference.AppTheme, value);
       UpdateAppTheme(value);
     }
   }
@@ -85,7 +85,7 @@ public bool ShowButtonLabels
     set
     {
       this.RaiseAndSetIfChanged(ref showButtonLabels, value);
-      preferencesService.Set("ShowButtonLabels", value);
+      preferencesFacade.Set(AppPreference.ShowButtonLabels, value);
       messageBus.SendMessage(new ViewOptionsChangedMessage(value, ShowLayersPanel));
     }
   }
@@ -97,7 +97,7 @@ public bool ShowLayersPanel
     set
     {
       this.RaiseAndSetIfChanged(ref showLayersPanel, value);
-      preferencesService.Set("ShowLayersPanel", value);
+      preferencesFacade.Set(AppPreference.ShowLayersPanel, value);
       messageBus.SendMessage(new ViewOptionsChangedMessage(ShowButtonLabels, value));
     }
   }
@@ -118,7 +118,7 @@ public MainViewModel(
     NavigationModel navigationModel,
     SelectionObserver selectionObserver,
     IMessageBus messageBus,
-    IPreferencesService preferencesService,
+    IPreferencesFacade preferencesFacade,
     LayerPanelViewModel layerPanelVM,
     SelectionViewModel selectionVM,
     HistoryViewModel historyVM)
@@ -129,15 +129,15 @@ public MainViewModel(
     NavigationModel = navigationModel;
     SelectionObserver = selectionObserver;
     this.messageBus = messageBus;
-    this.preferencesService = preferencesService;
+    this.preferencesFacade = preferencesFacade;
     LayerPanelVM = layerPanelVM;
     SelectionVM = selectionVM;
     HistoryVM = historyVM;
 
     // Use Property setters to trigger ViewOptionsChangedMessage so ToolbarViewModel syncs up
-    ShowButtonLabels = this.preferencesService.Get("ShowButtonLabels", false);
-    ShowLayersPanel = this.preferencesService.Get("ShowLayersPanel", false);
-    var savedTheme = this.preferencesService.Get("AppTheme", "Automatic");
+    ShowButtonLabels = this.preferencesFacade.Get<bool>(AppPreference.ShowButtonLabels);
+    ShowLayersPanel = this.preferencesFacade.Get<bool>(AppPreference.ShowLayersPanel);
+    var savedTheme = this.preferencesFacade.Get(AppPreference.AppTheme);
     SelectedTheme = AvailableThemes.FirstOrDefault(t => t == savedTheme) ?? AvailableThemes[0];
 
     ZoomInCommand = ReactiveCommand.Create(ZoomIn);
@@ -148,7 +148,11 @@ public MainViewModel(
     this.messageBus.Listen<ShowAdvancedSettingsMessage>().Subscribe(async _ =>
     {
       var popup = new Components.AdvancedSettingsPopup(this);
-      await Application.Current.Windows[0].Page?.ShowPopupAsync(popup);
+      var page = Application.Current?.Windows[0]?.Page;
+      if (page != null)
+      {
+        await page.ShowPopupAsync(popup);
+      }
     });
   }
 
@@ -217,6 +221,8 @@ private void UpdateAppTheme(string theme)
         _ => AppTheme.Unspecified
       };
     }
+
+    messageBus.SendMessage(new CanvasInvalidateMessage());
   }
 
   private void ZoomIn() => Zoom(1.2f);
@@ -232,6 +238,13 @@ private void Zoom(float scaleFactor)
   {
     if (CanvasSize.Width <= 0 || CanvasSize.Height <= 0) return;
 
+    var currentScale = NavigationModel.ViewMatrix.ScaleX;
+    var newScale = currentScale * scaleFactor;
+
+    // Clamp scale
+    if (newScale < 0.1f) scaleFactor = 0.1f / currentScale;
+    if (newScale > 20.0f) scaleFactor = 20.0f / currentScale;
+
     var center = new SKPoint(CanvasSize.Width / 2, CanvasSize.Height / 2);
 
     // Scale around center
diff --git a/Logic/ViewModels/ToolbarViewModel.cs b/Logic/ViewModels/ToolbarViewModel.cs
index 3b25ce6..845393c 100644
--- a/Logic/ViewModels/ToolbarViewModel.cs
+++ b/Logic/ViewModels/ToolbarViewModel.cs
@@ -380,7 +380,7 @@ public ToolbarViewModel(
 
     SelectBrushShapeCommand = ReactiveCommand.Create<BrushShape>(shape =>
     {
-      this.messageBus.SendMessage(new LunaDraw.Logic.Messages.BrushShapeChangedMessage(shape));
+      this.messageBus.SendMessage(new BrushShapeChangedMessage(shape));
       IsBrushesFlyoutOpen = false;
 
       var freehandTool = AvailableTools.FirstOrDefault(t => t.Type == ToolType.Freehand);
diff --git a/MauiProgram.cs b/MauiProgram.cs
index 6b7f18a..2928382 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -87,7 +87,7 @@ public static MauiApp CreateMauiApp()
     builder.Services.AddSingleton<ICanvasInputHandler, CanvasInputHandler>();
     builder.Services.AddSingleton<ClipboardMemento>();
     builder.Services.AddSingleton<IBitmapCache, LunaDraw.Logic.Utils.BitmapCache>();
-    builder.Services.AddSingleton<IPreferencesService, PreferencesService>();
+    builder.Services.AddSingleton<IPreferencesFacade, PreferencesFacade>();
     builder.Services.AddSingleton<IFileSaver>(FileSaver.Default);
 
     // Register ViewModels
diff --git a/Pages/MainPage.xaml.cs b/Pages/MainPage.xaml.cs
index 789b223..f203a6d 100644
--- a/Pages/MainPage.xaml.cs
+++ b/Pages/MainPage.xaml.cs
@@ -21,8 +21,11 @@
  *  
  */
 
+using CommunityToolkit.Maui;
 using LunaDraw.Logic.Messages;
+using LunaDraw.Logic.Services;
 using LunaDraw.Logic.ViewModels;
+using LunaDraw.Logic.Extensions;
 
 using ReactiveUI;
 
@@ -36,16 +39,17 @@ public partial class MainPage : ContentPage
   private readonly MainViewModel viewModel;
   private readonly ToolbarViewModel toolbarViewModel;
   private readonly IMessageBus messageBus;
-
+  private readonly IPreferencesFacade preferencesFacade;
   private MenuFlyout? canvasContextMenu;
   private MenuFlyoutSubItem? moveToLayerSubMenu;
 
-  public MainPage(MainViewModel viewModel, ToolbarViewModel toolbarViewModel, IMessageBus messageBus)
+  public MainPage(MainViewModel viewModel, ToolbarViewModel toolbarViewModel, IMessageBus messageBus, IPreferencesFacade preferencesFacade)
   {
     InitializeComponent();
     this.viewModel = viewModel;
     this.toolbarViewModel = toolbarViewModel;
     this.messageBus = messageBus;
+    this.preferencesFacade = preferencesFacade;
 
     BindingContext = this.viewModel;
     toolbarView.BindingContext = this.toolbarViewModel;
@@ -153,7 +157,7 @@ private void OnCanvasViewPaintSurface(object? sender, SKPaintGLSurfaceEventArgs
     viewModel.NavigationModel.CanvasWidth = width;
     viewModel.NavigationModel.CanvasHeight = height;
 
-    var bgColor = viewModel.LayerPanelVM.IsTransparentBackground ? SKColors.Transparent : SKColors.White;
+    var bgColor = preferencesFacade.GetCanvasBackgroundColor(viewModel.LayerPanelVM.IsTransparentBackground);
     canvas.Clear(bgColor);
 
     if (viewModel == null) return;
@@ -190,7 +194,7 @@ private void OnCanvasViewPaintSurface(object? sender, SKPaintGLSurfaceEventArgs
           canvas.SaveLayer();
           layer.Draw(canvas);
 
-          using (var paint = new SKPaint { BlendMode = SKBlendMode.SrcATop })
+          using (var paint = new SKPaint { BlendMode = SKBlendMode.SrcATop, IsAntialias = true })
           {
             for (int j = i + 1; j < layers.Count; j++)
             {
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
index ac469f8..031fd34 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
@@ -236,7 +236,7 @@ public void ProcessTouch_MultiTouchStarts_ShouldCallActiveToolOnTouchCancelled()
         }
 
         [Fact]
-        public void ProcessTouch_TwoFingersPan_ShouldUpdateNavigationModelUserMatrixTranslation()
+        public void ProcessTouch_TwoFingersPan_ShouldUpdateNavigationModelUserMatrixTranslationX()
         {
             // Arrange
             var initialMatrix = navigationModel.ViewMatrix;
@@ -257,12 +257,36 @@ public void ProcessTouch_TwoFingersPan_ShouldUpdateNavigationModelUserMatrixTran
 
             // Assert
             var finalMatrix = navigationModel.ViewMatrix;
-            Assert.True(Math.Abs(finalMatrix.TransX - 2.7252297f) < 0.001f);
-            Assert.True(Math.Abs(finalMatrix.TransY - 2.3001537f) < 0.001f);
+            Assert.Equal(1.9f, finalMatrix.TransX, 0.001f);
         }
 
         [Fact]
-        public void ProcessTouch_TwoFingersPinchZoom_ShouldUpdateNavigationModelUserMatrixScale()
+        public void ProcessTouch_TwoFingersPan_ShouldUpdateNavigationModelUserMatrixTranslationY()
+        {
+            // Arrange
+            var initialMatrix = navigationModel.ViewMatrix;
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            // Simulate two fingers pressed
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            // Move both fingers in parallel
+            var touch1Move = new SKPoint(110, 110);
+            var touch2Move = new SKPoint(210, 110);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalMatrix = navigationModel.ViewMatrix;
+            Assert.Equal(3.7f, finalMatrix.TransY, 0.001f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersPinchZoom_ShouldUpdateNavigationModelUserMatrixScaleX()
         {
             // Arrange
             var initialMatrix = navigationModel.ViewMatrix;
@@ -283,8 +307,32 @@ public void ProcessTouch_TwoFingersPinchZoom_ShouldUpdateNavigationModelUserMatr
 
             // Assert
             var finalMatrix = navigationModel.ViewMatrix;
-            Assert.True(Math.Abs(finalMatrix.ScaleX - (initialMatrix.ScaleX + (initialMatrix.ScaleX * 0.5f * SmoothingFactor))) < 0.1f);
-            Assert.True(Math.Abs(finalMatrix.ScaleY - (initialMatrix.ScaleY + (initialMatrix.ScaleY * 0.5f * SmoothingFactor))) < 0.1f);
+            Assert.Equal(initialMatrix.ScaleX + (initialMatrix.ScaleX * 0.5f * SmoothingFactor), finalMatrix.ScaleX, 0.1f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersPinchZoom_ShouldUpdateNavigationModelUserMatrixScaleY()
+        {
+            // Arrange
+            var initialMatrix = navigationModel.ViewMatrix;
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            // Simulate two fingers pressed
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            // Simulate pinch out (increase distance)
+            var touch1Move = new SKPoint(75, 100);
+            var touch2Move = new SKPoint(225, 100);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalMatrix = navigationModel.ViewMatrix;
+            Assert.Equal(initialMatrix.ScaleY + (initialMatrix.ScaleY * 0.5f * SmoothingFactor), finalMatrix.ScaleY, 0.1f);
         }
 
         [Fact]
@@ -310,11 +358,35 @@ public void ProcessTouch_TwoFingersRotate_ShouldUpdateNavigationModelUserMatrixR
             // Assert
             var finalMatrix = navigationModel.ViewMatrix;
             Assert.NotEqual(initialMatrix, finalMatrix);
-            Assert.True(Math.Abs(finalMatrix.ScaleX - initialMatrix.ScaleX) < 0.1f);
         }
 
         [Fact]
-        public void ProcessTouch_TwoFingersPanSelectedElements_ShouldUpdateElementTransformMatrix()
+        public void ProcessTouch_TwoFingersRotate_ShouldNotChangeScale()
+        {
+            // Arrange
+            var initialMatrix = navigationModel.ViewMatrix;
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            // Simulate two fingers pressed
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            // Simulate rotation
+            var touch1Move = new SKPoint(100, 50);
+            var touch2Move = new SKPoint(200, 150);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalMatrix = navigationModel.ViewMatrix;
+            Assert.Equal(initialMatrix.ScaleX, finalMatrix.ScaleX, 0.1f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersPanSelectedElements_ShouldUpdateElementTransformMatrixX()
         {
             // Arrange
             mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
@@ -347,12 +419,48 @@ public void ProcessTouch_TwoFingersPanSelectedElements_ShouldUpdateElementTransf
 
             // Assert
             var finalElementMatrix = mockElement.Object.TransformMatrix;
-            Assert.True(Math.Abs(finalElementMatrix.TransX - 2.7252297f) < 0.001f);
-            Assert.True(Math.Abs(finalElementMatrix.TransY - 2.3001537f) < 0.001f);
+            Assert.Equal(1.9f, finalElementMatrix.TransX, 0.001f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersPanSelectedElements_ShouldUpdateElementTransformMatrixY()
+        {
+            // Arrange
+            mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
+            mockLayerFacade.Setup(m => m.CurrentLayer).Returns(new Layer { IsLocked = false });
+
+            var mockElement = new Mock<IDrawableElement>();
+            mockElement.SetupProperty(e => e.TransformMatrix);
+            mockElement.Object.TransformMatrix = SKMatrix.CreateIdentity();
+            mockElement.Setup(e => e.HitTest(It.IsAny<SKPoint>())).Returns(true);
+            selectionObserver.Add(mockElement.Object);
+
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            var initialElementMatrix = mockElement.Object.TransformMatrix;
+
+            // Move both fingers in parallel
+            var touch1Move = new SKPoint(110, 110);
+            var touch2Move = new SKPoint(210, 110);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalElementMatrix = mockElement.Object.TransformMatrix;
+            Assert.Equal(3.7f, finalElementMatrix.TransY, 0.001f);
         }
 
         [Fact]
-        public void ProcessTouch_TwoFingersPinchZoomSelectedElements_ShouldUpdateElementTransformMatrix()
+        public void ProcessTouch_TwoFingersPinchZoomSelectedElements_ShouldUpdateElementTransformMatrixX()
         {
             // Arrange
             mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
@@ -385,12 +493,48 @@ public void ProcessTouch_TwoFingersPinchZoomSelectedElements_ShouldUpdateElement
 
             // Assert
             var finalElementMatrix = mockElement.Object.TransformMatrix;
-            Assert.True(Math.Abs(finalElementMatrix.ScaleX - (initialElementMatrix.ScaleX + (initialElementMatrix.ScaleX * 0.5f * SmoothingFactor))) < 0.1f);
-            Assert.True(Math.Abs(finalElementMatrix.ScaleY - (initialElementMatrix.ScaleY + (initialElementMatrix.ScaleY * 0.5f * SmoothingFactor))) < 0.1f);
+            Assert.Equal(initialElementMatrix.ScaleX + (initialElementMatrix.ScaleX * 0.5f * SmoothingFactor), finalElementMatrix.ScaleX, 0.1f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersPinchZoomSelectedElements_ShouldUpdateElementTransformMatrixY()
+        {
+            // Arrange
+            mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
+            mockLayerFacade.Setup(m => m.CurrentLayer).Returns(new Layer { IsLocked = false });
+
+            var mockElement = new Mock<IDrawableElement>();
+            mockElement.SetupProperty(e => e.TransformMatrix);
+            mockElement.Object.TransformMatrix = SKMatrix.CreateIdentity();
+            mockElement.Setup(e => e.HitTest(It.IsAny<SKPoint>())).Returns(true);
+            selectionObserver.Add(mockElement.Object);
+
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            var initialElementMatrix = mockElement.Object.TransformMatrix;
+
+            // Simulate pinch out (increase distance)
+            var touch1Move = new SKPoint(75, 100);
+            var touch2Move = new SKPoint(225, 100);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalElementMatrix = mockElement.Object.TransformMatrix;
+            Assert.Equal(initialElementMatrix.ScaleY + (initialElementMatrix.ScaleY * 0.5f * SmoothingFactor), finalElementMatrix.ScaleY, 0.1f);
         }
 
         [Fact]
-        public void ProcessTouch_TwoFingersRotateSelectedElements_ShouldUpdateElementTransformMatrix()
+        public void ProcessTouch_TwoFingersRotateSelectedElements_ShouldUpdateElementTransformMatrixRotation()
         {
             // Arrange
             mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
@@ -424,9 +568,80 @@ public void ProcessTouch_TwoFingersRotateSelectedElements_ShouldUpdateElementTra
             // Assert
             var finalElementMatrix = mockElement.Object.TransformMatrix;
             Assert.NotEqual(initialElementMatrix, finalElementMatrix);
-            Assert.True(Math.Abs(finalElementMatrix.ScaleX - initialElementMatrix.ScaleX) < 0.1f);
-            Assert.True(Math.Abs(finalElementMatrix.ScaleY - initialElementMatrix.ScaleY) < 0.1f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersRotateSelectedElements_ShouldNotChangeScaleX()
+        {
+            // Arrange
+            mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
+            mockLayerFacade.Setup(m => m.CurrentLayer).Returns(new Layer { IsLocked = false });
+
+            var mockElement = new Mock<IDrawableElement>();
+            mockElement.SetupProperty(e => e.TransformMatrix);
+            mockElement.Object.TransformMatrix = SKMatrix.CreateIdentity();
+            mockElement.Setup(e => e.HitTest(It.IsAny<SKPoint>())).Returns(true);
+            selectionObserver.Add(mockElement.Object);
+
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            var initialElementMatrix = mockElement.Object.TransformMatrix;
+
+            // Simulate rotation
+            var touch1Move = new SKPoint(100, 50);
+            var touch2Move = new SKPoint(200, 150);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalElementMatrix = mockElement.Object.TransformMatrix;
+            Assert.Equal(initialElementMatrix.ScaleX, finalElementMatrix.ScaleX, 0.1f);
+        }
+
+        [Fact]
+        public void ProcessTouch_TwoFingersRotateSelectedElements_ShouldNotChangeScaleY()
+        {
+            // Arrange
+            mockDrawingTool.Setup(t => t.Type).Returns(ToolType.Select);
+            mockLayerFacade.Setup(m => m.CurrentLayer).Returns(new Layer { IsLocked = false });
 
+            var mockElement = new Mock<IDrawableElement>();
+            mockElement.SetupProperty(e => e.TransformMatrix);
+            mockElement.Object.TransformMatrix = SKMatrix.CreateIdentity();
+            mockElement.Setup(e => e.HitTest(It.IsAny<SKPoint>())).Returns(true);
+            selectionObserver.Add(mockElement.Object);
+
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+            navigationModel.ViewMatrix = SKMatrix.CreateIdentity();
+
+            var touch1Start = new SKPoint(100, 100);
+            var touch2Start = new SKPoint(200, 100);
+
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Pressed, touch1Start, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Pressed, touch2Start, true), SKRect.Empty);
+
+            var initialElementMatrix = mockElement.Object.TransformMatrix;
+
+            // Simulate rotation
+            var touch1Move = new SKPoint(100, 50);
+            var touch2Move = new SKPoint(200, 150);
+
+            // Act
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(1, SKTouchAction.Moved, touch1Move, true), SKRect.Empty);
+            canvasInputHandler.ProcessTouch(new SKTouchEventArgs(2, SKTouchAction.Moved, touch2Move, true), SKRect.Empty);
+
+            // Assert
+            var finalElementMatrix = mockElement.Object.TransformMatrix;
+            Assert.Equal(initialElementMatrix.ScaleY, finalElementMatrix.ScaleY, 0.1f);
         }
     }
 }
diff --git a/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs b/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
index 2e5a194..c4ecc33 100644
--- a/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
+++ b/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
@@ -36,111 +36,111 @@
 
 namespace LunaDraw.Tests
 {
-    public class LayerPanelViewModelTests
+  public class LayerPanelViewModelTests
+  {
+    private readonly Mock<IMessageBus> mockBus;
+    private readonly Mock<IPreferencesFacade> mockPreferences;
+    private readonly LayerFacade layerFacade;
+    private readonly LayerPanelViewModel viewModel;
+    private readonly Subject<DrawingStateChangedMessage> drawingStateSubject;
+
+    public LayerPanelViewModelTests()
     {
-        private readonly Mock<IMessageBus> mockBus;
-        private readonly Mock<IPreferencesService> mockPreferences;
-        private readonly LayerFacade layerFacade;
-        private readonly LayerPanelViewModel viewModel;
-        private readonly Subject<DrawingStateChangedMessage> drawingStateSubject;
-
-        public LayerPanelViewModelTests()
-        {
-            mockBus = new Mock<IMessageBus>();
-            mockPreferences = new Mock<IPreferencesService>();
-            
-            // Mock preferences to return true by default for tests or match existing expectations
-            mockPreferences.Setup(p => p.Get(It.IsAny<string>(), It.IsAny<bool>())).Returns((string key, bool def) => 
-            {
-                if (key == "IsTransparentBackgroundEnabled") return true;
-                return def;
-            });
-            
-            drawingStateSubject = new Subject<DrawingStateChangedMessage>();
-            mockBus.Setup(x => x.Listen<DrawingStateChangedMessage>()).Returns(drawingStateSubject);
-
-            layerFacade = new LayerFacade(mockBus.Object);
-            viewModel = new LayerPanelViewModel(layerFacade, mockBus.Object, mockPreferences.Object);
-        }
-
-        [Fact]
-        public void AddLayer_ShouldUpdateCurrentLayerInViewModel()
-        {
-            // Act
-            viewModel.AddLayerCommand.Execute().Subscribe();
-
-            // Assert
-            Assert.Equal(2, layerFacade.Layers.Count);
-            Assert.Equal("Layer 2", viewModel.CurrentLayer?.Name);
-        }
-
-        [Fact]
-        public void RemoveLayer_ShouldUseCorrectCurrentLayer_AfterAdd()
-        {
-            // Arrange
-            viewModel.AddLayerCommand.Execute().Subscribe(); // Adds Layer 2, sets as Current
-
-            Assert.Equal("Layer 2", viewModel.CurrentLayer?.Name);
-
-            // Act
-            // Execute parameterless command
-            viewModel.RemoveLayerCommand.Execute().Subscribe();
-
-            // Assert
-            Assert.Single(layerFacade.Layers);
-            Assert.Equal("Layer 1", viewModel.CurrentLayer?.Name);
-        }
-
-        [Fact]
-        public void RemoveLayer_ShouldBeDisabled_WhenOneLayer()
-        {
-            // Arrange
-            // Only Layer 1 exists initially
-
-            // Act
-            bool canExecute = viewModel.RemoveLayerCommand.CanExecute.FirstAsync().Wait();
-
-            // Assert
-            Assert.False(canExecute);
-        }
-
-        [Fact]
-        public void RemoveLayer_ShouldBeEnabled_WhenTwoLayers()
-        {
-            // Arrange
-            viewModel.AddLayerCommand.Execute().Subscribe();
-
-            // Act
-            bool canExecute = viewModel.RemoveLayerCommand.CanExecute.FirstAsync().Wait();
-
-            // Assert
-            Assert.True(canExecute);
-        }
-
-        [Fact]
-        public void IsTransparentBackground_ShouldToggleAndInvalidateCanvas()
-        {
-            // Arrange
-            var invalidationCount = 0;
-            mockBus.Setup(x => x.SendMessage(It.IsAny<CanvasInvalidateMessage>(), It.IsAny<string>()))
-                   .Callback<CanvasInvalidateMessage, string>((_, __) => invalidationCount++);
-            
-            // Initial state check (defaults to true)
-            Assert.True(viewModel.IsTransparentBackground);
-
-            // Act
-            viewModel.IsTransparentBackground = false;
-
-            // Assert
-            Assert.False(viewModel.IsTransparentBackground);
-            Assert.Equal(1, invalidationCount);
-
-            // Act 2
-            viewModel.IsTransparentBackground = true;
-
-            // Assert
-            Assert.True(viewModel.IsTransparentBackground);
-            Assert.Equal(2, invalidationCount);
-        }
+      mockBus = new Mock<IMessageBus>();
+      mockPreferences = new Mock<IPreferencesFacade>();
+
+      // Mock preferences to return true by default for tests or match existing expectations
+      mockPreferences.Setup(p => p.Get<bool>(It.IsAny<AppPreference>())).Returns((AppPreference key) =>
+      {
+        if (key == AppPreference.IsTransparentBackgroundEnabled) return true;
+        return false;
+      });
+
+      drawingStateSubject = new Subject<DrawingStateChangedMessage>();
+      mockBus.Setup(x => x.Listen<DrawingStateChangedMessage>()).Returns(drawingStateSubject);
+
+      layerFacade = new LayerFacade(mockBus.Object);
+      viewModel = new LayerPanelViewModel(layerFacade, mockBus.Object, mockPreferences.Object);
+    }
+
+    [Fact]
+    public void AddLayer_ShouldUpdateCurrentLayerInViewModel()
+    {
+      // Act
+      viewModel.AddLayerCommand.Execute().Subscribe();
+
+      // Assert
+      Assert.Equal(2, layerFacade.Layers.Count);
+      Assert.Equal("Layer 2", viewModel.CurrentLayer?.Name);
+    }
+
+    [Fact]
+    public void RemoveLayer_ShouldUseCorrectCurrentLayer_AfterAdd()
+    {
+      // Arrange
+      viewModel.AddLayerCommand.Execute().Subscribe(); // Adds Layer 2, sets as Current
+
+      Assert.Equal("Layer 2", viewModel.CurrentLayer?.Name);
+
+      // Act
+      // Execute parameterless command
+      viewModel.RemoveLayerCommand.Execute().Subscribe();
+
+      // Assert
+      Assert.Single(layerFacade.Layers);
+      Assert.Equal("Layer 1", viewModel.CurrentLayer?.Name);
+    }
+
+    [Fact]
+    public void RemoveLayer_ShouldBeDisabled_WhenOneLayer()
+    {
+      // Arrange
+      // Only Layer 1 exists initially
+
+      // Act
+      bool canExecute = viewModel.RemoveLayerCommand.CanExecute.FirstAsync().Wait();
+
+      // Assert
+      Assert.False(canExecute);
+    }
+
+    [Fact]
+    public void RemoveLayer_ShouldBeEnabled_WhenTwoLayers()
+    {
+      // Arrange
+      viewModel.AddLayerCommand.Execute().Subscribe();
+
+      // Act
+      bool canExecute = viewModel.RemoveLayerCommand.CanExecute.FirstAsync().Wait();
+
+      // Assert
+      Assert.True(canExecute);
+    }
+
+    [Fact]
+    public void IsTransparentBackground_ShouldToggleAndInvalidateCanvas()
+    {
+      // Arrange
+      var invalidationCount = 0;
+      mockBus.Setup(x => x.SendMessage(It.IsAny<CanvasInvalidateMessage>(), It.IsAny<string>()))
+             .Callback<CanvasInvalidateMessage, string>((_, __) => invalidationCount++);
+
+      // Initial state check (defaults to true)
+      Assert.True(viewModel.IsTransparentBackground);
+
+      // Act
+      viewModel.IsTransparentBackground = false;
+
+      // Assert
+      Assert.False(viewModel.IsTransparentBackground);
+      Assert.Equal(1, invalidationCount);
+
+      // Act 2
+      viewModel.IsTransparentBackground = true;
+
+      // Assert
+      Assert.True(viewModel.IsTransparentBackground);
+      Assert.Equal(2, invalidationCount);
     }
+  }
 }
diff --git a/tests/LunaDraw.Tests/MainViewModelTests.cs b/tests/LunaDraw.Tests/MainViewModelTests.cs
index d2b4b8a..7faa92f 100644
--- a/tests/LunaDraw.Tests/MainViewModelTests.cs
+++ b/tests/LunaDraw.Tests/MainViewModelTests.cs
@@ -70,11 +70,11 @@ public MainViewModelTests()
       layerFacadeMock.Setup(m => m.Layers).Returns(layers);
       layerFacadeMock.Setup(m => m.HistoryMemento).Returns(historyMemento);
 
-      var preferencesServiceMock = new Mock<IPreferencesService>();
+      var preferencesFacadeMock = new Mock<IPreferencesFacade>();
 
       // Create Sub-VMs (we can test them in isolation, but here we test MainVM integration)
       // Using real instances for VM logic
-      layerPanelVM = new LayerPanelViewModel(layerFacadeMock.Object, messageBusMock.Object, preferencesServiceMock.Object);
+      layerPanelVM = new LayerPanelViewModel(layerFacadeMock.Object, messageBusMock.Object, preferencesFacadeMock.Object);
       selectionVM = new SelectionViewModel(selectionObserver, layerFacadeMock.Object, new ClipboardMemento(), messageBusMock.Object);
       historyVM = new HistoryViewModel(layerFacadeMock.Object, messageBusMock.Object);
 
@@ -94,7 +94,7 @@ public MainViewModelTests()
           navigationModel,
           new Mock<IFileSaver>().Object
       );
-      
+
       // Setup property change notifications for ToolStateManager
       mockToolbarViewModel.As<System.ComponentModel.INotifyPropertyChanged>();
 
@@ -105,7 +105,7 @@ public MainViewModelTests()
           navigationModel,
           selectionObserver,
           messageBusMock.Object,
-          preferencesServiceMock.Object,
+          preferencesFacadeMock.Object,
           layerPanelVM,
           selectionVM,
           historyVM

From c48f853beb9263e9a71a15a1e7deda47fbfac853 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Sun, 14 Dec 2025 23:21:45 -0500
Subject: [PATCH 7/9] active tool style fix

---
 Components/ToolbarView.xaml                   | 24 ++++++++
 .../IsToolActiveConverterTests.cs             | 57 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 tests/LunaDraw.Tests/IsToolActiveConverterTests.cs

diff --git a/Components/ToolbarView.xaml b/Components/ToolbarView.xaml
index b836349..0315c81 100644
--- a/Components/ToolbarView.xaml
+++ b/Components/ToolbarView.xaml
@@ -77,6 +77,12 @@
                   <Setter Property="BackgroundColor"
                           Value="{StaticResource Secondary}"/>
                 </DataTrigger>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='SelectTool'}"
+                             Value="False">
+                  <Setter Property="BackgroundColor"
+                          Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                </DataTrigger>
               </Button.Triggers>
             </Button>
             <Label Text="{Binding AvailableTools[0].Name}"
@@ -112,6 +118,12 @@
                   <Setter Property="BackgroundColor"
                           Value="{StaticResource Secondary}"/>
                 </DataTrigger>
+                <DataTrigger TargetType="Border"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='FreehandTool'}"
+                             Value="False">
+                  <Setter Property="BackgroundColor"
+                          Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                </DataTrigger>
               </Border.Triggers>
               <local:BrushPreviewControl BrushShape="{Binding CurrentBrushShape}"
                                          StrokeColor="{Binding StrokeColor}"
@@ -141,6 +153,12 @@
                   <Setter Property="BackgroundColor"
                           Value="{StaticResource Secondary}"/>
                 </DataTrigger>
+                <DataTrigger TargetType="Border"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='Shapes'}"
+                             Value="False">
+                  <Setter Property="BackgroundColor"
+                          Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                </DataTrigger>
               </Border.Triggers>
               <local:ShapePreviewControl ActiveTool="{Binding LastActiveShapeTool}"
                                          StrokeColor="{Binding StrokeColor}"
@@ -190,6 +208,12 @@
                   <Setter Property="BackgroundColor"
                           Value="{StaticResource Secondary}"/>
                 </DataTrigger>
+                <DataTrigger TargetType="Button"
+                             Binding="{Binding ActiveTool, Converter={StaticResource IsToolActiveConverter}, ConverterParameter='EraserBrushTool'}"
+                             Value="False">
+                  <Setter Property="BackgroundColor"
+                          Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray700}}"/>
+                </DataTrigger>
               </Button.Triggers>
             </Button>
             <Label Text="{Binding AvailableTools[6].Name}"
diff --git a/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs b/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs
new file mode 100644
index 0000000..78cb326
--- /dev/null
+++ b/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs
@@ -0,0 +1,57 @@
+using System.Globalization;
+using LunaDraw.Converters;
+using LunaDraw.Logic.Tools;
+using Moq;
+using Xunit;
+
+namespace LunaDraw.Tests
+{
+    public class IsToolActiveConverterTests
+    {
+        [Fact]
+        public void Convert_ReturnsTrue_WhenToolMatches()
+        {
+            var converter = new IsToolActiveConverter();
+            var mockTool = new Mock<IDrawingTool>();
+            // We can't easily mock GetType().Name without a real class, so let's use a real one or subclass.
+            var tool = new SelectTool(null); 
+
+            var result = converter.Convert(tool, typeof(bool), "SelectTool", CultureInfo.InvariantCulture);
+
+            Assert.True((bool)result);
+        }
+
+        [Fact]
+        public void Convert_ReturnsFalse_WhenToolDoesNotMatch()
+        {
+            var converter = new IsToolActiveConverter();
+            var tool = new SelectTool(null);
+
+            var result = converter.Convert(tool, typeof(bool), "FreehandTool", CultureInfo.InvariantCulture);
+
+            Assert.False((bool)result);
+        }
+
+        [Fact]
+        public void Convert_ReturnsTrue_ForShapesGroup()
+        {
+            var converter = new IsToolActiveConverter();
+            var tool = new RectangleTool(null);
+
+            var result = converter.Convert(tool, typeof(bool), "Shapes", CultureInfo.InvariantCulture);
+
+            Assert.True((bool)result);
+        }
+
+        [Fact]
+        public void Convert_ReturnsFalse_ForShapesGroup_WhenNotShape()
+        {
+            var converter = new IsToolActiveConverter();
+            var tool = new SelectTool(null);
+
+            var result = converter.Convert(tool, typeof(bool), "Shapes", CultureInfo.InvariantCulture);
+
+            Assert.False((bool)result);
+        }
+    }
+}

From 245f289d55f1123f0d9f7cd052d1c0b6249841d7 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Mon, 15 Dec 2025 00:13:39 -0500
Subject: [PATCH 8/9] remove AI slop

---
 App.xaml.cs                                   |  2 +-
 Components/MiniMapView.xaml.cs                | 41 +++------
 Components/SettingsFlyoutPanel.xaml.cs        | 73 +++++++---------
 Logic/Extensions/PreferencesExtensions.cs     | 29 ++++---
 Logic/Handlers/CanvasInputHandler.cs          | 10 +--
 Logic/Handlers/ICanvasInputHandler.cs         |  2 +-
 Logic/Tools/EraserBrushTool.cs                |  5 +-
 Logic/Utils/IPreferencesFacade.cs             |  2 +-
 Logic/Utils/PreferencesFacade.cs              |  2 +-
 Logic/ViewModels/LayerPanelViewModel.cs       | 85 +------------------
 Logic/ViewModels/MainViewModel.cs             | 82 +++++++++++++++++-
 MauiProgram.cs                                |  3 +-
 Pages/MainPage.xaml.cs                        |  4 +-
 .../CanvasInputHandlerRobustTests.cs          |  1 -
 .../LunaDraw.Tests/CanvasInputHandlerTests.cs |  1 -
 tests/LunaDraw.Tests/FreehandToolTests.cs     |  1 -
 .../LayerPanelViewModelTests.cs               |  1 -
 .../LunaDraw.Tests/LayerStateManagerTests.cs  |  1 -
 tests/LunaDraw.Tests/MainViewModelTests.cs    |  1 -
 tests/LunaDraw.Tests/ShapeToolsTests.cs       |  1 -
 20 files changed, 158 insertions(+), 189 deletions(-)

diff --git a/App.xaml.cs b/App.xaml.cs
index 01aa7db..fc4f826 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -21,7 +21,7 @@
  *  
  */
 
-using LunaDraw.Logic.Services;
+using LunaDraw.Logic.Utils;
 
 namespace LunaDraw;
 
diff --git a/Components/MiniMapView.xaml.cs b/Components/MiniMapView.xaml.cs
index 28e4d19..04e0d1c 100644
--- a/Components/MiniMapView.xaml.cs
+++ b/Components/MiniMapView.xaml.cs
@@ -25,7 +25,7 @@
 
 using LunaDraw.Logic.Extensions;
 using LunaDraw.Logic.Messages;
-using LunaDraw.Logic.Services;
+using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.ViewModels;
 
 using ReactiveUI;
@@ -38,44 +38,27 @@ namespace LunaDraw.Components;
 
 public partial class MiniMapView : ContentView
 {
+  private readonly IMessageBus? messageBus;
+  private readonly IPreferencesFacade? preferencesFacade;
   private MainViewModel? viewModel;
   private SKMatrix fitMatrix;
   private float density = 1.0f;
 
-  private IMessageBus? messageBus;
-  private IMessageBus? MessageBus
-  {
-    get
-    {
-      if (messageBus != null) return messageBus;
-      messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
-                   ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
-      return messageBus;
-    }
-  }
-
-  private IPreferencesFacade? preferencesFacade;
-  private IPreferencesFacade? PreferencesFacade
-  {
-    get
-    {
-      if (preferencesFacade != null) return preferencesFacade;
-      preferencesFacade = Handler?.MauiContext?.Services.GetService<IPreferencesFacade>()
-                   ?? IPlatformApplication.Current?.Services.GetService<IPreferencesFacade>();
-      return preferencesFacade;
-    }
-  }
-
   public MiniMapView()
   {
     InitializeComponent();
 
-    this.Loaded += (s, e) =>
+    Loaded += (s, e) =>
     {
-      MessageBus?.Listen<CanvasInvalidateMessage>()
+      messageBus?.Listen<CanvasInvalidateMessage>()
           .Throttle(TimeSpan.FromMilliseconds(30), RxApp.MainThreadScheduler)
           .Subscribe(_ => miniMapCanvas?.InvalidateSurface());
     };
+
+    this.messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
+                 ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
+    this.preferencesFacade = Handler?.MauiContext?.Services.GetService<IPreferencesFacade>()
+                 ?? IPlatformApplication.Current?.Services.GetService<IPreferencesFacade>();
   }
 
   protected override void OnBindingContextChanged()
@@ -97,7 +80,7 @@ private void OnPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
       density = (float)(info.Width / view.Width);
     }
 
-    var bgColor = PreferencesFacade?.GetCanvasBackgroundColor(viewModel.LayerPanelVM.IsTransparentBackground) ?? SKColors.White;
+    var bgColor = preferencesFacade?.GetCanvasBackgroundColor() ?? SKColors.White;
     canvas.Clear(bgColor);
 
     // Calculate bounds of all elements
@@ -232,7 +215,7 @@ private void OnTouch(object? sender, SKTouchEventArgs e)
           var translation = SKMatrix.CreateTranslation(delta.X, delta.Y);
           viewModel.NavigationModel.ViewMatrix = viewModel.NavigationModel.ViewMatrix.PostConcat(translation);
 
-          MessageBus?.SendMessage(new CanvasInvalidateMessage());
+          messageBus?.SendMessage(new CanvasInvalidateMessage());
         }
         e.Handled = true;
         break;
diff --git a/Components/SettingsFlyoutPanel.xaml.cs b/Components/SettingsFlyoutPanel.xaml.cs
index 109700b..765f3d6 100644
--- a/Components/SettingsFlyoutPanel.xaml.cs
+++ b/Components/SettingsFlyoutPanel.xaml.cs
@@ -79,25 +79,16 @@ public partial class SettingsFlyoutPanel : ContentView
           typeof(SettingsFlyoutPanel),
           0.25f,
           propertyChanged: OnSpacingPropertyChanged);
-
-  private bool suppressEvents;
-
   private IMessageBus? messageBus;
-  private IMessageBus? MessageBus
-  {
-    get
-    {
-      if (messageBus != null) return messageBus;
-      messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
-                   ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
-      return messageBus;
-    }
-  }
+  private bool suppressEvents;
 
   public SettingsFlyoutPanel()
   {
     InitializeComponent();
-    this.Loaded += OnSettingsFlyoutPanelLoaded;
+    Loaded += OnSettingsFlyoutPanelLoaded;
+
+    messageBus = Handler?.MauiContext?.Services.GetService<IMessageBus>()
+                 ?? IPlatformApplication.Current?.Services.GetService<IMessageBus>();
   }
 
   private void OnSettingsFlyoutPanelLoaded(object? sender, EventArgs e)
@@ -168,8 +159,8 @@ private static void OnStrokeColorPropertyChanged(BindableObject bindable, object
       var panel = (SettingsFlyoutPanel)bindable;
       if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is SKColor color)
       {
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeColor: color));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(strokeColor: color));
         if (panel.StrokeColorPicker != null)
           panel.StrokeColorPicker.PickedColor = SKColorToMauiColor(color);
       }
@@ -185,8 +176,8 @@ private static void OnFillColorPropertyChanged(BindableObject bindable, object o
       if (panel.BindingContext is ToolbarViewModel toolbarViewModel)
       {
         var fill = newValue as SKColor?;
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(fillColor: fill));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(fillColor: fill));
         if (newValue is SKColor fillColor && panel.FillColorPicker != null)
           panel.FillColorPicker.PickedColor = SKColorToMauiColor(fillColor);
       }
@@ -201,8 +192,8 @@ private static void OnTransparencyPropertyChanged(BindableObject bindable, objec
       var panel = (SettingsFlyoutPanel)bindable;
       if (panel.BindingContext is ToolbarViewModel toolbarViewModel && newValue is byte transparency)
       {
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
         if (panel.TransparencySlider != null)
           panel.TransparencySlider.Value = transparency;
       }
@@ -217,8 +208,8 @@ private static void OnSizePropertyChanged(BindableObject bindable, object oldVal
       var panel = (SettingsFlyoutPanel)bindable;
       if (panel.BindingContext is ToolbarViewModel && newValue is float size)
       {
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
         if (panel.SizeSlider != null)
           panel.SizeSlider.Value = size;
       }
@@ -233,8 +224,8 @@ private static void OnFlowPropertyChanged(BindableObject bindable, object oldVal
       var panel = (SettingsFlyoutPanel)bindable;
       if (panel.BindingContext is ToolbarViewModel && newValue is byte flow)
       {
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(flow: flow));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(flow: flow));
         if (panel.FlowSlider != null)
           panel.FlowSlider.Value = flow;
       }
@@ -249,8 +240,8 @@ private static void OnSpacingPropertyChanged(BindableObject bindable, object old
       var panel = (SettingsFlyoutPanel)bindable;
       if (panel.BindingContext is ToolbarViewModel && newValue is float spacing)
       {
-        if (panel.MessageBus != null)
-          panel.MessageBus.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
+        if (panel.messageBus != null)
+          panel.messageBus.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
         if (panel.SpacingSlider != null)
           panel.SpacingSlider.Value = spacing;
       }
@@ -263,7 +254,7 @@ private void OnStrokeColorChanged(object sender, EventArgs e)
     if (sender is Maui.ColorPicker.ColorPicker colorPicker)
     {
       var strokeColor = MauiColorToSKColor(colorPicker.PickedColor);
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(strokeColor: strokeColor));
+      messageBus?.SendMessage(new BrushSettingsChangedMessage(strokeColor: strokeColor));
     }
   }
 
@@ -274,32 +265,32 @@ private void OnFillColorChanged(object sender, EventArgs e)
     if (sender is Maui.ColorPicker.ColorPicker colorPicker)
     {
       var fillColor = MauiColorToSKColor(colorPicker.PickedColor);
-      MessageBus?.SendMessage(new BrushSettingsChangedMessage(fillColor: fillColor));
+      messageBus?.SendMessage(new BrushSettingsChangedMessage(fillColor: fillColor));
     }
   }
 
   private void OnTransparencyChanged(object sender, ValueChangedEventArgs e)
   {
     var transparency = (byte)e.NewValue;
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(transparency: transparency));
   }
 
   private void OnSizeChanged(object sender, ValueChangedEventArgs e)
   {
     var size = (float)e.NewValue;
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(strokeWidth: size));
   }
 
   private void OnFlowChanged(object sender, ValueChangedEventArgs e)
   {
     var flow = (byte)e.NewValue;
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(flow: flow));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(flow: flow));
   }
 
   private void OnSpacingChanged(object sender, ValueChangedEventArgs e)
   {
     var spacing = (float)e.NewValue;
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(spacing: spacing));
   }
 
   private void OnNoFillClicked(object sender, EventArgs e)
@@ -313,7 +304,7 @@ private void OnNoFillClicked(object sender, EventArgs e)
     {
       suppressEvents = false;
     }
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(shouldClearFillColor: true));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(shouldClearFillColor: true));
   }
 
   private static Color SKColorToMauiColor(SKColor skColor)
@@ -332,12 +323,12 @@ private static SKColor MauiColorToSKColor(Color mauiColor)
 
   private void OnGlowSwitchToggled(object sender, ToggledEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(isGlowEnabled: e.Value));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(isGlowEnabled: e.Value));
   }
 
   private void OnGlowRadiusChanged(object sender, ValueChangedEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(glowRadius: (float)e.NewValue));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(glowRadius: (float)e.NewValue));
   }
 
   private void OnGlowColorTapped(object sender, TappedEventArgs e)
@@ -346,33 +337,33 @@ private void OnGlowColorTapped(object sender, TappedEventArgs e)
     {
       if (SKColor.TryParse(hexColor, out var color))
       {
-        MessageBus?.SendMessage(new BrushSettingsChangedMessage(glowColor: color));
+        messageBus?.SendMessage(new BrushSettingsChangedMessage(glowColor: color));
       }
     }
   }
 
   private void OnRainbowSwitchToggled(object sender, ToggledEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(isRainbowEnabled: e.Value));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(isRainbowEnabled: e.Value));
   }
 
   private void OnScatterChanged(object sender, ValueChangedEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(scatterRadius: (float)e.NewValue));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(scatterRadius: (float)e.NewValue));
   }
 
   private void OnSizeJitterChanged(object sender, ValueChangedEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(sizeJitter: (float)e.NewValue));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(sizeJitter: (float)e.NewValue));
   }
 
   private void OnAngleJitterChanged(object sender, ValueChangedEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(angleJitter: (float)e.NewValue));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(angleJitter: (float)e.NewValue));
   }
 
   private void OnHueJitterChanged(object sender, ValueChangedEventArgs e)
   {
-    MessageBus?.SendMessage(new BrushSettingsChangedMessage(hueJitter: (float)e.NewValue));
+    messageBus?.SendMessage(new BrushSettingsChangedMessage(hueJitter: (float)e.NewValue));
   }
 }
diff --git a/Logic/Extensions/PreferencesExtensions.cs b/Logic/Extensions/PreferencesExtensions.cs
index 7e902b6..2b50f55 100644
--- a/Logic/Extensions/PreferencesExtensions.cs
+++ b/Logic/Extensions/PreferencesExtensions.cs
@@ -1,22 +1,29 @@
-using LunaDraw.Logic.Services;
+using LunaDraw.Logic.Utils;
 using SkiaSharp;
 
 namespace LunaDraw.Logic.Extensions;
 
 public static class PreferencesExtensions
 {
-    public static SKColor GetCanvasBackgroundColor(this IPreferencesFacade preferences, bool isTransparentBackground)
-    {
-        if (isTransparentBackground) return SKColors.Transparent;
+  public static SKColor GetCanvasBackgroundColor(this IPreferencesFacade _)
+  {
+    return GetCanvasBackgroundColor(Preferences.Default);
+  }
+
+  public static SKColor GetCanvasBackgroundColor(this IPreferences preferences)
+  {
+    var isTransparentBackground = preferences.Get(AppPreference.IsTransparentBackgroundEnabled.ToString(), PreferencesFacade.Defaults[AppPreference.IsTransparentBackgroundEnabled]);
 
-        var selectedTheme = Application.Current?.RequestedTheme;
-        var settingTheme = preferences.Get(AppPreference.AppTheme);
+    if (isTransparentBackground) return SKColors.Transparent;
 
-        if (settingTheme != PreferencesFacade.Defaults[AppPreference.AppTheme])
-        {
-            selectedTheme = settingTheme == AppTheme.Dark.ToString() ? AppTheme.Dark : AppTheme.Light;
-        }
+    var selectedTheme = Application.Current?.RequestedTheme;
+    var settingTheme = preferences.Get(AppPreference.AppTheme.ToString(), PreferencesFacade.Defaults[AppPreference.AppTheme]);
 
-        return selectedTheme == AppTheme.Dark ? SKColors.Black : SKColors.White;
+    if (settingTheme != PreferencesFacade.Defaults[AppPreference.AppTheme])
+    {
+      selectedTheme = settingTheme == AppTheme.Dark.ToString() ? AppTheme.Dark : AppTheme.Light;
     }
+
+    return selectedTheme == AppTheme.Dark ? SKColors.Black : SKColors.White;
+  }
 }
diff --git a/Logic/Handlers/CanvasInputHandler.cs b/Logic/Handlers/CanvasInputHandler.cs
index f90b6b8..610dc9f 100644
--- a/Logic/Handlers/CanvasInputHandler.cs
+++ b/Logic/Handlers/CanvasInputHandler.cs
@@ -30,7 +30,7 @@
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 
-namespace LunaDraw.Logic.Services;
+namespace LunaDraw.Logic.Utils;
 
 public class CanvasInputHandler(
     ToolbarViewModel toolbarViewModel,
@@ -252,13 +252,13 @@ private void HandleMultiTouch()
       float currentScale = targetMatrix.ScaleX; // Assuming uniform scale
       if (currentScale < 0.1f)
       {
-          float correction = 0.1f / currentScale;
-          targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
+        float correction = 0.1f / currentScale;
+        targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
       }
       else if (currentScale > 20.0f)
       {
-          float correction = 20.0f / currentScale;
-          targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
+        float correction = 20.0f / currentScale;
+        targetMatrix = SKMatrix.Concat(SKMatrix.CreateScale(correction, correction, centroid.X, centroid.Y), targetMatrix);
       }
 
       // Smooth the output using exponential moving average
diff --git a/Logic/Handlers/ICanvasInputHandler.cs b/Logic/Handlers/ICanvasInputHandler.cs
index fddfb67..38bb4ac 100644
--- a/Logic/Handlers/ICanvasInputHandler.cs
+++ b/Logic/Handlers/ICanvasInputHandler.cs
@@ -26,7 +26,7 @@
 
 // For SKCanvasView
 
-namespace LunaDraw.Logic.Services;
+namespace LunaDraw.Logic.Utils;
 
 public interface ICanvasInputHandler
 {
diff --git a/Logic/Tools/EraserBrushTool.cs b/Logic/Tools/EraserBrushTool.cs
index bd9b6b1..cac605f 100644
--- a/Logic/Tools/EraserBrushTool.cs
+++ b/Logic/Tools/EraserBrushTool.cs
@@ -21,9 +21,10 @@
  *  
  */
 
+using LunaDraw.Logic.Extensions;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
-
+using LunaDraw.Logic.Utils;
 using ReactiveUI;
 
 using SkiaSharp;
@@ -49,7 +50,7 @@ public void OnTouchPressed(SKPoint point, ToolContext context)
     currentDrawablePath = new DrawablePath
     {
       Path = currentPath,
-      StrokeColor = SKColors.White, // Visual preview color
+      StrokeColor = Preferences.Default.GetCanvasBackgroundColor(), // Visual preview color
       StrokeWidth = context.StrokeWidth * 2, // Eraser usually wider
       Opacity = 255,
       BlendMode = SKBlendMode.SrcOver,
diff --git a/Logic/Utils/IPreferencesFacade.cs b/Logic/Utils/IPreferencesFacade.cs
index 542ef1c..21b4b4f 100644
--- a/Logic/Utils/IPreferencesFacade.cs
+++ b/Logic/Utils/IPreferencesFacade.cs
@@ -21,7 +21,7 @@
  *  
  */
 
-namespace LunaDraw.Logic.Services;
+namespace LunaDraw.Logic.Utils;
 
 public interface IPreferencesFacade
 {
diff --git a/Logic/Utils/PreferencesFacade.cs b/Logic/Utils/PreferencesFacade.cs
index b6da4c6..7a3f20f 100644
--- a/Logic/Utils/PreferencesFacade.cs
+++ b/Logic/Utils/PreferencesFacade.cs
@@ -21,7 +21,7 @@
  *  
  */
 
-namespace LunaDraw.Logic.Services;
+namespace LunaDraw.Logic.Utils;
 
 public enum AppPreference
 {
diff --git a/Logic/ViewModels/LayerPanelViewModel.cs b/Logic/ViewModels/LayerPanelViewModel.cs
index 29685b1..2c436c1 100644
--- a/Logic/ViewModels/LayerPanelViewModel.cs
+++ b/Logic/ViewModels/LayerPanelViewModel.cs
@@ -25,7 +25,6 @@
 using System.Collections.Specialized;
 using System.Reactive;
 using System.Reactive.Linq;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
@@ -36,14 +35,10 @@ namespace LunaDraw.Logic.ViewModels;
 public class LayerPanelViewModel : ReactiveObject
 {
   private readonly ILayerFacade layerFacade;
-  private readonly IMessageBus messageBus;
-  private readonly IPreferencesFacade preferencesFacade;
 
-  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPreferencesFacade preferencesFacade)
+  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus)
   {
     this.layerFacade = layerFacade;
-    this.messageBus = messageBus;
-    this.preferencesFacade = preferencesFacade;
 
     layerFacade.WhenAnyValue(x => x.CurrentLayer)
         .Subscribe(_ => this.RaisePropertyChanged(nameof(CurrentLayer)));
@@ -104,26 +99,6 @@ public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPr
       }
     }, outputScheduler: RxApp.MainThreadScheduler);
 
-    ToggleTraceModeCommand = ReactiveCommand.Create(() =>
-    {
-      if (IsTransparentBackground)
-      {
-        WindowTransparency = 255;
-      }
-      else
-      {
-        WindowTransparency = 125;
-      }
-
-      messageBus.SendMessage(new CanvasInvalidateMessage());
-    }, outputScheduler: RxApp.MainThreadScheduler);
-
-    // Initialize state from Preferences
-    IsTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
-    if (!IsTransparentBackground)
-    {
-      windowTransparency = 255;
-    }
   }
 
   public ObservableCollection<Layer> Layers => layerFacade.Layers;
@@ -134,68 +109,10 @@ public Layer? CurrentLayer
     set => layerFacade.CurrentLayer = value;
   }
 
-  private bool isTransparentBackground = false;
-  public bool IsTransparentBackground
-  {
-    get => isTransparentBackground;
-    set
-    {
-      this.RaiseAndSetIfChanged(ref isTransparentBackground, value);
-      preferencesFacade.Set(AppPreference.IsTransparentBackgroundEnabled, value);
-
-      if (!isTransparentBackground)
-      {
-        WindowTransparency = 255;
-        UpdateWindowTransparency();
-      }
-
-      messageBus.SendMessage(new CanvasInvalidateMessage());
-    }
-  }
-
-  private byte windowTransparency = 180;
-  public virtual byte WindowTransparency
-  {
-    get => windowTransparency;
-    set
-    {
-      this.RaiseAndSetIfChanged(ref windowTransparency, value);
-      if (value == 255 && isTransparentBackground)
-      {
-        IsTransparentBackground = false;
-        UpdateWindowTransparency();
-      }
-      else if (value < 255 && !isTransparentBackground)
-      {
-        IsTransparentBackground = true;
-      }
-
-      if (IsTransparentBackground)
-      {
-        UpdateWindowTransparency();
-      }
-    }
-  }
-
-  private void UpdateWindowTransparency()
-  {
-#if WINDOWS
-    if (IsTransparentBackground)
-    {
-      LunaDraw.PlatformHelper.EnableTrueTransparency(WindowTransparency);
-    }
-    else
-    {
-      LunaDraw.PlatformHelper.EnableTrueTransparency(255);
-    }
-#endif
-  }
-
   public ReactiveCommand<Unit, Unit> AddLayerCommand { get; }
   public ReactiveCommand<Unit, Unit> RemoveLayerCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerForwardCommand { get; }
   public ReactiveCommand<Layer, Unit> MoveLayerBackwardCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerVisibilityCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerLockCommand { get; }
-  public ReactiveCommand<Unit, Unit> ToggleTraceModeCommand { get; }
 }
diff --git a/Logic/ViewModels/MainViewModel.cs b/Logic/ViewModels/MainViewModel.cs
index c448a71..0e6a20b 100644
--- a/Logic/ViewModels/MainViewModel.cs
+++ b/Logic/ViewModels/MainViewModel.cs
@@ -28,7 +28,6 @@
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Tools;
 
 using ReactiveUI;
@@ -36,6 +35,7 @@
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 using CommunityToolkit.Maui.Extensions;
+using System.Reactive;
 
 namespace LunaDraw.Logic.ViewModels;
 
@@ -59,6 +59,7 @@ public class MainViewModel : ReactiveObject
   public ICommand ZoomInCommand { get; }
   public ICommand ZoomOutCommand { get; }
   public ICommand ResetZoomCommand { get; }
+  public ICommand ToggleTraceModeCommand { get; }
 
   public SKRect CanvasSize { get; set; }
 
@@ -154,8 +155,28 @@ public MainViewModel(
         await page.ShowPopupAsync(popup);
       }
     });
-  }
 
+    ToggleTraceModeCommand = ReactiveCommand.Create(() =>
+    {
+      if (IsTransparentBackground)
+      {
+        WindowTransparency = 255;
+      }
+      else
+      {
+        WindowTransparency = 125;
+      }
+
+      messageBus.SendMessage(new CanvasInvalidateMessage());
+    }, outputScheduler: RxApp.MainThreadScheduler);
+
+    // Initialize state from Preferences
+    IsTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
+    if (!IsTransparentBackground)
+    {
+      windowTransparency = 255;
+    }
+  }
 
   public IDrawingTool ActiveTool
   {
@@ -255,4 +276,61 @@ private void Zoom(float scaleFactor)
 
     messageBus.SendMessage(new CanvasInvalidateMessage());
   }
+
+  private bool isTransparentBackground = false;
+  public bool IsTransparentBackground
+  {
+    get => isTransparentBackground;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref isTransparentBackground, value);
+      preferencesFacade.Set(AppPreference.IsTransparentBackgroundEnabled, value);
+
+      if (!isTransparentBackground)
+      {
+        WindowTransparency = 255;
+        UpdateWindowTransparency();
+      }
+
+      messageBus.SendMessage(new CanvasInvalidateMessage());
+    }
+  }
+
+  private byte windowTransparency = 180;
+  public virtual byte WindowTransparency
+  {
+    get => windowTransparency;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref windowTransparency, value);
+      if (value == 255 && isTransparentBackground)
+      {
+        IsTransparentBackground = false;
+        UpdateWindowTransparency();
+      }
+      else if (value < 255 && !isTransparentBackground)
+      {
+        IsTransparentBackground = true;
+      }
+
+      if (IsTransparentBackground)
+      {
+        UpdateWindowTransparency();
+      }
+    }
+  }
+
+  private void UpdateWindowTransparency()
+  {
+#if WINDOWS
+    if (IsTransparentBackground)
+    {
+      LunaDraw.PlatformHelper.EnableTrueTransparency(WindowTransparency);
+    }
+    else
+    {
+      LunaDraw.PlatformHelper.EnableTrueTransparency(255);
+    }
+#endif
+  }
 }
\ No newline at end of file
diff --git a/MauiProgram.cs b/MauiProgram.cs
index 2928382..668729d 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -26,7 +26,6 @@
 using Microsoft.Maui.LifecycleEvents;
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Models;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.ViewModels;
 using LunaDraw.Pages;
 using Microsoft.Extensions.Logging;
@@ -68,7 +67,7 @@ public static MauiApp CreateMauiApp()
             wndLifeCycleBuilder.OnWindowCreated(window =>
               {
                 window.SystemBackdrop = new DesktopAcrylicBackdrop();
-                if (Preferences.Get("IsTransparentBackgroundEnabled", false))
+                if (Preferences.Get(AppPreference.IsTransparentBackgroundEnabled.ToString(), false))
                 {
                   PlatformHelper.EnableTrueTransparency(180);   // Fully transparent
                 }
diff --git a/Pages/MainPage.xaml.cs b/Pages/MainPage.xaml.cs
index f203a6d..f6c154a 100644
--- a/Pages/MainPage.xaml.cs
+++ b/Pages/MainPage.xaml.cs
@@ -23,7 +23,7 @@
 
 using CommunityToolkit.Maui;
 using LunaDraw.Logic.Messages;
-using LunaDraw.Logic.Services;
+using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.ViewModels;
 using LunaDraw.Logic.Extensions;
 
@@ -157,7 +157,7 @@ private void OnCanvasViewPaintSurface(object? sender, SKPaintGLSurfaceEventArgs
     viewModel.NavigationModel.CanvasWidth = width;
     viewModel.NavigationModel.CanvasHeight = height;
 
-    var bgColor = preferencesFacade.GetCanvasBackgroundColor(viewModel.LayerPanelVM.IsTransparentBackground);
+    var bgColor = preferencesFacade.GetCanvasBackgroundColor();
     canvas.Clear(bgColor);
 
     if (viewModel == null) return;
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
index dc6854c..14c8f30 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
@@ -26,7 +26,6 @@
 using Xunit;
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Models;
 using LunaDraw.Logic.Tools;
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
index 031fd34..4d65bb0 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
@@ -32,7 +32,6 @@
 using ReactiveUI;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
diff --git a/tests/LunaDraw.Tests/FreehandToolTests.cs b/tests/LunaDraw.Tests/FreehandToolTests.cs
index 82f1e02..80d6549 100644
--- a/tests/LunaDraw.Tests/FreehandToolTests.cs
+++ b/tests/LunaDraw.Tests/FreehandToolTests.cs
@@ -31,7 +31,6 @@
 using LunaDraw.Logic.Models;
 using LunaDraw.Logic.Tools;
 using LunaDraw.Logic.ViewModels;
-using LunaDraw.Logic.Services; // ADDED: Required for ILayerFacade and IToolStateManager
 using Moq;
 using SkiaSharp;
 using Xunit;
diff --git a/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs b/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
index c4ecc33..f92f72a 100644
--- a/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
+++ b/tests/LunaDraw.Tests/LayerPanelViewModelTests.cs
@@ -26,7 +26,6 @@
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using LunaDraw.Logic.Utils;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
 using LunaDraw.Logic.ViewModels;
diff --git a/tests/LunaDraw.Tests/LayerStateManagerTests.cs b/tests/LunaDraw.Tests/LayerStateManagerTests.cs
index bc6fb09..8ab09fc 100644
--- a/tests/LunaDraw.Tests/LayerStateManagerTests.cs
+++ b/tests/LunaDraw.Tests/LayerStateManagerTests.cs
@@ -28,7 +28,6 @@
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
-using LunaDraw.Logic.Services; // Keep this for LayerFacade
 using Moq;
 using Xunit;
 using ReactiveUI; // ADDED: Required for IMessageBus
diff --git a/tests/LunaDraw.Tests/MainViewModelTests.cs b/tests/LunaDraw.Tests/MainViewModelTests.cs
index 7faa92f..e952cd5 100644
--- a/tests/LunaDraw.Tests/MainViewModelTests.cs
+++ b/tests/LunaDraw.Tests/MainViewModelTests.cs
@@ -27,7 +27,6 @@
 using LunaDraw.Logic.Utils;
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.ViewModels;
 using Moq;
 using ReactiveUI;
diff --git a/tests/LunaDraw.Tests/ShapeToolsTests.cs b/tests/LunaDraw.Tests/ShapeToolsTests.cs
index 0009571..6528afc 100644
--- a/tests/LunaDraw.Tests/ShapeToolsTests.cs
+++ b/tests/LunaDraw.Tests/ShapeToolsTests.cs
@@ -26,7 +26,6 @@
 using System.Linq;
 
 using LunaDraw.Logic.Models;
-using LunaDraw.Logic.Services;
 using LunaDraw.Logic.Tools;
 using LunaDraw.Logic.Utils;
 using ReactiveUI;

From f4cc139cfc763ff54064d4be03ff466ee5e52a55 Mon Sep 17 00:00:00 2001
From: Jeff H <iknowcodesoup@gmail.com>
Date: Mon, 15 Dec 2025 00:44:48 -0500
Subject: [PATCH 9/9] test fixes. clean-up. revert transparency vm logic

---
 Logic/Extensions/PreferencesExtensions.cs     | 11 +--
 Logic/Tools/EraserBrushTool.cs                |  5 +-
 Logic/ViewModels/LayerPanelViewModel.cs       | 86 ++++++++++++++++++-
 Logic/ViewModels/MainViewModel.cs             | 80 -----------------
 Logic/ViewModels/ToolbarViewModel.cs          |  5 +-
 .../CanvasInputHandlerRobustTests.cs          |  4 +-
 .../LunaDraw.Tests/CanvasInputHandlerTests.cs |  8 +-
 .../EraserBrushToolStampsTests.cs             | 10 ++-
 tests/LunaDraw.Tests/EraserBrushToolTests.cs  | 10 ++-
 .../IsToolActiveConverterTests.cs             | 22 +++--
 tests/LunaDraw.Tests/MainViewModelTests.cs    |  3 +-
 tests/LunaDraw.Tests/ToolbarViewModelTests.cs | 10 ++-
 12 files changed, 140 insertions(+), 114 deletions(-)

diff --git a/Logic/Extensions/PreferencesExtensions.cs b/Logic/Extensions/PreferencesExtensions.cs
index 2b50f55..7d4a09b 100644
--- a/Logic/Extensions/PreferencesExtensions.cs
+++ b/Logic/Extensions/PreferencesExtensions.cs
@@ -5,19 +5,14 @@ namespace LunaDraw.Logic.Extensions;
 
 public static class PreferencesExtensions
 {
-  public static SKColor GetCanvasBackgroundColor(this IPreferencesFacade _)
+  public static SKColor GetCanvasBackgroundColor(this IPreferencesFacade preferencesFacade)
   {
-    return GetCanvasBackgroundColor(Preferences.Default);
-  }
-
-  public static SKColor GetCanvasBackgroundColor(this IPreferences preferences)
-  {
-    var isTransparentBackground = preferences.Get(AppPreference.IsTransparentBackgroundEnabled.ToString(), PreferencesFacade.Defaults[AppPreference.IsTransparentBackgroundEnabled]);
+    var isTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
 
     if (isTransparentBackground) return SKColors.Transparent;
 
     var selectedTheme = Application.Current?.RequestedTheme;
-    var settingTheme = preferences.Get(AppPreference.AppTheme.ToString(), PreferencesFacade.Defaults[AppPreference.AppTheme]);
+    var settingTheme = preferencesFacade.Get(AppPreference.AppTheme);
 
     if (settingTheme != PreferencesFacade.Defaults[AppPreference.AppTheme])
     {
diff --git a/Logic/Tools/EraserBrushTool.cs b/Logic/Tools/EraserBrushTool.cs
index cac605f..197e3ff 100644
--- a/Logic/Tools/EraserBrushTool.cs
+++ b/Logic/Tools/EraserBrushTool.cs
@@ -31,7 +31,7 @@
 
 namespace LunaDraw.Logic.Tools;
 
-public class EraserBrushTool(IMessageBus messageBus) : IDrawingTool
+public class EraserBrushTool(IMessageBus messageBus, IPreferencesFacade preferencesFacade) : IDrawingTool
 {
   public string Name => "Eraser";
   public ToolType Type => ToolType.Eraser;
@@ -39,6 +39,7 @@ public class EraserBrushTool(IMessageBus messageBus) : IDrawingTool
   private SKPath? currentPath;
   private DrawablePath? currentDrawablePath;
   private readonly IMessageBus messageBus = messageBus;
+  private readonly IPreferencesFacade preferencesFacade = preferencesFacade;
 
   public void OnTouchPressed(SKPoint point, ToolContext context)
   {
@@ -50,7 +51,7 @@ public void OnTouchPressed(SKPoint point, ToolContext context)
     currentDrawablePath = new DrawablePath
     {
       Path = currentPath,
-      StrokeColor = Preferences.Default.GetCanvasBackgroundColor(), // Visual preview color
+      StrokeColor = preferencesFacade.GetCanvasBackgroundColor(), // Visual preview color
       StrokeWidth = context.StrokeWidth * 2, // Eraser usually wider
       Opacity = 255,
       BlendMode = SKBlendMode.SrcOver,
diff --git a/Logic/ViewModels/LayerPanelViewModel.cs b/Logic/ViewModels/LayerPanelViewModel.cs
index 2c436c1..64a4b6b 100644
--- a/Logic/ViewModels/LayerPanelViewModel.cs
+++ b/Logic/ViewModels/LayerPanelViewModel.cs
@@ -29,17 +29,21 @@
 using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Models;
 using ReactiveUI;
+using System.Windows.Input;
 
 namespace LunaDraw.Logic.ViewModels;
 
 public class LayerPanelViewModel : ReactiveObject
 {
   private readonly ILayerFacade layerFacade;
+  private readonly IMessageBus messageBus;
+  private readonly IPreferencesFacade preferencesFacade;
 
-  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus)
+  public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus, IPreferencesFacade preferencesFacade)
   {
     this.layerFacade = layerFacade;
-
+    this.messageBus = messageBus;
+    this.preferencesFacade = preferencesFacade;
     layerFacade.WhenAnyValue(x => x.CurrentLayer)
         .Subscribe(_ => this.RaisePropertyChanged(nameof(CurrentLayer)));
 
@@ -99,6 +103,26 @@ public LayerPanelViewModel(ILayerFacade layerFacade, IMessageBus messageBus)
       }
     }, outputScheduler: RxApp.MainThreadScheduler);
 
+    ToggleTraceModeCommand = ReactiveCommand.Create(() =>
+    {
+      if (IsTransparentBackground)
+      {
+        WindowTransparency = 255;
+      }
+      else
+      {
+        WindowTransparency = 125;
+      }
+
+      messageBus.SendMessage(new CanvasInvalidateMessage());
+    }, outputScheduler: RxApp.MainThreadScheduler);
+
+    // Initialize state from Preferences
+    IsTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
+    if (!IsTransparentBackground)
+    {
+      windowTransparency = 255;
+    }
   }
 
   public ObservableCollection<Layer> Layers => layerFacade.Layers;
@@ -115,4 +139,62 @@ public Layer? CurrentLayer
   public ReactiveCommand<Layer, Unit> MoveLayerBackwardCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerVisibilityCommand { get; }
   public ReactiveCommand<Layer, Unit> ToggleLayerLockCommand { get; }
+  public ReactiveCommand<Unit, Unit> ToggleTraceModeCommand { get; }
+
+  private bool isTransparentBackground = false;
+  public bool IsTransparentBackground
+  {
+    get => isTransparentBackground;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref isTransparentBackground, value);
+      preferencesFacade.Set(AppPreference.IsTransparentBackgroundEnabled, value);
+
+      if (!isTransparentBackground)
+      {
+        WindowTransparency = 255;
+        UpdateWindowTransparency();
+      }
+
+      messageBus.SendMessage(new CanvasInvalidateMessage());
+    }
+  }
+
+  private byte windowTransparency = 180;
+  public virtual byte WindowTransparency
+  {
+    get => windowTransparency;
+    set
+    {
+      this.RaiseAndSetIfChanged(ref windowTransparency, value);
+      if (value == 255 && isTransparentBackground)
+      {
+        IsTransparentBackground = false;
+        UpdateWindowTransparency();
+      }
+      else if (value < 255 && !isTransparentBackground)
+      {
+        IsTransparentBackground = true;
+      }
+
+      if (IsTransparentBackground)
+      {
+        UpdateWindowTransparency();
+      }
+    }
+  }
+
+  private void UpdateWindowTransparency()
+  {
+#if WINDOWS
+    if (IsTransparentBackground)
+    {
+      LunaDraw.PlatformHelper.EnableTrueTransparency(WindowTransparency);
+    }
+    else
+    {
+      LunaDraw.PlatformHelper.EnableTrueTransparency(255);
+    }
+#endif
+  }
 }
diff --git a/Logic/ViewModels/MainViewModel.cs b/Logic/ViewModels/MainViewModel.cs
index 0e6a20b..daa21e9 100644
--- a/Logic/ViewModels/MainViewModel.cs
+++ b/Logic/ViewModels/MainViewModel.cs
@@ -35,7 +35,6 @@
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 using CommunityToolkit.Maui.Extensions;
-using System.Reactive;
 
 namespace LunaDraw.Logic.ViewModels;
 
@@ -59,7 +58,6 @@ public class MainViewModel : ReactiveObject
   public ICommand ZoomInCommand { get; }
   public ICommand ZoomOutCommand { get; }
   public ICommand ResetZoomCommand { get; }
-  public ICommand ToggleTraceModeCommand { get; }
 
   public SKRect CanvasSize { get; set; }
 
@@ -155,27 +153,6 @@ public MainViewModel(
         await page.ShowPopupAsync(popup);
       }
     });
-
-    ToggleTraceModeCommand = ReactiveCommand.Create(() =>
-    {
-      if (IsTransparentBackground)
-      {
-        WindowTransparency = 255;
-      }
-      else
-      {
-        WindowTransparency = 125;
-      }
-
-      messageBus.SendMessage(new CanvasInvalidateMessage());
-    }, outputScheduler: RxApp.MainThreadScheduler);
-
-    // Initialize state from Preferences
-    IsTransparentBackground = preferencesFacade.Get<bool>(AppPreference.IsTransparentBackgroundEnabled);
-    if (!IsTransparentBackground)
-    {
-      windowTransparency = 255;
-    }
   }
 
   public IDrawingTool ActiveTool
@@ -276,61 +253,4 @@ private void Zoom(float scaleFactor)
 
     messageBus.SendMessage(new CanvasInvalidateMessage());
   }
-
-  private bool isTransparentBackground = false;
-  public bool IsTransparentBackground
-  {
-    get => isTransparentBackground;
-    set
-    {
-      this.RaiseAndSetIfChanged(ref isTransparentBackground, value);
-      preferencesFacade.Set(AppPreference.IsTransparentBackgroundEnabled, value);
-
-      if (!isTransparentBackground)
-      {
-        WindowTransparency = 255;
-        UpdateWindowTransparency();
-      }
-
-      messageBus.SendMessage(new CanvasInvalidateMessage());
-    }
-  }
-
-  private byte windowTransparency = 180;
-  public virtual byte WindowTransparency
-  {
-    get => windowTransparency;
-    set
-    {
-      this.RaiseAndSetIfChanged(ref windowTransparency, value);
-      if (value == 255 && isTransparentBackground)
-      {
-        IsTransparentBackground = false;
-        UpdateWindowTransparency();
-      }
-      else if (value < 255 && !isTransparentBackground)
-      {
-        IsTransparentBackground = true;
-      }
-
-      if (IsTransparentBackground)
-      {
-        UpdateWindowTransparency();
-      }
-    }
-  }
-
-  private void UpdateWindowTransparency()
-  {
-#if WINDOWS
-    if (IsTransparentBackground)
-    {
-      LunaDraw.PlatformHelper.EnableTrueTransparency(WindowTransparency);
-    }
-    else
-    {
-      LunaDraw.PlatformHelper.EnableTrueTransparency(255);
-    }
-#endif
-  }
 }
\ No newline at end of file
diff --git a/Logic/ViewModels/ToolbarViewModel.cs b/Logic/ViewModels/ToolbarViewModel.cs
index 845393c..0301068 100644
--- a/Logic/ViewModels/ToolbarViewModel.cs
+++ b/Logic/ViewModels/ToolbarViewModel.cs
@@ -234,7 +234,8 @@ public ToolbarViewModel(
       IMessageBus messageBus,
       IBitmapCache bitmapCacheManager,
       NavigationModel navigationModel,
-      IFileSaver fileSaver)
+      IFileSaver fileSaver,
+      IPreferencesFacade preferencesFacade)
   {
     this.layerFacade = layerFacade;
     this.selectionVM = selectionVM;
@@ -259,7 +260,7 @@ public ToolbarViewModel(
               new EllipseTool(messageBus),
               new LineTool(messageBus),
               new FillTool(messageBus),
-              new EraserBrushTool(messageBus)
+              new EraserBrushTool(messageBus, preferencesFacade)
     ];
 
     AvailableBrushShapes =
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
index 14c8f30..0e71a40 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerRobustTests.cs
@@ -68,6 +68,7 @@ public CanvasInputHandlerRobustTests()
       var historyVM = new HistoryViewModel(mockLayerFacade.Object, mockMessageBus.Object);
       var mockBitmapCache = new Mock<IBitmapCache>();
       var mockFileSaver = new Mock<IFileSaver>();
+      var mockPreferences = new Mock<IPreferencesFacade>();
 
       // Ensure MessageBus returns observables for ToolbarViewModel constructor
       mockMessageBus.Setup(x => x.Listen<BrushSettingsChangedMessage>()).Returns(Observable.Empty<BrushSettingsChangedMessage>());
@@ -81,7 +82,8 @@ public CanvasInputHandlerRobustTests()
           mockMessageBus.Object,
           mockBitmapCache.Object,
           navigationModel,
-          mockFileSaver.Object
+          mockFileSaver.Object,
+          mockPreferences.Object
       );
 
       // Setup default behavior
diff --git a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
index 4d65bb0..5e2b363 100644
--- a/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
+++ b/tests/LunaDraw.Tests/CanvasInputHandlerTests.cs
@@ -82,6 +82,7 @@ public CanvasInputHandlerTests()
             var clipboardMemento = new ClipboardMemento();
             var selectionVM = new SelectionViewModel(selectionObserver, mockLayerFacade.Object, clipboardMemento, mockMessageBus.Object);
             var historyVM = new HistoryViewModel(mockLayerFacade.Object, mockMessageBus.Object);
+            var mockPreferences = new Mock<IPreferencesFacade>();
 
             toolbarViewModel = new ToolbarViewModel(
                 mockLayerFacade.Object,
@@ -90,7 +91,8 @@ public CanvasInputHandlerTests()
                 mockMessageBus.Object,
                 mockBitmapCache.Object,
                 navigationModel,
-                mockFileSaver.Object
+                mockFileSaver.Object,
+                mockPreferences.Object
             );
 
             // Inject mock tool
@@ -115,6 +117,7 @@ public void HandleMultiTouch_MissingTouchKey_IgnoresTouch()
             var clipboardMemento = new ClipboardMemento();
             var localSelectionVM = new SelectionViewModel(selectionObserver, mockLayerFacade.Object, clipboardMemento, mockMessageBus.Object);
             var localHistoryVM = new HistoryViewModel(mockLayerFacade.Object, mockMessageBus.Object);
+            var mockPreferences = new Mock<IPreferencesFacade>();
             
             var localToolbarVM = new ToolbarViewModel(
                 mockLayerFacade.Object,
@@ -123,7 +126,8 @@ public void HandleMultiTouch_MissingTouchKey_IgnoresTouch()
                 mockMessageBus.Object,
                 mockBitmapCache.Object,
                 navigationModel,
-                mockFileSaver.Object
+                mockFileSaver.Object,
+                mockPreferences.Object
             );
             
             // Mock active tool inside the local VM
diff --git a/tests/LunaDraw.Tests/EraserBrushToolStampsTests.cs b/tests/LunaDraw.Tests/EraserBrushToolStampsTests.cs
index de68b9d..ac1c47c 100644
--- a/tests/LunaDraw.Tests/EraserBrushToolStampsTests.cs
+++ b/tests/LunaDraw.Tests/EraserBrushToolStampsTests.cs
@@ -36,10 +36,14 @@ namespace LunaDraw.Tests
     public class EraserBrushToolStampsTests
     {
         private readonly Mock<IMessageBus> mockBus;
+        private readonly Mock<IPreferencesFacade> mockPreferences;
 
         public EraserBrushToolStampsTests()
         {
             mockBus = new Mock<IMessageBus>();
+            mockPreferences = new Mock<IPreferencesFacade>();
+            mockPreferences.Setup(p => p.Get<bool>(AppPreference.IsTransparentBackgroundEnabled)).Returns(false);
+            mockPreferences.Setup(p => p.Get(AppPreference.AppTheme)).Returns("Light");
         }
 
         [Fact]
@@ -71,7 +75,7 @@ public void ErasingPartofStamps_PreservesHueJitterAndType()
                 BrushShape = BrushShape.Circle()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             // Erase over the first point (100, 100)
@@ -128,7 +132,7 @@ public void ErasingPartOfSingleStamp_CreatesFragmentWithCorrectColor()
                 BrushShape = BrushShape.Square()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             // Erase a corner of the square (100,100 is center. Size 50 -> 75 to 125.
@@ -179,7 +183,7 @@ public void ErasingStampWithFlow_CreatesFragmentWithCombinedOpacity()
                 BrushShape = BrushShape.Square()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             tool.OnTouchPressed(new SKPoint(75, 75), context);
diff --git a/tests/LunaDraw.Tests/EraserBrushToolTests.cs b/tests/LunaDraw.Tests/EraserBrushToolTests.cs
index aff0147..4a14488 100644
--- a/tests/LunaDraw.Tests/EraserBrushToolTests.cs
+++ b/tests/LunaDraw.Tests/EraserBrushToolTests.cs
@@ -38,10 +38,14 @@ namespace LunaDraw.Tests
     public class EraserBrushToolTests
     {
         private readonly Mock<IMessageBus> mockBus;
+        private readonly Mock<IPreferencesFacade> mockPreferences;
 
         public EraserBrushToolTests()
         {
             mockBus = new Mock<IMessageBus>();
+            mockPreferences = new Mock<IPreferencesFacade>();
+            mockPreferences.Setup(p => p.Get<bool>(AppPreference.IsTransparentBackgroundEnabled)).Returns(false);
+            mockPreferences.Setup(p => p.Get(AppPreference.AppTheme)).Returns("Light");
         }
 
         [Fact]
@@ -69,7 +73,7 @@ public void ErasingTransparentRectangle_ProducesOutlineBlob_NotFilledShape()
                 BrushShape = BrushShape.Circle()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             // Simulate erasing across the top border
@@ -121,7 +125,7 @@ public void ErasingSingleStampDot_RemovesElementCompletely()
                 BrushShape = BrushShape.Circle()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             // Erase exactly over the stamp
@@ -161,7 +165,7 @@ public void ErasingFreehandDot_RemovesElementCompletely()
                 BrushShape = BrushShape.Circle()
             };
 
-            var tool = new EraserBrushTool(mockBus.Object);
+            var tool = new EraserBrushTool(mockBus.Object, mockPreferences.Object);
 
             // Act
             tool.OnTouchPressed(new SKPoint(100, 100), context);
diff --git a/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs b/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs
index 78cb326..da5106b 100644
--- a/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs
+++ b/tests/LunaDraw.Tests/IsToolActiveConverterTests.cs
@@ -1,7 +1,9 @@
 using System.Globalization;
 using LunaDraw.Converters;
+using LunaDraw.Logic.Messages;
 using LunaDraw.Logic.Tools;
 using Moq;
+using ReactiveUI;
 using Xunit;
 
 namespace LunaDraw.Tests
@@ -13,45 +15,49 @@ public void Convert_ReturnsTrue_WhenToolMatches()
         {
             var converter = new IsToolActiveConverter();
             var mockTool = new Mock<IDrawingTool>();
+            var mockBus = new Mock<IMessageBus>();
             // We can't easily mock GetType().Name without a real class, so let's use a real one or subclass.
-            var tool = new SelectTool(null); 
+            var tool = new SelectTool(mockBus.Object); 
 
             var result = converter.Convert(tool, typeof(bool), "SelectTool", CultureInfo.InvariantCulture);
 
-            Assert.True((bool)result);
+            Assert.True(result as bool?);
         }
 
         [Fact]
         public void Convert_ReturnsFalse_WhenToolDoesNotMatch()
         {
             var converter = new IsToolActiveConverter();
-            var tool = new SelectTool(null);
+            var mockBus = new Mock<IMessageBus>();
+            var tool = new SelectTool(mockBus.Object);
 
             var result = converter.Convert(tool, typeof(bool), "FreehandTool", CultureInfo.InvariantCulture);
 
-            Assert.False((bool)result);
+            Assert.False(result as bool?);
         }
 
         [Fact]
         public void Convert_ReturnsTrue_ForShapesGroup()
         {
             var converter = new IsToolActiveConverter();
-            var tool = new RectangleTool(null);
+            var mockBus = new Mock<IMessageBus>();
+            var tool = new RectangleTool(mockBus.Object);
 
             var result = converter.Convert(tool, typeof(bool), "Shapes", CultureInfo.InvariantCulture);
 
-            Assert.True((bool)result);
+            Assert.True(result as bool?);
         }
 
         [Fact]
         public void Convert_ReturnsFalse_ForShapesGroup_WhenNotShape()
         {
             var converter = new IsToolActiveConverter();
-            var tool = new SelectTool(null);
+            var mockBus = new Mock<IMessageBus>();
+            var tool = new SelectTool(mockBus.Object);
 
             var result = converter.Convert(tool, typeof(bool), "Shapes", CultureInfo.InvariantCulture);
 
-            Assert.False((bool)result);
+            Assert.False(result as bool?);
         }
     }
 }
diff --git a/tests/LunaDraw.Tests/MainViewModelTests.cs b/tests/LunaDraw.Tests/MainViewModelTests.cs
index e952cd5..b1d7692 100644
--- a/tests/LunaDraw.Tests/MainViewModelTests.cs
+++ b/tests/LunaDraw.Tests/MainViewModelTests.cs
@@ -91,7 +91,8 @@ public MainViewModelTests()
           messageBusMock.Object,
           new Mock<IBitmapCache>().Object,
           navigationModel,
-          new Mock<IFileSaver>().Object
+          new Mock<IFileSaver>().Object,
+          preferencesFacadeMock.Object
       );
 
       // Setup property change notifications for ToolStateManager
diff --git a/tests/LunaDraw.Tests/ToolbarViewModelTests.cs b/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
index 1320049..020d0cb 100644
--- a/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
+++ b/tests/LunaDraw.Tests/ToolbarViewModelTests.cs
@@ -83,6 +83,8 @@ public void SaveImageCommand_ShouldNotExecute_WhenCanvasSizeIsZero()
       navigationModel.CanvasWidth = 0;
       navigationModel.CanvasHeight = 0;
 
+      var mockPreferences = new Mock<IPreferencesFacade>();
+
       var viewModel = new ToolbarViewModel(
           layerFacadeMock.Object,
           selectionViewModel,
@@ -90,7 +92,8 @@ public void SaveImageCommand_ShouldNotExecute_WhenCanvasSizeIsZero()
           messageBusMock.Object,
           bitmapCacheMock.Object,
           navigationModel,
-          fileSaverMock.Object);
+          fileSaverMock.Object,
+          mockPreferences.Object);
 
       // Act
       viewModel.SaveImageCommand.Execute().Subscribe();
@@ -106,6 +109,8 @@ public async Task SaveImageCommand_ShouldExecute_WhenCanvasSizeIsValid()
       navigationModel.CanvasWidth = 100;
       navigationModel.CanvasHeight = 100;
 
+      var mockPreferences = new Mock<IPreferencesFacade>();
+
       var viewModel = new ToolbarViewModel(
           layerFacadeMock.Object,
           selectionViewModel,
@@ -113,7 +118,8 @@ public async Task SaveImageCommand_ShouldExecute_WhenCanvasSizeIsValid()
           messageBusMock.Object,
           bitmapCacheMock.Object,
           navigationModel,
-          fileSaverMock.Object);
+          fileSaverMock.Object,
+          mockPreferences.Object);
 
       fileSaverMock.Setup(x => x.SaveAsync(It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<CancellationToken>()))
           .ReturnsAsync(new FileSaverResult("path", null));