diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd80776..8afb858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.0] - 2026-06-07
+
+### Changed
+
+- Upgraded the desktop app to Avalonia 12 and Flowery.NET 2.0.6.
+- Updated eligible direct NuGet dependencies that were older than seven days, including OpenCvSharp, SkiaSharp, System.Text.Json, System.Drawing.Common, YamlDotNet, LlmTornado, Microsoft.SqlServer.TransactSql.ScriptDom, and MSTest packages.
+- Replaced deprecated Avalonia placeholder APIs across the UI with `PlaceholderText`.
+- Updated fullscreen image viewer window chrome settings for Avalonia 12.
+- Updated MSTest exception assertions for the MSTest 4 assertion API.
+
+### Fixed
+
+- Restored text clipboard copy behavior after Avalonia 12 moved clipboard text helpers to extension methods.
+- Preserved duplicate validation-plugin removal behavior after Avalonia 12 made the binding plugin container non-public.
+
 ## [0.2.3] - 2026-05-18
 
 ### Security
diff --git a/OpenSourceToolkit.AI/OpenSourceToolkit.AI.csproj b/OpenSourceToolkit.AI/OpenSourceToolkit.AI.csproj
index dea2bbe..8cc3ccb 100644
--- a/OpenSourceToolkit.AI/OpenSourceToolkit.AI.csproj
+++ b/OpenSourceToolkit.AI/OpenSourceToolkit.AI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="10.0.7" />
+    <PackageReference Include="System.Text.Json" Version="10.0.8" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
diff --git a/OpenSourceToolkit.Converters/OpenSourceToolkit.Converters.csproj b/OpenSourceToolkit.Converters/OpenSourceToolkit.Converters.csproj
index ce48af9..ac37288 100644
--- a/OpenSourceToolkit.Converters/OpenSourceToolkit.Converters.csproj
+++ b/OpenSourceToolkit.Converters/OpenSourceToolkit.Converters.csproj
@@ -6,11 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.13.1" />
-    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260427" />
-    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260302" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.7" />
-    <PackageReference Include="System.Text.Json" Version="10.0.7" />
-    <PackageReference Include="YamlDotNet" Version="16.3.0" />
+    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260528" />
+    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260528" />
+    <PackageReference Include="System.Drawing.Common" Version="10.0.8" />
+    <PackageReference Include="System.Text.Json" Version="10.0.8" />
+    <PackageReference Include="YamlDotNet" Version="18.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/OpenSourceToolkit.Hardware/OpenSourceToolkit.Hardware.csproj b/OpenSourceToolkit.Hardware/OpenSourceToolkit.Hardware.csproj
index 46f2bf5..fd7f69c 100644
--- a/OpenSourceToolkit.Hardware/OpenSourceToolkit.Hardware.csproj
+++ b/OpenSourceToolkit.Hardware/OpenSourceToolkit.Hardware.csproj
@@ -7,8 +7,8 @@
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.3.0" />
     <PackageReference Include="NAudio.Lame" Version="2.1.0" />
-    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260427" />
-    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260302" />
+    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260528" />
+    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260528" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/OpenSourceToolkit.Media/OpenSourceToolkit.Media.csproj b/OpenSourceToolkit.Media/OpenSourceToolkit.Media.csproj
index a4ae7ff..6f653b4 100644
--- a/OpenSourceToolkit.Media/OpenSourceToolkit.Media.csproj
+++ b/OpenSourceToolkit.Media/OpenSourceToolkit.Media.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FIGLet" Version="1.1.0" />
-    <PackageReference Include="SkiaSharp" Version="3.119.2" />
+    <PackageReference Include="FIGLet" Version="2.0.14" />
+    <PackageReference Include="SkiaSharp" Version="3.119.4" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenSourceToolkit.NET/App.axaml.cs b/OpenSourceToolkit.NET/App.axaml.cs
index 797cf21..8e94ce1 100644
--- a/OpenSourceToolkit.NET/App.axaml.cs
+++ b/OpenSourceToolkit.NET/App.axaml.cs
@@ -1,13 +1,12 @@
-#nullable enable
+#nullable enable
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Media;
 using Avalonia.Styling;
 using System;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
