diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 063af6a..d2467f9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,7 +11,7 @@ resources:
 variables:
   BuildConfiguration: 'Release'
   BuildPlatform: 'Any CPU'
-  PublishFramework: 'net7.0'
+  PublishFramework: 'net8.0'
   PublishProject: 'SvgToXaml.Desktop'
   PublishRuntime: ''
   Workloads: 'wasm-tools wasm-experimental'
diff --git a/build/Avalonia.Controls.Skia.props b/build/Avalonia.Controls.Skia.props
index 2f25798..d57eea7 100644
--- a/build/Avalonia.Controls.Skia.props
+++ b/build/Avalonia.Controls.Skia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Controls.Skia" Version="11.0.0.3" />
+    <PackageReference Include="Avalonia.Controls.Skia" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
index a4c3bcf..f1b602c 100644
--- a/build/Avalonia.Desktop.props
+++ b/build/Avalonia.Desktop.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
index 9789761..b62448b 100644
--- a/build/Avalonia.Diagnostics.props
+++ b/build/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Markup.Xaml.Loader.props b/build/Avalonia.Markup.Xaml.Loader.props
index aab4441..8f5088a 100644
--- a/build/Avalonia.Markup.Xaml.Loader.props
+++ b/build/Avalonia.Markup.Xaml.Loader.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Skia.props b/build/Avalonia.Skia.props
index 400a0c6..74e899d 100644
--- a/build/Avalonia.Skia.props
+++ b/build/Avalonia.Skia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Skia" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Skia" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.ThemeManager.props b/build/Avalonia.ThemeManager.props
index 8a46326..04c83e2 100644
--- a/build/Avalonia.ThemeManager.props
+++ b/build/Avalonia.ThemeManager.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.ThemeManager" Version="11.0.0" />
+    <PackageReference Include="Avalonia.ThemeManager" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
index f2ffcee..59c1a74 100644
--- a/build/Avalonia.Themes.Fluent.props
+++ b/build/Avalonia.Themes.Fluent.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Web.props b/build/Avalonia.Web.props
index 24fddd7..e3b2b91 100644
--- a/build/Avalonia.Web.props
+++ b/build/Avalonia.Web.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Browser" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Browser" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Xaml.Behaviors.props b/build/Avalonia.Xaml.Behaviors.props
index 10b7b55..715eb13 100644
--- a/build/Avalonia.Xaml.Behaviors.props
+++ b/build/Avalonia.Xaml.Behaviors.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.2" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
index f873127..62a3357 100644
--- a/build/Avalonia.props
+++ b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.4" />
+    <PackageReference Include="Avalonia" Version="11.1.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
index 93d8de7..1ef7a85 100644
--- a/build/Base.props
+++ b/build/Base.props
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>11.0.6.1</VersionPrefix>
+    <VersionPrefix>11.1.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
-    <Copyright>Copyright © Wiesław Šoltés 2023</Copyright>
+    <Copyright>Copyright © Wiesław Šoltés 2024</Copyright>
     <PackageProjectUrl>https://github.com/wieslawsoltes/SvgToXaml</PackageProjectUrl>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/build/SkiaSharp.Linux.props b/build/SkiaSharp.Linux.props
index 9196633..bcb7e27 100644
--- a/build/SkiaSharp.Linux.props
+++ b/build/SkiaSharp.Linux.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
   </ItemGroup>
 </Project>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index f49bb0e..cdd144a 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp" Version="2.88.8" />
   </ItemGroup>
 </Project>
diff --git a/build/Svg.Skia.props b/build/Svg.Skia.props
index a56f2ef..b4943f6 100644
--- a/build/Svg.Skia.props
+++ b/build/Svg.Skia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Svg.Skia" Version="1.0.0.3" />
+    <PackageReference Include="Svg.Skia" Version="2.0.0" />
   </ItemGroup>
 </Project>
diff --git a/build/build/_build.csproj b/build/build/_build.csproj
index 51d86d9..f187b67 100644
--- a/build/build/_build.csproj
+++ b/build/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
diff --git a/global.json b/global.json
index 918ec81..7865629 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }
diff --git a/nuget.config b/nuget.config
index a91feea..99d827d 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,7 +4,5 @@
   <packageSources>
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="avalonia" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" protocolVersion="3" />
-    <add key="skiasharp" value="https://aka.ms/skiasharp-eap/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/src/SvgToXaml.Base/SvgToXaml.Base.csproj b/src/SvgToXaml.Base/SvgToXaml.Base.csproj
index bdbc963..73f2a9a 100644
--- a/src/SvgToXaml.Base/SvgToXaml.Base.csproj
+++ b/src/SvgToXaml.Base/SvgToXaml.Base.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/src/SvgToXaml.Converter/SvgToXaml.Converter.csproj b/src/SvgToXaml.Converter/SvgToXaml.Converter.csproj
index 39c55a3..08e1b03 100644
--- a/src/SvgToXaml.Converter/SvgToXaml.Converter.csproj
+++ b/src/SvgToXaml.Converter/SvgToXaml.Converter.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <IsPackable>True</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/SvgToXaml.Desktop/SvgToXaml.Desktop.csproj b/src/SvgToXaml.Desktop/SvgToXaml.Desktop.csproj
index 3f38fca..19a13cb 100644
--- a/src/SvgToXaml.Desktop/SvgToXaml.Desktop.csproj
+++ b/src/SvgToXaml.Desktop/SvgToXaml.Desktop.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/src/SvgToXaml.Model/Drawing/DrawingGroup.cs b/src/SvgToXaml.Model/Drawing/DrawingGroup.cs
index e3b0d03..2c44ad5 100644
--- a/src/SvgToXaml.Model/Drawing/DrawingGroup.cs
+++ b/src/SvgToXaml.Model/Drawing/DrawingGroup.cs
@@ -127,9 +127,9 @@ private void Initialize(ShimSkiaSharp.SKPicture? picture, ResourceDictionary? re
 
                     break;
                 }
-                case ShimSkiaSharp.SetMatrixCanvasCommand(var skMatrix):
+                case ShimSkiaSharp.SetMatrixCanvasCommand(_, var skTotalMatrix):
                 {
-                    var matrix = Factory.s_model.ToSKMatrix(skMatrix);
+                    var matrix = Factory.s_model.ToSKMatrix(skTotalMatrix);
                     if (matrix.IsIdentity)
                     {
                         break;
diff --git a/src/SvgToXaml.Model/SvgToXaml.Model.csproj b/src/SvgToXaml.Model/SvgToXaml.Model.csproj
index 8d54784..e54a144 100644
--- a/src/SvgToXaml.Model/SvgToXaml.Model.csproj
+++ b/src/SvgToXaml.Model/SvgToXaml.Model.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <IsPackable>True</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/SvgToXaml.Web/SvgToXaml.Web.csproj b/src/SvgToXaml.Web/SvgToXaml.Web.csproj
index 23a74ed..3d5fe40 100644
--- a/src/SvgToXaml.Web/SvgToXaml.Web.csproj
+++ b/src/SvgToXaml.Web/SvgToXaml.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0-browser</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
     <OutputType>Exe</OutputType>
diff --git a/src/svgxaml/svgxaml.csproj b/src/svgxaml/svgxaml.csproj
index 15e7617..13a9207 100644
--- a/src/svgxaml/svgxaml.csproj
+++ b/src/svgxaml/svgxaml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>True</IsPackable>
     <IsTool>True</IsTool>
     <PackAsTool>True</PackAsTool>
diff --git a/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj b/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj
index cfae051..764f490 100644
--- a/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj
+++ b/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>