diff --git a/Exmaple2.0/App.axaml b/Exmaple2.0/App.axaml
index 5b7f261..6608660 100644
--- a/Exmaple2.0/App.axaml
+++ b/Exmaple2.0/App.axaml
@@ -8,7 +8,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-       <SimpleTheme></SimpleTheme>
+       <SimpleTheme />
         <StyleInclude Source="avares://MsBox.Avalonia.Markdown/Controls/MarkdownView.axaml" />
     </Application.Styles>
 
diff --git a/Exmaple2.0/App.axaml.cs b/Exmaple2.0/App.axaml.cs
index 41e2a23..51f3fce 100644
--- a/Exmaple2.0/App.axaml.cs
+++ b/Exmaple2.0/App.axaml.cs
@@ -12,6 +12,10 @@ public partial class App : Application
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
+//Uncomment these lines to use the new Dev Tools (part of Avalonia Plus or higher).
+//#if DEBUG
+     //   this.AttachDeveloperTools();
+//#endif
     }
 
     public override void OnFrameworkInitializationCompleted()
diff --git a/Exmaple2.0/Exmaple2.0.csproj b/Exmaple2.0/Exmaple2.0.csproj
index 9de00cf..bfa6469 100644
--- a/Exmaple2.0/Exmaple2.0.csproj
+++ b/Exmaple2.0/Exmaple2.0.csproj
@@ -26,11 +26,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.5" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.1.5" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.5" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.5" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+        <PackageReference Include="Avalonia" Version="12.0.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="12.0.1" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="12.0.1" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Exmaple2.0/Views/MainWindow.axaml.cs b/Exmaple2.0/Views/MainWindow.axaml.cs
index 3baa8d1..5a36186 100644
--- a/Exmaple2.0/Views/MainWindow.axaml.cs
+++ b/Exmaple2.0/Views/MainWindow.axaml.cs
@@ -24,10 +24,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-
-#endif
     }
 
     private async void Standard_Show_OnClick(object sender, RoutedEventArgs e)
diff --git a/MsBox.Avalonia.Markdown/MsBox.Avalonia.Markdown.csproj b/MsBox.Avalonia.Markdown/MsBox.Avalonia.Markdown.csproj
index 8f6f41a..59ab1fa 100644
--- a/MsBox.Avalonia.Markdown/MsBox.Avalonia.Markdown.csproj
+++ b/MsBox.Avalonia.Markdown/MsBox.Avalonia.Markdown.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <PackageVersion>3.2.0.0</PackageVersion>
+        <PackageVersion>4.0.0.0</PackageVersion>
         <Title>MessageBox.Avalonia.Markdown</Title>
         <Authors>Lary</Authors>
         <Description>Mardkown support for Messagebox AvaloniaUI</Description>
@@ -10,7 +10,7 @@
         <RepositoryUrl>messagebox.avalonia</RepositoryUrl>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageTags>Avalonia MessageBox Markdown</PackageTags>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -28,7 +28,7 @@
         <AvaloniaResource Include="Assets\*" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
+        <PackageReference Include="Markdown.Avalonia" Version="12.0.0-a3" />
     </ItemGroup>
     <ItemGroup>
         <None Update="..\MsBox.Avalonia\icon.jpg">
diff --git a/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs b/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
index 7438c88..4a80c3f 100644
--- a/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
+++ b/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Avalonia.LogicalTree;
 using Avalonia.Threading;
 
@@ -50,7 +51,7 @@ public Task Copy()
         {
             text = (DataContext as AbstractMsBoxViewModel)?.ContentMessage;
         }
-        return clipboard?.SetTextAsync(text);
+        return ClipboardExtensions.SetTextAsync(clipboard, text);
     }
 
     public void Close()
diff --git a/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs b/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
index 7c1bb33..5545cbb 100644
--- a/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
+++ b/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.Input.Platform;
 using Avalonia.LogicalTree;
 using Avalonia.Threading;
 