@@ -286,14 +285,22 @@ public static bool ApplyThemeInPlace(string themeName, bool saveToSettings = tru
 
         private void DisableAvaloniaDataAnnotationValidation()
         {
-            // Get an array of plugins to remove
-            var dataValidationPluginsToRemove =
-                BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+            var bindingPluginsType = typeof(Application).Assembly.GetType("Avalonia.Data.Core.Plugins.BindingPlugins");
+            var dataValidatorsProperty = bindingPluginsType?.GetProperty(
+                "DataValidators",
+                BindingFlags.Static | BindingFlags.Public);
+            var dataValidators = dataValidatorsProperty?.GetValue(null) as System.Collections.IList;
+            if (dataValidators == null)
+                return;
+
+            var dataValidationPluginsToRemove = dataValidators
+                .Cast<object>()
+                .Where(plugin => plugin.GetType().FullName == "Avalonia.Data.Core.Plugins.DataAnnotationsValidationPlugin")
+                .ToArray();
 
-            // remove each entry found
             foreach (var plugin in dataValidationPluginsToRemove)
             {
-                BindingPlugins.DataValidators.Remove(plugin);
+                dataValidators.Remove(plugin);
             }
         }
 
diff --git a/OpenSourceToolkit.NET/Controls/CopyableInput.axaml b/OpenSourceToolkit.NET/Controls/CopyableInput.axaml
index b07e67e..0f27e8d 100644
--- a/OpenSourceToolkit.NET/Controls/CopyableInput.axaml
+++ b/OpenSourceToolkit.NET/Controls/CopyableInput.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -9,7 +9,7 @@
              MinWidth="120">
     <Grid ColumnDefinitions="*,Auto">
         <daisy:DaisyInput Text="{Binding Text, ElementName=Root, Mode=TwoWay}"
-                 Watermark="{Binding Watermark, ElementName=Root}"
+                 PlaceholderText="{Binding Watermark, ElementName=Root}"
                  IsReadOnly="{Binding IsReadOnly, ElementName=Root}"
                  VerticalAlignment="Center"
                  HorizontalAlignment="Stretch" />
diff --git a/OpenSourceToolkit.NET/Controls/CopyableInput.axaml.cs b/OpenSourceToolkit.NET/Controls/CopyableInput.axaml.cs
index 09a1165..2edb1f4 100644
--- a/OpenSourceToolkit.NET/Controls/CopyableInput.axaml.cs
+++ b/OpenSourceToolkit.NET/Controls/CopyableInput.axaml.cs
@@ -1,6 +1,7 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Input.Platform;
 
 namespace OpenSourceToolkit.NET.Controls
 {
diff --git a/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml b/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml
index ffb3da8..071640a 100644
--- a/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml
+++ b/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -8,7 +8,7 @@
              x:Name="Root">
     <Grid ColumnDefinitions="*,Auto">
         <daisy:DaisyTextArea Text="{Binding Text, ElementName=Root, Mode=TwoWay}"
-                 Watermark="{Binding Watermark, ElementName=Root}"
+                 PlaceholderText="{Binding Watermark, ElementName=Root}"
                  IsReadOnly="{Binding IsReadOnly, ElementName=Root}"
                  VerticalAlignment="Stretch"
                  HorizontalAlignment="Stretch" />
diff --git a/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml.cs b/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml.cs
index b2669ad..22c7625 100644
--- a/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml.cs
+++ b/OpenSourceToolkit.NET/Controls/CopyableTextBox.axaml.cs
@@ -1,6 +1,7 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
 using System.Windows.Input;
 
diff --git a/OpenSourceToolkit.NET/Controls/DragDropTextBox.axaml b/OpenSourceToolkit.NET/Controls/DragDropTextBox.axaml
index 78073f0..8643d49 100644
--- a/OpenSourceToolkit.NET/Controls/DragDropTextBox.axaml
+++ b/OpenSourceToolkit.NET/Controls/DragDropTextBox.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
              x:Class="OpenSourceToolkit.NET.Controls.DragDropTextBox"
@@ -10,7 +10,7 @@
         <TextBox x:Name="PART_TextBox"
                  IsVisible="{Binding !ShowLineNumbers, ElementName=Root}"
                  Text="{Binding Text, ElementName=Root, Mode=TwoWay}"
-                 Watermark="{Binding Watermark, ElementName=Root}"
+                 PlaceholderText="{Binding Watermark, ElementName=Root}"
                  AcceptsReturn="{Binding AcceptsReturn, ElementName=Root}"
                  TextWrapping="{Binding TextWrapping, ElementName=Root}"
                  FontSize="{Binding FontSize, ElementName=Root}"
diff --git a/OpenSourceToolkit.NET/Controls/LineNumberTextBox.axaml b/OpenSourceToolkit.NET/Controls/LineNumberTextBox.axaml
index caa8b73..48bce1f 100644
--- a/OpenSourceToolkit.NET/Controls/LineNumberTextBox.axaml
+++ b/OpenSourceToolkit.NET/Controls/LineNumberTextBox.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="OpenSourceToolkit.NET.Controls.LineNumberTextBox"
              x:Name="Root"
@@ -30,7 +30,7 @@
             <!-- Text Editor -->
             <TextBox x:Name="PART_TextBox" Grid.Column="1"
                      Text="{Binding Text, ElementName=Root, Mode=TwoWay}"
-                     Watermark="{Binding Watermark, ElementName=Root}"
+                     PlaceholderText="{Binding Watermark, ElementName=Root}"
                      AcceptsReturn="{Binding AcceptsReturn, ElementName=Root}"
                      TextWrapping="{Binding TextWrapping, ElementName=Root}"
                      FontFamily="{Binding FontFamily, ElementName=Root}"
diff --git a/OpenSourceToolkit.NET/Controls/NumericEntry.axaml b/OpenSourceToolkit.NET/Controls/NumericEntry.axaml
index 765e119..9855fb8 100644
--- a/OpenSourceToolkit.NET/Controls/NumericEntry.axaml
+++ b/OpenSourceToolkit.NET/Controls/NumericEntry.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -9,7 +9,7 @@
     <daisy:DaisyInput x:Name="Input"
                       Size="Small"
                       HorizontalAlignment="Stretch"
-                      Watermark="{Binding Watermark, ElementName=Root}"
+                      PlaceholderText="{Binding Watermark, ElementName=Root}"
                       MaxLength="{Binding MaxLength, ElementName=Root}"
                       Foreground="{DynamicResource DaisyBaseContentBrush}" />
 </UserControl>
diff --git a/OpenSourceToolkit.NET/OpenSourceToolkit.NET.csproj b/OpenSourceToolkit.NET/OpenSourceToolkit.NET.csproj
index 50b9621..d007cfd 100644
--- a/OpenSourceToolkit.NET/OpenSourceToolkit.NET.csproj
+++ b/OpenSourceToolkit.NET/OpenSourceToolkit.NET.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <Version>0.2.3</Version>
-    <AssemblyVersion>0.2.3.0</AssemblyVersion>
-    <FileVersion>0.2.3.0</FileVersion>
+    <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <OutputPath Condition="'$(Configuration)'=='Debug'">..\bin\debug\</OutputPath>
@@ -50,10 +50,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
+    <PackageReference Include="Avalonia" Version="12.0.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.4" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.4" />
 
     <!-- Flowery.NET: Conditional reference (local project vs NuGet) -->
   </ItemGroup>
@@ -65,27 +65,27 @@
 
   <!-- Use NuGet package when UseLocalFlowery is false or not set -->
   <ItemGroup Condition="'$(UseLocalFlowery)' != 'true'">
-    <PackageReference Include="Flowery.NET" Version="1.9.2" />
+    <PackageReference Include="Flowery.NET" Version="2.0.6" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Material.Icons.Avalonia" Version="3.0.0-preview3.1" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.12">
+    <PackageReference Include="Material.Icons.Avalonia" Version="3.0.3-nightly.0.2" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.17">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="DnsClient" Version="1.8.0" />
     <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.13.1" />
-    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260427" />
-    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260302" />
-    <PackageReference Include="System.Text.Json" Version="10.0.7" />
+    <PackageReference Include="OpenCvSharp4" Version="4.13.0.20260528" />
+    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.13.0.20260528" />
+    <PackageReference Include="System.Text.Json" Version="10.0.8" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
     <PackageReference Include="NCrontab" Version="3.4.0" />
     <PackageReference Include="PDFsharp" Version="6.2.4" />
-    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="170.191.0" />
-    <PackageReference Include="LlmTornado" Version="3.8.55" />
+    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="180.18.1" />
+    <PackageReference Include="LlmTornado" Version="3.8.57" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenSourceToolkit.NET/Views/SettingsWindow.axaml b/OpenSourceToolkit.NET/Views/SettingsWindow.axaml
index c06f68d..7637ede 100644
--- a/OpenSourceToolkit.NET/Views/SettingsWindow.axaml
+++ b/OpenSourceToolkit.NET/Views/SettingsWindow.axaml
@@ -1,4 +1,4 @@
-<Window xmlns="https://github.com/avaloniaui"
+<Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:OpenSourceToolkit.NET.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -143,7 +143,7 @@
 
                                 <daisy:DaisyInput Text="{Binding GitHubToken}"
                                          PasswordChar="•"
-                                         Watermark="ghp_xxxxxxxxxxxxxxxxxxxx"
+                                         PlaceholderText="ghp_xxxxxxxxxxxxxxxxxxxx"
                                          HorizontalAlignment="Stretch"/>
 
                                 <TextBlock TextWrapping="Wrap" FontSize="11" Foreground="{DynamicResource DaisyBaseContentBrush}">
@@ -266,7 +266,7 @@
                                     <TextBlock Grid.Row="0" Grid.Column="0" Text="{loc:Localize Settings_Connections_Name}" VerticalAlignment="Center"
                                                Foreground="{DynamicResource DaisyBaseContentBrush}"/>
                                     <daisy:DaisyInput Grid.Row="0" Grid.Column="1" Text="{Binding EditConnectionName}"
-                                             Watermark="{loc:Localize Settings_Connections_NameWatermark}" HorizontalAlignment="Stretch"/>
+                                             PlaceholderText="{loc:Localize Settings_Connections_NameWatermark}" HorizontalAlignment="Stretch"/>
 
                                     <!-- Provider -->
                                     <TextBlock Grid.Row="1" Grid.Column="0" Text="{loc:Localize Settings_Connections_Provider}" VerticalAlignment="Center"
@@ -292,7 +292,7 @@
                                         <daisy:DaisyButton Content="{loc:Localize Settings_Connections_OverrideApiKey}" Command="{Binding ShowCustomApiKeyCommand}"
                                                 IsVisible="{Binding !EditShowCustomApiKey}" HorizontalAlignment="Left"/>
                                         <daisy:DaisyInput Text="{Binding EditCustomApiKey}" PasswordChar="•"
-                                                 Watermark="{loc:Localize Settings_Connections_CustomApiKeyWatermark}"
+                                                 PlaceholderText="{loc:Localize Settings_Connections_CustomApiKeyWatermark}"
                                                  IsVisible="{Binding EditShowCustomApiKey}"
                                                  HorizontalAlignment="Stretch"/>
                                     </StackPanel>
@@ -421,13 +421,13 @@
 
                                 <daisy:DaisyInput Text="{Binding SelectedProviderApiKey.ApiKey}"
                                          PasswordChar="•"
-                                         Watermark="{loc:Localize Settings_Providers_ApiKeyWatermark}"
+                                         PlaceholderText="{loc:Localize Settings_Providers_ApiKeyWatermark}"
                                          HorizontalAlignment="Stretch"/>
 
                                 <TextBlock Text="{loc:Localize Settings_Providers_Endpoint}" FontWeight="Medium" Margin="0,8,0,0"
                                            Foreground="{DynamicResource DaisyBaseContentBrush}"/>
                                 <daisy:DaisyInput Text="{Binding SelectedProviderApiKey.CustomEndpoint}"
-                                         Watermark="{loc:Localize Settings_Providers_EndpointWatermark}"
+                                         PlaceholderText="{loc:Localize Settings_Providers_EndpointWatermark}"
                                          HorizontalAlignment="Stretch"/>
 
                                 <!-- Test Connection -->
@@ -466,7 +466,7 @@
                             <!-- Add Model -->
                             <Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,0,0,8">
                                 <daisy:DaisyInput Grid.Column="0" Text="{Binding NewModelName}"
-                                         Watermark="{loc:Localize Settings_Providers_NewModelWatermark}" Margin="0,0,8,0"/>
+                                         PlaceholderText="{loc:Localize Settings_Providers_NewModelWatermark}" Margin="0,0,8,0"/>
                                 <daisy:DaisyButton Grid.Column="1" Command="{Binding AddModelCommand}">
                                     <StackPanel Orientation="Horizontal" Spacing="4">
                                         <materialIcons:MaterialIcon Kind="Plus" Width="16" Height="16"/>
diff --git a/OpenSourceToolkit.NET/Views/Tools/ApiTesterToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/ApiTesterToolView.axaml
index bb9dbb2..f6ada34 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ApiTesterToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ApiTesterToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -14,7 +14,7 @@
      <!-- URL Bar -->
      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Margin="0,0,0,10">
         <daisy:DaisySelect ItemsSource="{Binding Methods}" SelectedItem="{Binding SelectedMethod}" Width="110" Margin="0,0,10,0"/>
-        <daisy:DaisyInput Text="{Binding Url}" Grid.Column="1" Watermark="{loc:Localize ApiTester_Url_Watermark}" Margin="0,0,10,0" VerticalAlignment="Center"/>
+        <daisy:DaisyInput Text="{Binding Url}" Grid.Column="1" PlaceholderText="{loc:Localize ApiTester_Url_Watermark}" Margin="0,0,10,0" VerticalAlignment="Center"/>
         <daisy:DaisyButton Command="{Binding ExecuteRequestCommand}" Content="{loc:Localize ApiTester_Send_Button}" Grid.Column="2" IsEnabled="{Binding !IsLoading}" Variant="Primary"/>
      </Grid>
 
@@ -24,10 +24,10 @@
             <TextBlock Text="{loc:Localize ApiTester_Request_Label}" FontWeight="Bold" Margin="0,0,0,5"/>
             <daisy:DaisyTabs Grid.Row="1" Variant="Boxed" Size="Small">
                <TabItem Header="{loc:Localize ApiTester_Headers_Tab}">
-               <daisy:DaisyTextArea Text="{Binding Headers}" Watermark="{loc:Localize ApiTester_Headers_Watermark}" VerticalContentAlignment="Top"/>
+               <daisy:DaisyTextArea Text="{Binding Headers}" PlaceholderText="{loc:Localize ApiTester_Headers_Watermark}" VerticalContentAlignment="Top"/>
                </TabItem>
                <TabItem Header="{loc:Localize ApiTester_Body_Tab}">
-               <daisy:DaisyTextArea Text="{Binding Body}" Watermark="{loc:Localize ApiTester_Body_Watermark}" VerticalContentAlignment="Top"/>
+               <daisy:DaisyTextArea Text="{Binding Body}" PlaceholderText="{loc:Localize ApiTester_Body_Watermark}" VerticalContentAlignment="Top"/>
                </TabItem>
                <TabItem Header="{loc:Localize ApiTester_Auth_Tab}">
                   <ScrollViewer>
@@ -38,7 +38,7 @@
                          <!-- Bearer -->
                          <StackPanel IsVisible="{Binding SelectedAuthType, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static api:AuthType.Bearer}}" Spacing="5">
                              <TextBlock Text="{loc:Localize ApiTester_Token_Label}"/>
-                             <daisy:DaisyInput Text="{Binding AuthToken}" PasswordChar="*" Watermark="{loc:Localize ApiTester_BearerToken_Watermark}"/>
+                             <daisy:DaisyInput Text="{Binding AuthToken}" PasswordChar="*" PlaceholderText="{loc:Localize ApiTester_BearerToken_Watermark}"/>
                          </StackPanel>
 
                          <!-- Basic -->
diff --git a/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml
index ace128b..3ce1bc2 100644
--- a/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -8,7 +8,7 @@
              x:DataType="vm:AsciiArtToolViewModel">
     <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto,Auto" Margin="0,0,0,20">
-            <TextBox Grid.Column="0" Text="{Binding Path}" Watermark="{loc:Localize AsciiArt_ImagePath_Watermark}" Margin="0,0,10,0"
+            <TextBox Grid.Column="0" Text="{Binding Path}" PlaceholderText="{loc:Localize AsciiArt_ImagePath_Watermark}" Margin="0,0,10,0"
                      IsReadOnly="True" VerticalAlignment="Center" />
             <daisy:DaisyButton Grid.Column="1" Click="Browse_Click" Content="..." ToolTip.Tip="{loc:Localize AsciiArt_Browse_Tooltip}" Margin="0,0,10,0" VerticalAlignment="Center"/>
             <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,10,0" VerticalAlignment="Center" Spacing="5">
diff --git a/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml.cs
index 6fbdbf4..c1ccdf7 100644
--- a/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/AsciiArtToolView.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
diff --git a/OpenSourceToolkit.NET/Views/Tools/Base64ToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/Base64ToolView.axaml
index c937b88..823b886 100644
--- a/OpenSourceToolkit.NET/Views/Tools/Base64ToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/Base64ToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
diff --git a/OpenSourceToolkit.NET/Views/Tools/ClipboardImageSaverToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/ClipboardImageSaverToolView.axaml
index aadf7f8..fd5b523 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ClipboardImageSaverToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ClipboardImageSaverToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -66,11 +66,11 @@
                                     <Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,Auto" Margin="0,10">
                                         <StackPanel Grid.Column="0" Margin="0,0,10,0" Spacing="5">
                                             <TextBlock Text="{loc:Localize Clipboard_Width_Label}"/>
-                                            <daisy:DaisyNumericUpDown Value="{Binding ResizeWidth}" Watermark="Original" Minimum="1" Maximum="10000" FormatString="0" MinWidth="120" Size="Small"/>
+                                            <daisy:DaisyNumericUpDown Value="{Binding ResizeWidth}" PlaceholderText="Original" Minimum="1" Maximum="10000" FormatString="0" MinWidth="120" Size="Small"/>
                                         </StackPanel>
                                         <StackPanel Grid.Column="1" Margin="0,0,10,0" Spacing="5">
                                             <TextBlock Text="{loc:Localize Clipboard_Height_Label}"/>
-                                            <daisy:DaisyNumericUpDown Value="{Binding ResizeHeight}" Watermark="Original" Minimum="1" Maximum="10000" FormatString="0" MinWidth="120" Size="Small"/>
+                                            <daisy:DaisyNumericUpDown Value="{Binding ResizeHeight}" PlaceholderText="Original" Minimum="1" Maximum="10000" FormatString="0" MinWidth="120" Size="Small"/>
                                         </StackPanel>
                                         <daisy:DaisyCheckBox Grid.Column="2" Content="{loc:Localize Clipboard_MaintainAspect_Label}"
                                                   IsChecked="{Binding MaintainAspectRatio}"
diff --git a/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml
index 860f1b0..93331f8 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -48,7 +48,7 @@
                             <!-- Hex Value -->
                             <StackPanel>
                                 <TextBlock Text="{loc:Localize Color_HexValue_Label}" Classes="Label"/>
-                                <daisy:DaisyInput Name="HexInputBox" Text="{Binding Hex}" Watermark="#RRGGBB" MinWidth="120">
+                                <daisy:DaisyInput Name="HexInputBox" Text="{Binding Hex}" PlaceholderText="#RRGGBB" MinWidth="120">
                                     <daisy:DaisyInput.KeyBindings>
                                         <KeyBinding Gesture="Enter" Command="{Binding UpdateFromHexInputCommand}" CommandParameter="{Binding #HexInputBox.Text}"/>
                                     </daisy:DaisyInput.KeyBindings>
diff --git a/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml.cs
index 0109558..b47789e 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/ColorToolView.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using OpenSourceToolkit.NET.ViewModels.Tools;
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/CronToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/CronToolView.axaml
index 1e62526..42cfe09 100644
--- a/OpenSourceToolkit.NET/Views/Tools/CronToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/CronToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:daisy="clr-namespace:Flowery.Controls;assembly=Flowery.NET"
@@ -88,7 +88,7 @@
             <!-- Expression Input -->
             <StackPanel Spacing="5">
                 <TextBlock Text="{loc:Localize Cron_Expression_Label}" FontWeight="SemiBold" />
-                <daisy:DaisyInput Text="{Binding Expression}" Watermark="{loc:Localize Cron_Expression_Watermark}" FontFamily="Consolas,Monospace" />
+                <daisy:DaisyInput Text="{Binding Expression}" PlaceholderText="{loc:Localize Cron_Expression_Watermark}" FontFamily="Consolas,Monospace" />
                 <TextBlock Text="{Binding Error}" Foreground="{DynamicResource DaisyErrorBrush}"
                            IsVisible="{Binding Error, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
             </StackPanel>
diff --git a/OpenSourceToolkit.NET/Views/Tools/DiffCheckerToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/DiffCheckerToolView.axaml
index ed5ac57..33a82a6 100644
--- a/OpenSourceToolkit.NET/Views/Tools/DiffCheckerToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/DiffCheckerToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -25,8 +25,8 @@
 
     <Grid RowDefinitions="*,Auto,2*">
         <Grid Grid.Row="0" ColumnDefinitions="*,10,*" Margin="0,0,0,10">
-            <daisy:DaisyTextArea Grid.Column="0" Text="{Binding Text1}" Watermark="{loc:Localize DiffChecker_Original_Watermark}" VerticalAlignment="Stretch" />
-            <daisy:DaisyTextArea Grid.Column="2" Text="{Binding Text2}" Watermark="{loc:Localize DiffChecker_New_Watermark}" VerticalAlignment="Stretch" />
+            <daisy:DaisyTextArea Grid.Column="0" Text="{Binding Text1}" PlaceholderText="{loc:Localize DiffChecker_Original_Watermark}" VerticalAlignment="Stretch" />
+            <daisy:DaisyTextArea Grid.Column="2" Text="{Binding Text2}" PlaceholderText="{loc:Localize DiffChecker_New_Watermark}" VerticalAlignment="Stretch" />
         </Grid>
 
         <daisy:DaisyButton Grid.Row="1" Command="{Binding CompareCommand}" Content="{loc:Localize DiffChecker_Compare_Button}" HorizontalAlignment="Center" Margin="0,0,0,10" Variant="Primary"/>
diff --git a/OpenSourceToolkit.NET/Views/Tools/DnsToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/DnsToolView.axaml
index 8371bfc..2697c7a 100644
--- a/OpenSourceToolkit.NET/Views/Tools/DnsToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/DnsToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -8,7 +8,7 @@
              x:DataType="vm:DnsToolViewModel">
     <StackPanel Spacing="10">
         <StackPanel Orientation="Horizontal" Spacing="10">
-            <daisy:DaisyInput Text="{Binding Domain}" Watermark="{loc:Localize Dns_Domain_Watermark}" Width="300" />
+            <daisy:DaisyInput Text="{Binding Domain}" PlaceholderText="{loc:Localize Dns_Domain_Watermark}" Width="300" />
             <daisy:DaisyButton Command="{Binding LookupCommand}" Content="{loc:Localize Dns_Lookup_Button}" Variant="Primary" />
         </StackPanel>
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/FinancialCalculatorToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/FinancialCalculatorToolView.axaml
index 904c800..d70fead 100644
--- a/OpenSourceToolkit.NET/Views/Tools/FinancialCalculatorToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/FinancialCalculatorToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -23,15 +23,15 @@
                     <Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,Auto" >
                         <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,20,10">
                             <TextBlock Text="{loc:Localize Financial_PrincipalAmount_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Principal}" Watermark="1000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Principal}" PlaceholderText="1000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" Margin="0,0,20,10">
                             <TextBlock Text="{loc:Localize Financial_AnnualRate_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Rate}" Watermark="5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Rate}" PlaceholderText="5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="2" Margin="0,0,0,10">
                             <TextBlock Text="{loc:Localize Financial_TimeYears_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Years}" Watermark="10" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="2" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Years}" PlaceholderText="10" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="2" Width="80" />
                         </StackPanel>
                     </Grid>
                     <daisy:DaisyButton Command="{Binding CalculateInterestCommand}" Content="{loc:Localize Financial_CalculateInterest_Button}" Variant="Primary" HorizontalAlignment="Left"/>
@@ -47,15 +47,15 @@
                     <Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto">
                         <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,20,0">
                             <TextBlock Text="{loc:Localize Financial_LoanAmount_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanAmount}" Watermark="250000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanAmount}" PlaceholderText="250000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" Margin="0,0,20,0">
                             <TextBlock Text="{loc:Localize Financial_InterestRate_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanRate}" Watermark="4.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanRate}" PlaceholderText="4.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="2">
                             <TextBlock Text="{loc:Localize Financial_LoanTermMonths_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanMonths}" Watermark="360" Maximum="600" MaxIntegerDigits="3" MaxDecimalPlaces="0" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding LoanMonths}" PlaceholderText="360" Maximum="600" MaxIntegerDigits="3" MaxDecimalPlaces="0" Width="80" />
                         </StackPanel>
                     </Grid>
                     <daisy:DaisyButton Command="{Binding CalculateLoanCommand}" Content="{loc:Localize Financial_CalculatePayment_Button}" Variant="Primary" HorizontalAlignment="Left"/>
@@ -71,19 +71,19 @@
                      <Grid ColumnDefinitions="Auto,Auto,Auto,Auto" RowDefinitions="Auto">
                         <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,20,0">
                             <TextBlock Text="{loc:Localize Financial_InitialInvestment_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvInitial}" Watermark="5000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvInitial}" PlaceholderText="5000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" Margin="0,0,20,0">
                             <TextBlock Text="{loc:Localize Financial_MonthlyContribution_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvMonthly}" Watermark="500" Maximum="999999999" MaxIntegerDigits="9" Width="100" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvMonthly}" PlaceholderText="500" Maximum="999999999" MaxIntegerDigits="9" Width="100" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="2" Margin="0,0,20,0">
                             <TextBlock Text="{loc:Localize Financial_AnnualReturn_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvRate}" Watermark="7" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvRate}" PlaceholderText="7" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="80" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="3">
                             <TextBlock Text="{loc:Localize Financial_PeriodYears_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvYears}" Watermark="20" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="2" Width="80" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding InvYears}" PlaceholderText="20" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="2" Width="80" />
                         </StackPanel>
                      </Grid>
                      <daisy:DaisyButton Command="{Binding CalculateInvestmentCommand}" Content="{loc:Localize Financial_CalculateGrowth_Button}" Variant="Primary" HorizontalAlignment="Left"/>