@@ -62,7 +63,7 @@ public Task Copy()
         {
             text = (DataContext as AbstractMsBoxViewModel)?.ContentMessage;
         }
-        return clipboard?.SetTextAsync(text);
+        return ClipboardExtensions.SetTextAsync(clipboard, text);
     }
 
     public void Close()
diff --git a/MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs b/MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs
index b52aa21..a5ddc24 100644
--- a/MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs
+++ b/MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs
@@ -91,7 +91,7 @@ public abstract class AbstractMessageBoxParams
     /// <summary>
     /// Determines system decorations (title bar, border, etc)
     /// </summary>
-    public SystemDecorations SystemDecorations { get; set; } = SystemDecorations.Full;
+    public WindowDecorations WindowDecorations { get; set; } = WindowDecorations.Full;
 
     /// <summary>
     /// Window under all windows
diff --git a/MsBox.Avalonia/MsBox.Avalonia.csproj b/MsBox.Avalonia/MsBox.Avalonia.csproj
index 7dd0bc4..89bd80c 100644
--- a/MsBox.Avalonia/MsBox.Avalonia.csproj
+++ b/MsBox.Avalonia/MsBox.Avalonia.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <PackageVersion>3.3.1.1</PackageVersion>
+        <PackageVersion>4.0.0.0</PackageVersion>
         <Title>MessageBox.Avalonia</Title>
         <Authors>Lary</Authors>
         <Description>Messagebox for AvaloniaUI</Description>
@@ -10,7 +10,7 @@
         <RepositoryUrl>messagebox.avalonia</RepositoryUrl>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageTags>Avalonia MessageBox</PackageTags>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -28,8 +28,8 @@
         <AvaloniaResource Include="Assets\*" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.5" />
-        <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
+        <PackageReference Include="Avalonia" Version="12.0.1" />
+        <PackageReference Include="DialogHost.Avalonia" Version="0.12.0" />
     </ItemGroup>
     <ItemGroup>
         <None Update="icon.jpg">
diff --git a/MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs b/MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs
index 88a4f50..c701c06 100644
--- a/MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs
+++ b/MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs
@@ -49,7 +49,7 @@ protected AbstractMsBoxViewModel(AbstractMessageBoxParams @params, Icon icon = I
         WindowIconPath = @params.WindowIcon;
         SizeToContent = @params.SizeToContent;
         LocationOfMyWindow = @params.WindowStartupLocation;
-        SystemDecorations = @params.SystemDecorations;
+        WindowDecorations = @params.WindowDecorations;
         Topmost = @params.Topmost;
         CloseOnClickAway = @params.CloseOnClickAway;
 
@@ -87,7 +87,7 @@ protected AbstractMsBoxViewModel(AbstractMessageBoxParams @params, Icon icon = I
     public double MaxHeight { get; set; }
     public double Height { get; set; }
 
-    public SystemDecorations SystemDecorations { get; set; }
+    public WindowDecorations WindowDecorations { get; set; }
     public bool Topmost { get; set; }
 
     public SizeToContent SizeToContent { get; set; } = SizeToContent.Height;
diff --git a/MsBox.Avalonia/Windows/MsBoxWindow.axaml b/MsBox.Avalonia/Windows/MsBoxWindow.axaml
index bbc4acb..85e4897 100644
--- a/MsBox.Avalonia/Windows/MsBoxWindow.axaml
+++ b/MsBox.Avalonia/Windows/MsBoxWindow.axaml
@@ -7,7 +7,7 @@
         x:Class="MsBox.Avalonia.Windows.MsBoxWindow"
         SizeToContent="WidthAndHeight"
         x:DataType="viewModels:AbstractMsBoxViewModel"
-        SystemDecorations="{Binding SystemDecorations}"
+        WindowDecorations="{Binding WindowDecorations}"
         Topmost="{Binding Topmost}"
         Icon="{Binding WindowIconPath}"
         WindowStartupLocation="{Binding LocationOfMyWindow}"