@@ -218,11 +218,11 @@
                     <Grid ColumnDefinitions="Auto,20,Auto" RowDefinitions="Auto">
                         <StackPanel Grid.Row="0" Grid.Column="0">
                             <TextBlock Text="{loc:Localize Financial_InitialInvestment_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Investment}" Watermark="1000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding Investment}" PlaceholderText="1000" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="2">
                             <TextBlock Text="{loc:Localize Financial_ReturnedAmount_Label}" FontWeight="SemiBold"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding ReturnAmount}" Watermark="1500" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding ReturnAmount}" PlaceholderText="1500" Maximum="999999999" MaxIntegerDigits="9" Width="120" />
                         </StackPanel>
                     </Grid>
                     <daisy:DaisyButton Command="{Binding CalculateRoiCommand}" Content="{loc:Localize Financial_CalculateROI_Button}" Variant="Primary" HorizontalAlignment="Left"/>
@@ -239,15 +239,15 @@
                     <Grid ColumnDefinitions="Auto,20,Auto,20,Auto,20,Auto,20,Auto,20,Auto" RowDefinitions="Auto">
                         <StackPanel Grid.Column="0">
                             <TextBlock Text="Home Price" FontWeight="SemiBold" FontSize="11"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortHomePrice}" Watermark="400000" Maximum="999999999" MaxIntegerDigits="9" Width="100"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortHomePrice}" PlaceholderText="400000" Maximum="999999999" MaxIntegerDigits="9" Width="100"/>
                         </StackPanel>
                         <StackPanel Grid.Column="2">
                             <TextBlock Text="Down Payment" FontWeight="SemiBold" FontSize="11"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortDownPayment}" Watermark="80000" Maximum="999999999" MaxIntegerDigits="9" Width="90"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortDownPayment}" PlaceholderText="80000" Maximum="999999999" MaxIntegerDigits="9" Width="90"/>
                         </StackPanel>
                         <StackPanel Grid.Column="4">
                             <TextBlock Text="Interest Rate %" FontWeight="SemiBold" FontSize="11"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortInterestRate}" Watermark="6.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortInterestRate}" PlaceholderText="6.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
                         </StackPanel>
                         <StackPanel Grid.Column="6">
                             <TextBlock Text="Term" FontWeight="SemiBold" FontSize="11"/>
@@ -259,11 +259,11 @@
                         </StackPanel>
                         <StackPanel Grid.Column="8">
                             <TextBlock Text="Annual Tax" FontWeight="SemiBold" FontSize="11"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortAnnualTax}" Watermark="4800" Maximum="999999" MaxIntegerDigits="6" Width="80"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortAnnualTax}" PlaceholderText="4800" Maximum="999999" MaxIntegerDigits="6" Width="80"/>
                         </StackPanel>
                         <StackPanel Grid.Column="10">
                             <TextBlock Text="Annual Insurance" FontWeight="SemiBold" FontSize="11"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortAnnualInsurance}" Watermark="1800" Maximum="999999" MaxIntegerDigits="6" Width="80"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding MortAnnualInsurance}" PlaceholderText="1800" Maximum="999999" MaxIntegerDigits="6" Width="80"/>
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -382,22 +382,22 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Text="Darlehensbetrag (€)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Loan Amount" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeLoanAmount}" Watermark="300000" Maximum="999999999" MaxIntegerDigits="9" Width="110"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeLoanAmount}" PlaceholderText="300000" Maximum="999999999" MaxIntegerDigits="9" Width="110"/>
                         </StackPanel>
                         <StackPanel Grid.Column="2">
                             <TextBlock Text="Sollzins (% p.a.)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Interest Rate" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeInterestRate}" Watermark="3.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeInterestRate}" PlaceholderText="3.5" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
                         </StackPanel>
                         <StackPanel Grid.Column="4">
                             <TextBlock Text="Anf. Tilgung (%)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Initial Repayment" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeTilgung}" Watermark="2.0" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeTilgung}" PlaceholderText="2.0" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
                         </StackPanel>
                         <StackPanel Grid.Column="6">
                             <TextBlock Text="Zinsbindung (J)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Fixed Period (Yrs)" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeZinsbindung}" Watermark="10" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="0" Width="60"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeZinsbindung}" PlaceholderText="10" Maximum="99" MaxIntegerDigits="2" MaxDecimalPlaces="0" Width="60"/>
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -493,17 +493,17 @@
                         <StackPanel>
                             <TextBlock Text="Anlagebetrag (€)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Deposit Amount" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdAmount}" Watermark="25000" Maximum="999999999" MaxIntegerDigits="9" Width="110"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdAmount}" PlaceholderText="25000" Maximum="999999999" MaxIntegerDigits="9" Width="110"/>
                         </StackPanel>
                         <StackPanel>
                             <TextBlock Text="Zinssatz (% p.a.)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Interest Rate" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdRate}" Watermark="3.0" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdRate}" PlaceholderText="3.0" Maximum="100" MaxIntegerDigits="3" MaxDecimalPlaces="3" Width="70"/>
                         </StackPanel>
                         <StackPanel>
                             <TextBlock Text="Laufzeit (Monate)" FontWeight="SemiBold" FontSize="11"/>
                             <TextBlock Text="Term (Months)" FontSize="10" Foreground="{DynamicResource DaisyBaseContentBrush}"/>
-                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdMonths}" Watermark="12" Maximum="600" MaxIntegerDigits="3" MaxDecimalPlaces="0" Width="70"/>
+                            <daisy:DaisyNumericUpDown Size="Small" Value="{Binding DeFdMonths}" PlaceholderText="12" Maximum="600" MaxIntegerDigits="3" MaxDecimalPlaces="0" Width="70"/>
                         </StackPanel>
                         <daisy:DaisyButton Command="{Binding CalculateDeFdCommand}" Content="Berechnen" ToolTip.Tip="Calculate" VerticalAlignment="Bottom" Variant="Primary" HorizontalAlignment="Left"/>
                     </StackPanel>
diff --git a/OpenSourceToolkit.NET/Views/Tools/FolderAnalyzerToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/FolderAnalyzerToolView.axaml
index d7c80c3..7697fd5 100644
--- a/OpenSourceToolkit.NET/Views/Tools/FolderAnalyzerToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/FolderAnalyzerToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -8,7 +8,7 @@
              x:DataType="vm:FolderAnalyzerToolViewModel">
     <Grid RowDefinitions="Auto,Auto,*">
         <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="10" Margin="0,0,0,10">
-            <TextBox Text="{Binding Path}" Watermark="{loc:Localize FolderAnalyzer_Path_Watermark}" Width="400" IsReadOnly="True" />
+            <TextBox Text="{Binding Path}" PlaceholderText="{loc:Localize FolderAnalyzer_Path_Watermark}" Width="400" IsReadOnly="True" />
             <daisy:DaisyButton Content="{loc:Localize FolderAnalyzer_Browse_Button}" Click="Browse_Click" IsEnabled="{Binding !IsAnalyzing}" />
             <daisy:DaisyButton Command="{Binding AnalyzeCommand}" Content="{loc:Localize FolderAnalyzer_Analyze_Button}" Variant="Primary" HorizontalAlignment="Left" />
             <daisy:DaisyButton Command="{Binding StopCommand}" Content="{loc:Localize FolderAnalyzer_Stop_Button}" Variant="Error" />
diff --git a/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml
index a11074b..4343bb5 100644
--- a/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:conv="using:OpenSourceToolkit.NET.Converters"
@@ -37,7 +37,7 @@
 
                     <!-- Search Box -->
                     <daisy:DaisyInput Text="{Binding SearchText}"
-                             Watermark="{loc:Localize Fonts_Search_Watermark}"/>
+                             PlaceholderText="{loc:Localize Fonts_Search_Watermark}"/>
 
                     <!-- Category Filter -->
                     <daisy:DaisySelect ItemsSource="{Binding Categories}"
@@ -280,7 +280,7 @@
                             <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
                                 <daisy:DaisyInput Grid.Column="0" Grid.Row="0"
                                          Text="{Binding CustomPreviewText}"
-                                         Watermark="{loc:Localize Fonts_PreviewText_Watermark}"
+                                         PlaceholderText="{loc:Localize Fonts_PreviewText_Watermark}"
                                          Margin="0,0,12,0"/>
                                 <StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal" Spacing="8">
                                     <TextBlock Text="{loc:Localize Fonts_Size_Label}" VerticalAlignment="Center"/>
diff --git a/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml.cs
index 8a53a2b..fb5b9b6 100644
--- a/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/FontsViewerToolView.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using OpenSourceToolkit.NET.ViewModels.Tools;
diff --git a/OpenSourceToolkit.NET/Views/Tools/HashToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/HashToolView.axaml
index bb36268..00eb7e6 100644
--- a/OpenSourceToolkit.NET/Views/Tools/HashToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/HashToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
diff --git a/OpenSourceToolkit.NET/Views/Tools/HmacToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/HmacToolView.axaml
index 1756736..b979afa 100644
--- a/OpenSourceToolkit.NET/Views/Tools/HmacToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/HmacToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -8,10 +8,10 @@
              x:DataType="vm:HmacToolViewModel">
     <StackPanel Spacing="10">
         <TextBlock Text="{loc:Localize Hmac_Message_Label}" />
-        <daisy:DaisyInput Text="{Binding Input}" Watermark="{loc:Localize Hmac_Message_Watermark}" />
+        <daisy:DaisyInput Text="{Binding Input}" PlaceholderText="{loc:Localize Hmac_Message_Watermark}" />
 
         <TextBlock Text="{loc:Localize Hmac_Key_Label}" />
-        <daisy:DaisyInput Text="{Binding Key}" Watermark="{loc:Localize Hmac_Key_Watermark}" PasswordChar="*" />
+        <daisy:DaisyInput Text="{Binding Key}" PlaceholderText="{loc:Localize Hmac_Key_Watermark}" PasswordChar="*" />
 
         <daisy:DaisyButton Command="{Binding GenerateCommand}" Content="{loc:Localize Hmac_Generate_Button}" Variant="Primary" HorizontalAlignment="Left" />
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/AiAssistantPanel.axaml b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/AiAssistantPanel.axaml
index 3ad827c..8e472de 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/AiAssistantPanel.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/AiAssistantPanel.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -197,7 +197,7 @@
         <StackPanel Grid.Row="3" Spacing="6">
             <TextBox x:Name="AiUserInputTextBox"
                      Text="{Binding AiUserInput}"
-                     Watermark="Enter message (Ctrl+Enter)"
+                     PlaceholderText="Enter message (Ctrl+Enter)"
                      AcceptsReturn="True"
                      TextWrapping="Wrap"
                      MinHeight="50"
diff --git a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/BatchConvertPanel.axaml b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/BatchConvertPanel.axaml
index 3dfa0fe..b37fb32 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/BatchConvertPanel.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/BatchConvertPanel.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -106,11 +106,11 @@
                     <StackPanel Spacing="8" IsVisible="{Binding ResizeEnabled}">
                         <Grid ColumnDefinitions="50,*">
                             <TextBlock Text="Width" VerticalAlignment="Center" FontSize="12"/>
-                            <NumericUpDown Grid.Column="1" Value="{Binding ResizeWidth}" Minimum="1" Maximum="10000" FormatString="0" Watermark="Auto"/>
+                            <NumericUpDown Grid.Column="1" Value="{Binding ResizeWidth}" Minimum="1" Maximum="10000" FormatString="0" PlaceholderText="Auto"/>
                         </Grid>
                         <Grid ColumnDefinitions="50,*">
                             <TextBlock Text="Height" VerticalAlignment="Center" FontSize="12"/>
-                            <NumericUpDown Grid.Column="1" Value="{Binding ResizeHeight}" Minimum="1" Maximum="10000" FormatString="0" Watermark="Auto"/>
+                            <NumericUpDown Grid.Column="1" Value="{Binding ResizeHeight}" Minimum="1" Maximum="10000" FormatString="0" PlaceholderText="Auto"/>
                         </Grid>
                         <daisy:DaisyCheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}" FontSize="12"/>
                     </StackPanel>
@@ -140,7 +140,7 @@
                     <daisy:DaisyCheckBox Content="Use Custom Pattern" IsChecked="{Binding UseRenamePattern}" FontSize="12"/>
 
                     <StackPanel Spacing="5" IsVisible="{Binding UseRenamePattern}">
-                        <TextBox Text="{Binding RenamePattern}" Watermark="{}{name}_{width}x{height}"/>
+                        <TextBox Text="{Binding RenamePattern}" PlaceholderText="{}{name}_{width}x{height}"/>
                         <TextBlock Text="{Binding RenamePatternPreview}" FontSize="10" Opacity="0.6" TextTrimming="CharacterEllipsis"/>
                         <TextBlock Text="Placeholders: {name} {ext} {width} {height} {date} {time} {index} {format}"
                                    FontSize="9" Opacity="0.5" TextWrapping="Wrap"/>
@@ -184,7 +184,7 @@
                             <daisy:DaisyButton Grid.Column="0" Command="{Binding ExtractPdfPagesCommand}" Content="Extract PDF Pages..."
                                     Shape="Block"/>
                             <NumericUpDown Grid.Column="1" Value="{Binding PdfDpi}" Minimum="72" Maximum="600"
-                                           FormatString="0" Watermark="DPI" Margin="5,0,0,0"/>
+                                           FormatString="0" PlaceholderText="DPI" Margin="5,0,0,0"/>
                         </Grid>
                     </StackPanel>
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/HorizontalToolOptionsBar.axaml b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/HorizontalToolOptionsBar.axaml
index f1e02f8..f2e096d 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ImageConverter/HorizontalToolOptionsBar.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ImageConverter/HorizontalToolOptionsBar.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -125,11 +125,11 @@
 
                     <TextBlock Text="W:"/>
                     <NumericUpDown Value="{Binding Workspace.ResizeWidth}" Minimum="1" Maximum="10000"
-                                   FormatString="0" Watermark="Auto" Width="75"/>
+                                   FormatString="0" PlaceholderText="Auto" Width="75"/>
 
                     <TextBlock Text="H:"/>
                     <NumericUpDown Value="{Binding Workspace.ResizeHeight}" Minimum="1" Maximum="10000"
-                                   FormatString="0" Watermark="Auto" Width="75"/>
+                                   FormatString="0" PlaceholderText="Auto" Width="75"/>
 
                     <ToggleButton IsChecked="{Binding Workspace.MaintainAspectRatio}"
                                   ToolTip.Tip="Keep Aspect Ratio" Padding="6,4">
@@ -319,7 +319,7 @@
                     <TextBlock Text="Watermark" FontWeight="SemiBold"/>
                     <Border Width="1" Background="{DynamicResource DaisyBase300Brush}" Margin="4,2"/>
                     <TextBlock Text="Text:"/>
-                    <TextBox Text="{Binding Workspace.WatermarkText}" Watermark="© Your Name" Width="120" Padding="4,3"/>
+                    <TextBox Text="{Binding Workspace.WatermarkText}" PlaceholderText="© Your Name" Width="120" Padding="4,3"/>
 
                     <Button Command="{Binding Workspace.LoadWatermarkImageCommand}" Content="Image" Padding="6,4"
                             ToolTip.Tip="Load watermark image"/>
@@ -355,7 +355,7 @@
                                     </Grid>
                                     <Grid ColumnDefinitions="60,*">
                                         <TextBlock Text="Color"/>
-                                        <TextBox Grid.Column="1" Text="{Binding Workspace.WatermarkColor}" Watermark="#FFFFFF"/>
+                                        <TextBox Grid.Column="1" Text="{Binding Workspace.WatermarkColor}" PlaceholderText="#FFFFFF"/>
                                     </Grid>
                                     <Grid ColumnDefinitions="60,*,35">
                                         <TextBlock Text="Padding"/>
diff --git a/OpenSourceToolkit.NET/Views/Tools/ImageConverterToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/ImageConverterToolView.axaml.cs
index da527fc..db786ba 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ImageConverterToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/ImageConverterToolView.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -417,7 +417,7 @@ private async Task<string> ShowRenameSessionDialog(string currentName)
             {
                 Text = currentName,
                 MaxLength = ImageConverterToolViewModel.MaxSessionNameLength,
-                Watermark = "Enter session name...",
+                PlaceholderText = "Enter session name...",
                 Height = 32,
                 FontSize = 14,
                 VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center
diff --git a/OpenSourceToolkit.NET/Views/Tools/ImageFullscreenViewer.axaml b/OpenSourceToolkit.NET/Views/Tools/ImageFullscreenViewer.axaml
index e925684..e2096d6 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ImageFullscreenViewer.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ImageFullscreenViewer.axaml
@@ -1,13 +1,12 @@
-<Window xmlns="https://github.com/avaloniaui"
+<Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="OpenSourceToolkit.NET.Views.Tools.ImageFullscreenViewer"
         Title="Image Viewer"
         WindowState="Maximized"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="None"
+        WindowDecorations="None"
         Background="#000000"
         ExtendClientAreaToDecorationsHint="True"
-        ExtendClientAreaChromeHints="NoChrome"
         CanResize="False"
         Topmost="True">
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/IpLocationToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/IpLocationToolView.axaml
index cdb9566..1f08dad 100644
--- a/OpenSourceToolkit.NET/Views/Tools/IpLocationToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/IpLocationToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -8,7 +8,7 @@
              x:DataType="vm:IpLocationToolViewModel">
     <StackPanel Spacing="10">
         <StackPanel Orientation="Horizontal" Spacing="10">
-            <daisy:DaisyInput Text="{Binding IpAddress}" Watermark="{loc:Localize IpLocation_IpAddress_Watermark}" Width="300" />
+            <daisy:DaisyInput Text="{Binding IpAddress}" PlaceholderText="{loc:Localize IpLocation_IpAddress_Watermark}" Width="300" />
             <daisy:DaisyButton Command="{Binding LookupCommand}" Content="{loc:Localize Button_Locate}" Variant="Primary" />
         </StackPanel>
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/JwtToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/JwtToolView.axaml
index 3ae2987..9acfec9 100644
--- a/OpenSourceToolkit.NET/Views/Tools/JwtToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/JwtToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
diff --git a/OpenSourceToolkit.NET/Views/Tools/KeyboardTesterToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/KeyboardTesterToolView.axaml
index 3b58aa1..44fb079 100644
--- a/OpenSourceToolkit.NET/Views/Tools/KeyboardTesterToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/KeyboardTesterToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -134,7 +134,7 @@
                                  IsEnabled="{Binding IsTypingTestActive}"
                                  AcceptsReturn="True" TextWrapping="Wrap"
                                  Height="100" FontSize="16"
-                                 Watermark="{loc:Localize Keyboard_TypeHere_Watermark}"
+                                 PlaceholderText="{loc:Localize Keyboard_TypeHere_Watermark}"
                                  FontFamily="Consolas,Monospace"/>
 
                         <Grid ColumnDefinitions="*,*,*">
diff --git a/OpenSourceToolkit.NET/Views/Tools/MarkdownEditorToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/MarkdownEditorToolView.axaml
index 44f705a..a2f7796 100644
--- a/OpenSourceToolkit.NET/Views/Tools/MarkdownEditorToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/MarkdownEditorToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:textdata="using:OpenSourceToolkit.TextData"
diff --git a/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml
index b21a53e..2c9cc0f 100644
--- a/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:daisy="clr-namespace:Flowery.Controls;assembly=Flowery.NET"
@@ -34,7 +34,7 @@
 
                             <TextBlock Text="{loc:Localize Pdf_OutputFile_Label}" FontWeight="Bold"/>
                             <Grid ColumnDefinitions="*,Auto" ColumnSpan="2">
-                                <TextBox Text="{Binding MergeOutputFile}" Watermark="{loc:Localize Pdf_OutputPath_Watermark}" IsReadOnly="True"/>
+                                <TextBox Text="{Binding MergeOutputFile}" PlaceholderText="{loc:Localize Pdf_OutputPath_Watermark}" IsReadOnly="True"/>
                                 <daisy:DaisyButton Grid.Column="1" Content="{loc:Localize Pdf_SaveAs_Button}" Click="MergeSaveAs_Click" Margin="10,0,0,0"/>
                             </Grid>
 
@@ -49,13 +49,13 @@
 
                             <TextBlock Text="{loc:Localize Pdf_InputFile_Label}" FontWeight="Bold"/>
                             <Grid ColumnDefinitions="*,Auto">
-                                <TextBox Text="{Binding SplitInputFile}" Watermark="{loc:Localize Pdf_SelectPdfToSplit_Watermark}" IsReadOnly="True"/>
+                                <TextBox Text="{Binding SplitInputFile}" PlaceholderText="{loc:Localize Pdf_SelectPdfToSplit_Watermark}" IsReadOnly="True"/>
                                 <daisy:DaisyButton Grid.Column="1" Content="{loc:Localize Pdf_Browse_Button}" Click="SplitBrowseInput_Click" Margin="10,0,0,0"/>
                             </Grid>
 
                             <TextBlock Text="{loc:Localize Pdf_OutputDirectory_Label}" FontWeight="Bold"/>
                             <Grid ColumnDefinitions="*,Auto">
-                                <TextBox Text="{Binding SplitOutputDir}" Watermark="{loc:Localize Pdf_SelectOutputFolder_Watermark}" IsReadOnly="True"/>
+                                <TextBox Text="{Binding SplitOutputDir}" PlaceholderText="{loc:Localize Pdf_SelectOutputFolder_Watermark}" IsReadOnly="True"/>
                                 <daisy:DaisyButton Grid.Column="1" Content="{loc:Localize Pdf_Browse_Button}" Click="SplitBrowseOutput_Click" Margin="10,0,0,0"/>
                             </Grid>
 
@@ -71,13 +71,13 @@
                             <!-- Input/Output Files -->
                             <TextBlock Text="{loc:Localize Pdf_InputFile_Label}" FontWeight="Bold"/>
                             <Grid ColumnDefinitions="*,Auto">
-                                <TextBox Text="{Binding WatermarkInputFile}" Watermark="{loc:Localize Pdf_SelectPdf_Watermark}" IsReadOnly="True"/>
+                                <TextBox Text="{Binding WatermarkInputFile}" PlaceholderText="{loc:Localize Pdf_SelectPdf_Watermark}" IsReadOnly="True"/>
                                 <daisy:DaisyButton Grid.Column="1" Content="{loc:Localize Pdf_Browse_Button}" Click="WatermarkBrowseInput_Click" Margin="10,0,0,0"/>
                             </Grid>
 
                             <TextBlock Text="{loc:Localize Pdf_OutputFile_Label}" FontWeight="Bold"/>
                             <Grid ColumnDefinitions="*,Auto">
-                                <TextBox Text="{Binding WatermarkOutputFile}" Watermark="{loc:Localize Pdf_OutputPath_Watermark}" IsReadOnly="True"/>
+                                <TextBox Text="{Binding WatermarkOutputFile}" PlaceholderText="{loc:Localize Pdf_OutputPath_Watermark}" IsReadOnly="True"/>
                                 <daisy:DaisyButton Grid.Column="1" Content="{loc:Localize Pdf_SaveAs_Button}" Click="WatermarkSaveAs_Click" Margin="10,0,0,0"/>
                             </Grid>
 
@@ -110,7 +110,7 @@
 
                             <!-- Watermark Text -->
                             <TextBlock Text="{loc:Localize Pdf_WatermarkText_Label}" FontWeight="Bold"/>
-                            <daisy:DaisyInput Text="{Binding WatermarkText}" Watermark="{loc:Localize Pdf_WatermarkText_Watermark}"/>
+                            <daisy:DaisyInput Text="{Binding WatermarkText}" PlaceholderText="{loc:Localize Pdf_WatermarkText_Watermark}"/>
 
                             <!-- Position and Rotation Row -->
                             <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto" Margin="0,5,0,0">
diff --git a/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml.cs
index 5bfd2a8..83d155a 100644
--- a/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/PdfToolView.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
@@ -97,7 +97,7 @@ private async Task<string> ShowPresetNameDialog(string currentName)
             var nameTextBox = new DaisyInput
             {
                 Text = currentName,
-                Watermark = "Enter preset name...",
+                PlaceholderText = "Enter preset name...",
                 Margin = new Thickness(0, 8, 0, 0)
             };
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/PrivacyPolicyToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/PrivacyPolicyToolView.axaml
index fdab3be..1809953 100644
--- a/OpenSourceToolkit.NET/Views/Tools/PrivacyPolicyToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/PrivacyPolicyToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -20,15 +20,15 @@
                     <StackPanel Spacing="10">
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize Privacy_CompanyName_Label}"/>
-                            <TextBox Text="{Binding CompanyName}" Watermark="{loc:Localize Privacy_CompanyName_Watermark}"/>
+                            <TextBox Text="{Binding CompanyName}" PlaceholderText="{loc:Localize Privacy_CompanyName_Watermark}"/>
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize Privacy_WebsiteUrl_Label}"/>
-                            <TextBox Text="{Binding WebsiteUrl}" Watermark="https://example.com"/>
+                            <TextBox Text="{Binding WebsiteUrl}" PlaceholderText="https://example.com"/>
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize Privacy_ContactEmail_Label}"/>
-                            <TextBox Text="{Binding ContactEmail}" Watermark="privacy@example.com"/>
+                            <TextBox Text="{Binding ContactEmail}" PlaceholderText="privacy@example.com"/>
                         </StackPanel>
                     </StackPanel>
                 </Border>
diff --git a/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml
index dbfc7ea..be925ca 100644
--- a/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:daisy="clr-namespace:Flowery.Controls;assembly=Flowery.NET"
@@ -56,7 +56,7 @@
             <!-- Inputs -->
             <StackPanel IsVisible="{Binding IsTextOrUrl}" Spacing="5">
                 <TextBlock Text="{loc:Localize QrCode_Content_Label}" />
-                <daisy:DaisyTextArea Text="{Binding InputText}" Watermark="{loc:Localize QrCode_ContentWatermark}" MinHeight="80" />
+                <daisy:DaisyTextArea Text="{Binding InputText}" PlaceholderText="{loc:Localize QrCode_ContentWatermark}" MinHeight="80" />
             </StackPanel>
 
             <StackPanel IsVisible="{Binding IsEmail}" Spacing="5">
diff --git a/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml.cs
index 29a7698..44011a4 100644
--- a/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/QrCodeToolView.axaml.cs
@@ -1,5 +1,6 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using OpenSourceToolkit.NET.ViewModels.Tools;
diff --git a/OpenSourceToolkit.NET/Views/Tools/ScientificCalculatorToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/ScientificCalculatorToolView.axaml.cs
index aabe8ed..fb6194f 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ScientificCalculatorToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/ScientificCalculatorToolView.axaml.cs
@@ -1,6 +1,7 @@
-#nullable enable
+#nullable enable
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using System.Collections.Specialized;
 using OpenSourceToolkit.NET.ViewModels.Tools;
diff --git a/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml
index 7cbfb57..b2d64e1 100644
--- a/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
@@ -145,7 +145,7 @@
                                  IsReadOnly="True"
                                  VerticalAlignment="Stretch"
                                  VerticalContentAlignment="Top"
-                                 Watermark="{loc:Localize SqlFormatter_Output_Watermark}"/>
+                                 PlaceholderText="{loc:Localize SqlFormatter_Output_Watermark}"/>
                     </Grid>
                 </Border>
         </Grid>
diff --git a/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml.cs
index 629a6b5..4e50214 100644
--- a/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/SqlFormatterToolView.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using OpenSourceToolkit.NET.ViewModels.Tools;
 
 namespace OpenSourceToolkit.NET.Views.Tools
diff --git a/OpenSourceToolkit.NET/Views/Tools/TextCaseToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/TextCaseToolView.axaml
index 79469f4..afab38b 100644
--- a/OpenSourceToolkit.NET/Views/Tools/TextCaseToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/TextCaseToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:controls="using:OpenSourceToolkit.NET.Controls"
diff --git a/OpenSourceToolkit.NET/Views/Tools/ThemeTestingToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/ThemeTestingToolView.axaml
index 9ca8603..5b1065a 100644
--- a/OpenSourceToolkit.NET/Views/Tools/ThemeTestingToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/ThemeTestingToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels"
              xmlns:toolsvm="using:OpenSourceToolkit.NET.ViewModels.Tools"
@@ -229,9 +229,9 @@
                     <WrapPanel Orientation="Horizontal">
                         <StackPanel Spacing="8" Margin="0,0,30,16">
                             <TextBlock Text="TextBox" FontWeight="SemiBold" FontSize="13"/>
-                            <TextBox Watermark="Enter text..." Width="200" Height="32"/>
+                            <TextBox PlaceholderText="Enter text..." Width="200" Height="32"/>
                             <TextBox Text="With content" Width="200" Height="32"/>
-                            <TextBox Watermark="Disabled" IsEnabled="False" Width="200" Height="32"/>
+                            <TextBox PlaceholderText="Disabled" IsEnabled="False" Width="200" Height="32"/>
                         </StackPanel>
                         <StackPanel Spacing="8" Margin="0,0,30,16">
                             <TextBlock Text="TextBox (Multiline)" FontWeight="SemiBold" FontSize="13"/>
@@ -240,7 +240,7 @@
                         </StackPanel>
                         <StackPanel Spacing="8" Margin="0,0,30,16">
                             <TextBlock Text="AutoCompleteBox" FontWeight="SemiBold" FontSize="13"/>
-                            <AutoCompleteBox Watermark="Type to search..." Width="200"
+                            <AutoCompleteBox PlaceholderText="Type to search..." Width="200"
                                              ItemsSource="Apple,Banana,Cherry,Date"/>
                         </StackPanel>
                         <StackPanel Spacing="8" Margin="0,0,30,16">
@@ -562,7 +562,7 @@
                     <Separator Background="{DynamicResource DaisyBase300Brush}" Height="1" Margin="0,8"/>
                     <TextBlock Text="Label" FontWeight="SemiBold" FontSize="13"/>
                     <Label Content="This is a Label control" Target="{Binding #labelTarget}"/>
-                    <TextBox x:Name="labelTarget" Watermark="Target of label" Width="200" HorizontalAlignment="Left"/>
+                    <TextBox x:Name="labelTarget" PlaceholderText="Target of label" Width="200" HorizontalAlignment="Left"/>
                 </StackPanel>
             </Border>
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/UptimeToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/UptimeToolView.axaml
index d975e29..22dc1d5 100644
--- a/OpenSourceToolkit.NET/Views/Tools/UptimeToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/UptimeToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:OpenSourceToolkit.NET.ViewModels.Tools"
              xmlns:daisy="clr-namespace:Flowery.Controls;assembly=Flowery.NET"
@@ -6,7 +6,7 @@
              x:DataType="vm:UptimeToolViewModel">
     <StackPanel Spacing="10">
         <StackPanel Orientation="Horizontal" Spacing="10">
-            <daisy:DaisyInput Text="{Binding Url}" Watermark="Enter URL" Width="400" />
+            <daisy:DaisyInput Text="{Binding Url}" PlaceholderText="Enter URL" Width="400" />
             <daisy:DaisyButton Command="{Binding CheckCommand}" Content="Check" Variant="Primary" HorizontalAlignment="Left" />
         </StackPanel>
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/UuidToolView.axaml.cs b/OpenSourceToolkit.NET/Views/Tools/UuidToolView.axaml.cs
index 40dcb70..6c597eb 100644
--- a/OpenSourceToolkit.NET/Views/Tools/UuidToolView.axaml.cs
+++ b/OpenSourceToolkit.NET/Views/Tools/UuidToolView.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using OpenSourceToolkit.NET.ViewModels.Tools;
 
diff --git a/OpenSourceToolkit.NET/Views/Tools/VCardGeneratorToolView.axaml b/OpenSourceToolkit.NET/Views/Tools/VCardGeneratorToolView.axaml
index 234ef71..84c5b04 100644
--- a/OpenSourceToolkit.NET/Views/Tools/VCardGeneratorToolView.axaml
+++ b/OpenSourceToolkit.NET/Views/Tools/VCardGeneratorToolView.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -21,20 +21,20 @@
                         <Grid ColumnDefinitions="*,10,*">
                             <StackPanel Grid.Column="0" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_FirstName_Label}"/>
-                                <TextBox Text="{Binding FirstName}" Watermark="John"/>
+                                <TextBox Text="{Binding FirstName}" PlaceholderText="John"/>
                             </StackPanel>
                             <StackPanel Grid.Column="2" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_LastName_Label}"/>
-                                <TextBox Text="{Binding LastName}" Watermark="Doe"/>
+                                <TextBox Text="{Binding LastName}" PlaceholderText="Doe"/>
                             </StackPanel>
                         </Grid>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_Email_Label}"/>
-                            <TextBox Text="{Binding Email}" Watermark="john.doe@example.com"/>
+                            <TextBox Text="{Binding Email}" PlaceholderText="john.doe@example.com"/>
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_Phone_Label}"/>
-                            <TextBox Text="{Binding Phone}" Watermark="+1 555 123 4567"/>
+                            <TextBox Text="{Binding Phone}" PlaceholderText="+1 555 123 4567"/>
                         </StackPanel>
                     </StackPanel>
                 </Border>
@@ -48,15 +48,15 @@
                     <StackPanel Spacing="10">
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_Organization_Label}"/>
-                            <TextBox Text="{Binding Organization}" Watermark="Acme Inc."/>
+                            <TextBox Text="{Binding Organization}" PlaceholderText="Acme Inc."/>
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_JobTitle_Label}"/>
-                            <TextBox Text="{Binding Title}" Watermark="Software Developer"/>
+                            <TextBox Text="{Binding Title}" PlaceholderText="Software Developer"/>
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_Website_Label}"/>
-                            <TextBox Text="{Binding Website}" Watermark="https://example.com"/>
+                            <TextBox Text="{Binding Website}" PlaceholderText="https://example.com"/>
                         </StackPanel>
                     </StackPanel>
                 </Border>
@@ -70,26 +70,26 @@
                     <StackPanel Spacing="10">
                         <StackPanel Spacing="4">
                             <TextBlock Text="{loc:Localize VCard_Street_Label}"/>
-                            <TextBox Text="{Binding Street}" Watermark="123 Main Street"/>
+                            <TextBox Text="{Binding Street}" PlaceholderText="123 Main Street"/>
                         </StackPanel>
                         <Grid ColumnDefinitions="*,10,*">
                             <StackPanel Grid.Column="0" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_City_Label}"/>
-                                <TextBox Text="{Binding City}" Watermark="New York"/>
+                                <TextBox Text="{Binding City}" PlaceholderText="New York"/>
                             </StackPanel>
                             <StackPanel Grid.Column="2" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_State_Label}"/>
-                                <TextBox Text="{Binding State}" Watermark="NY"/>
+                                <TextBox Text="{Binding State}" PlaceholderText="NY"/>
                             </StackPanel>
                         </Grid>
                         <Grid ColumnDefinitions="*,10,*">
                             <StackPanel Grid.Column="0" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_PostalCode_Label}"/>
-                                <TextBox Text="{Binding PostalCode}" Watermark="10001"/>
+                                <TextBox Text="{Binding PostalCode}" PlaceholderText="10001"/>
                             </StackPanel>
                             <StackPanel Grid.Column="2" Spacing="4">
                                 <TextBlock Text="{loc:Localize VCard_Country_Label}"/>
-                                <TextBox Text="{Binding Country}" Watermark="USA"/>
+                                <TextBox Text="{Binding Country}" PlaceholderText="USA"/>
                             </StackPanel>
                         </Grid>
                     </StackPanel>
diff --git a/OpenSourceToolkit.Security/OpenSourceToolkit.Security.csproj b/OpenSourceToolkit.Security/OpenSourceToolkit.Security.csproj
index 5f862f1..d0c95d1 100644
--- a/OpenSourceToolkit.Security/OpenSourceToolkit.Security.csproj
+++ b/OpenSourceToolkit.Security/OpenSourceToolkit.Security.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.8" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/OpenSourceToolkit.Tests/ConverterTests.cs b/OpenSourceToolkit.Tests/ConverterTests.cs
index cff395e..7938962 100644
--- a/OpenSourceToolkit.Tests/ConverterTests.cs
+++ b/OpenSourceToolkit.Tests/ConverterTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenSourceToolkit.Converters;
 
@@ -53,7 +53,7 @@ public void TextCase_NullAndEmpty_AreHandled()
         [TestMethod]
         public void Base64_Decode_Invalid_ThrowsFormatException()
         {
-            Assert.ThrowsException<FormatException>(() => Base64Converter.Decode("not-base64"));
+            Assert.Throws<FormatException>(() => Base64Converter.Decode("not-base64"));
         }
 
         // EthConverter
diff --git a/OpenSourceToolkit.Tests/IoTests.cs b/OpenSourceToolkit.Tests/IoTests.cs
index a10e4eb..c4dece1 100644
--- a/OpenSourceToolkit.Tests/IoTests.cs
+++ b/OpenSourceToolkit.Tests/IoTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenSourceToolkit.IO;
@@ -39,11 +39,10 @@ public void FolderAnalyzer_Analyze_ReturnsCorrectStructure()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(DirectoryNotFoundException))]
         public void FolderAnalyzer_Analyze_NonExistingDirectory_Throws()
         {
             string nonExisting = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
-            FolderAnalyzer.Analyze(nonExisting);
+            Assert.Throws<DirectoryNotFoundException>(() => FolderAnalyzer.Analyze(nonExisting));
         }
     }
 }
diff --git a/OpenSourceToolkit.Tests/MediaTests.cs b/OpenSourceToolkit.Tests/MediaTests.cs
index 57e4763..7dcbfac 100644
--- a/OpenSourceToolkit.Tests/MediaTests.cs
+++ b/OpenSourceToolkit.Tests/MediaTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenSourceToolkit.Media;
@@ -34,7 +34,7 @@ public void AsciiArt_ConvertText_WithMockFont_Works()
             try
             {
                 // We verify the method structure is in place by checking FileNotFound behavior
-                Assert.ThrowsException<FileNotFoundException>(() =>
+                Assert.Throws<FileNotFoundException>(() =>
                     AsciiArtGenerator.ConvertTextToAscii("Test", "non_existent.flf"));
             }
             finally
@@ -71,7 +71,7 @@ public void AsciiArt_ConvertText_WithExistingFont_ThrowsNotImplemented()
             {
                 File.WriteAllText(flfPath, "dummy");
 
-                Assert.ThrowsException<NotImplementedException>(() =>
+                Assert.Throws<NotImplementedException>(() =>
                     AsciiArtGenerator.ConvertTextToAscii("Test", flfPath));
             }
             finally
diff --git a/OpenSourceToolkit.Tests/OpenSourceToolkit.Tests.csproj b/OpenSourceToolkit.Tests/OpenSourceToolkit.Tests.csproj
index 7b3c954..6902f0a 100644
--- a/OpenSourceToolkit.Tests/OpenSourceToolkit.Tests.csproj
+++ b/OpenSourceToolkit.Tests/OpenSourceToolkit.Tests.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="SkiaSharp" Version="3.119.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.2.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.2.3" />
+    <PackageReference Include="SkiaSharp" Version="3.119.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OpenSourceToolkit.Tests/SchedulingTests.cs b/OpenSourceToolkit.Tests/SchedulingTests.cs
index 2a4e583..e318be9 100644
--- a/OpenSourceToolkit.Tests/SchedulingTests.cs
+++ b/OpenSourceToolkit.Tests/SchedulingTests.cs
@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenSourceToolkit.Scheduling;
 using System;
 using System.Linq;
@@ -24,10 +24,9 @@ public void CronScheduler_Parse_ValidExpression()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(NCrontab.CrontabException))]
         public void CronScheduler_Parse_InvalidExpression_Throws()
         {
-            new CronScheduler("invalid cron", () => { });
+            Assert.Throws<NCrontab.CrontabException>(() => new CronScheduler("invalid cron", () => { }));
         }
 
         [TestMethod]
@@ -43,10 +42,9 @@ public void CronScheduler_GetNextOccurrences_ReturnsIncreasingSequence()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(NCrontab.CrontabException))]
         public void CronScheduler_GetNextOccurrences_InvalidExpression_Throws()
         {
-            CronScheduler.GetNextOccurrences("invalid cron", 1);
+            Assert.Throws<NCrontab.CrontabException>(() => CronScheduler.GetNextOccurrences("invalid cron", 1));
         }
     }
 }