From 36e185edf28180ed18397b3edc86491bec444d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Wed, 17 Aug 2022 12:20:25 +0200
Subject: [PATCH] Update

---
 src/Draw2D.Destop/Draw2D.Desktop.csproj       |  3 +-
 src/Draw2D.Destop/Program.cs                  |  1 -
 src/Draw2D.Web/Draw2D.Web.csproj              |  3 +-
 src/Draw2D/Draw2D.csproj                      | 15 +++---
 .../Presenters/AvaloniaContainerPresenter.cs  | 10 +++-
 .../Containers/CanvasContainerView.axaml      |  4 +-
 .../Containers/DocumentContainerView.axaml    |  4 +-
 .../Views/Containers/GroupLibraryView.axaml   |  4 +-
 .../Views/Containers/SelectionStateView.axaml |  4 +-
 .../Views/Containers/StyleLibraryView.axaml   |  4 +-
 src/Draw2D/Views/ContainersView.axaml         |  8 ++--
 src/Draw2D/Views/MainView.axaml               | 16 +++----
 src/Draw2D/Views/Shapes/ArcShapeView.axaml    |  4 +-
 src/Draw2D/Views/Shapes/CircleShapeView.axaml |  4 +-
 src/Draw2D/Views/Shapes/ConicShapeView.axaml  |  4 +-
 .../Views/Shapes/CubicBezierShapeView.axaml   |  4 +-
 src/Draw2D/Views/Shapes/FigureShapeView.axaml |  4 +-
 src/Draw2D/Views/Shapes/GroupShapeView.axaml  |  8 ++--
 src/Draw2D/Views/Shapes/ImageShapeView.axaml  |  4 +-
 src/Draw2D/Views/Shapes/LineShapeView.axaml   |  4 +-
 src/Draw2D/Views/Shapes/OvalShapeView.axaml   |  4 +-
 src/Draw2D/Views/Shapes/PathShapeView.axaml   |  8 ++--
 .../Shapes/QuadraticBezierShapeView.axaml     |  4 +-
 .../Views/Shapes/RectangleShapeView.axaml     |  4 +-
 .../Views/Shapes/ReferenceShapeView.axaml     |  4 +-
 src/Draw2D/Views/Shapes/TextShapeView.axaml   |  4 +-
 src/Draw2D/Views/Tools/ArcToolView.axaml      |  4 +-
 src/Draw2D/Views/Tools/CircleToolView.axaml   |  4 +-
 src/Draw2D/Views/Tools/ConicToolView.axaml    |  4 +-
 .../Views/Tools/CubicBezierToolView.axaml     |  4 +-
 src/Draw2D/Views/Tools/LineToolView.axaml     |  4 +-
 src/Draw2D/Views/Tools/MoveToolView.axaml     |  4 +-
 src/Draw2D/Views/Tools/NoneToolView.axaml     |  4 +-
 src/Draw2D/Views/Tools/OvalToolView.axaml     |  4 +-
 .../Views/Tools/PathToolSettingsView.axaml    |  8 ++--
 src/Draw2D/Views/Tools/PathToolView.axaml     |  4 +-
 src/Draw2D/Views/Tools/PointToolView.axaml    |  4 +-
 src/Draw2D/Views/Tools/PolyLineToolView.axaml |  4 +-
 .../Views/Tools/QuadraticBezierToolView.axaml |  4 +-
 .../Views/Tools/RectangleToolView.axaml       |  4 +-
 src/Draw2D/Views/Tools/ScribbleToolView.axaml |  4 +-
 .../Views/Tools/SelectionToolView.axaml       |  4 +-
 src/Draw2D/Views/Tools/TextToolView.axaml     |  4 +-
 src/Draw2D/Zoom/ZoomControl.cs                | 46 +++++++++----------
 44 files changed, 131 insertions(+), 127 deletions(-)

diff --git a/src/Draw2D.Destop/Draw2D.Desktop.csproj b/src/Draw2D.Destop/Draw2D.Desktop.csproj
index e4954f5d..d0ea8642 100644
--- a/src/Draw2D.Destop/Draw2D.Desktop.csproj
+++ b/src/Draw2D.Destop/Draw2D.Desktop.csproj
@@ -7,6 +7,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>disable</Nullable>
     <RootNamespace>Draw2D.Desktop</RootNamespace>
+    <AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Draw2D.Destop/Program.cs b/src/Draw2D.Destop/Program.cs
index d112d748..ac5ecf3a 100644
--- a/src/Draw2D.Destop/Program.cs
+++ b/src/Draw2D.Destop/Program.cs
@@ -37,7 +37,6 @@ namespace Draw2D.Desktop
         {
             return new Win32PlatformOptions
             {
-                EnableMultitouch = true,
                 AllowEglInitialization = true,
                 UseDeferredRendering = true
             };
diff --git a/src/Draw2D.Web/Draw2D.Web.csproj b/src/Draw2D.Web/Draw2D.Web.csproj
index 014850e0..010b32bc 100644
--- a/src/Draw2D.Web/Draw2D.Web.csproj
+++ b/src/Draw2D.Web/Draw2D.Web.csproj
@@ -7,6 +7,7 @@
     <EmccTotalMemory>16777216</EmccTotalMemory>
     <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
     <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
+    <AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- In debug, make builds faster by reducing optimizations -->
@@ -57,7 +58,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="Avalonia.Web.Blazor" Version="0.10.12" />
+    <PackageReference Include="Avalonia.Web.Blazor" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Draw2D/Draw2D.csproj b/src/Draw2D/Draw2D.csproj
index e5ff624a..f1273aff 100644
--- a/src/Draw2D/Draw2D.csproj
+++ b/src/Draw2D/Draw2D.csproj
@@ -7,6 +7,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>disable</Nullable>
     <RootNamespace>Draw2D</RootNamespace>
+    <AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,15 +17,15 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Math.Spatial" Version="1.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.0-preview.178" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.178" />
+    <PackageReference Include="SkiaSharp" Version="2.88.1-preview.108" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.108" />
     <PackageReference Include="Svg.Skia" Version="0.5.12" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Skia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Draw2D/ViewModels/Editor/Presenters/AvaloniaContainerPresenter.cs b/src/Draw2D/ViewModels/Editor/Presenters/AvaloniaContainerPresenter.cs
index 9d7bd8c2..c59d14d0 100644
--- a/src/Draw2D/ViewModels/Editor/Presenters/AvaloniaContainerPresenter.cs
+++ b/src/Draw2D/ViewModels/Editor/Presenters/AvaloniaContainerPresenter.cs
@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using Avalonia.Skia;
 using Draw2D.ViewModels.Containers;
 using Draw2D.ViewModels.Tools;
@@ -62,9 +63,14 @@ namespace Draw2D.Presenters
                 }
 
                 using var drawingContextImpl = _renderTarget.CreateDrawingContext(null);
-                var skiaDrawingContextImpl = drawingContextImpl as ISkiaDrawingContextImpl;
+                var leaseFeature = drawingContextImpl.GetFeature<ISkiaSharpApiLeaseFeature>();
+                if (leaseFeature is null)
+                {
+                    return;
+                }
+                using var lease = leaseFeature.Lease();
 
-                if (skiaDrawingContextImpl?.SkCanvas is { } skCanvas)
+                if (lease?.SkCanvas is { } skCanvas)
                 {
                     var skMatrix = SKMatrix.CreateScale((float)(1.0 / renderScaling), (float)(1.0 / renderScaling));
 
diff --git a/src/Draw2D/Views/Containers/CanvasContainerView.axaml b/src/Draw2D/Views/Containers/CanvasContainerView.axaml
index e7aa130e..ebc22c78 100644
--- a/src/Draw2D/Views/Containers/CanvasContainerView.axaml
+++ b/src/Draw2D/Views/Containers/CanvasContainerView.axaml
@@ -19,11 +19,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Shapes">
           <ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Containers/DocumentContainerView.axaml b/src/Draw2D/Views/Containers/DocumentContainerView.axaml
index 588bd731..3e758db5 100644
--- a/src/Draw2D/Views/Containers/DocumentContainerView.axaml
+++ b/src/Draw2D/Views/Containers/DocumentContainerView.axaml
@@ -19,11 +19,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Views">
           <ListBox Classes="default" Items="{Binding ContainerViews}" SelectedItem="{Binding ContainerView}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding Title}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Containers/GroupLibraryView.axaml b/src/Draw2D/Views/Containers/GroupLibraryView.axaml
index 9e9cc569..be6b4765 100644
--- a/src/Draw2D/Views/Containers/GroupLibraryView.axaml
+++ b/src/Draw2D/Views/Containers/GroupLibraryView.axaml
@@ -9,11 +9,11 @@
   <TabControl Classes="default" TabStripPlacement="Top">
     <TabItem Classes="default" Header="Groups">
       <ListBox x:Name="groups" Classes="default" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
-        <ListBox.DataTemplates>
+        <ListBox.ItemTemplate>
           <DataTemplate>
             <TextBlock Classes="list" Text="{Binding Title}" />
           </DataTemplate>
-        </ListBox.DataTemplates>
+        </ListBox.ItemTemplate>
       </ListBox>
       <!--
       <DataGrid x:Name="groups" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
diff --git a/src/Draw2D/Views/Containers/SelectionStateView.axaml b/src/Draw2D/Views/Containers/SelectionStateView.axaml
index 66efbe83..7486e4ff 100644
--- a/src/Draw2D/Views/Containers/SelectionStateView.axaml
+++ b/src/Draw2D/Views/Containers/SelectionStateView.axaml
@@ -17,11 +17,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Shapes">
           <ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes, Mode=OneWay}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Containers/StyleLibraryView.axaml b/src/Draw2D/Views/Containers/StyleLibraryView.axaml
index e2421e3a..944e446e 100644
--- a/src/Draw2D/Views/Containers/StyleLibraryView.axaml
+++ b/src/Draw2D/Views/Containers/StyleLibraryView.axaml
@@ -9,11 +9,11 @@
   <TabControl Classes="default" TabStripPlacement="Top">
     <TabItem Classes="default" Header="Styles">
       <ListBox x:Name="styles" Classes="default" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
-        <ListBox.DataTemplates>
+        <ListBox.ItemTemplate>
           <DataTemplate>
             <TextBlock Classes="list" Text="{Binding Title}" />
           </DataTemplate>
-        </ListBox.DataTemplates>
+        </ListBox.ItemTemplate>
       </ListBox>
       <!--
       <DataGrid x:Name="styles" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
diff --git a/src/Draw2D/Views/ContainersView.axaml b/src/Draw2D/Views/ContainersView.axaml
index 6583209c..08794973 100644
--- a/src/Draw2D/Views/ContainersView.axaml
+++ b/src/Draw2D/Views/ContainersView.axaml
@@ -44,7 +44,7 @@
           <Setter Property="Fill" Value="{DynamicResource SystemAccentColorLight1}" />
         </Style>
       </TabStrip.Styles>
-      <TabStrip.DataTemplates>
+      <TabStrip.ItemTemplate>
         <DataTemplate>
           <StackPanel Orientation="Horizontal" Margin="4,0,4,0" Spacing="2">
             <StackPanel Orientation="Horizontal" Margin="2">
@@ -58,11 +58,11 @@
             </Button>
           </StackPanel>
         </DataTemplate>
-      </TabStrip.DataTemplates>
+      </TabStrip.ItemTemplate>
     </TabStrip>
     <Carousel Items="{Binding DocumentContainer.ContainerViews}"
               SelectedItem="{Binding DocumentContainer.ContainerView, Mode=TwoWay}" IsVirtualized="False">
-      <Carousel.DataTemplates>
+      <Carousel.ItemTemplate>
         <DataTemplate>
           <Border Classes="background">
             <Border Classes="zoom">
@@ -174,7 +174,7 @@
             </Border>
           </Border>
         </DataTemplate>
-      </Carousel.DataTemplates>
+      </Carousel.ItemTemplate>
     </Carousel>
   </DockPanel>
 </UserControl>
diff --git a/src/Draw2D/Views/MainView.axaml b/src/Draw2D/Views/MainView.axaml
index 0a122164..670ec742 100644
--- a/src/Draw2D/Views/MainView.axaml
+++ b/src/Draw2D/Views/MainView.axaml
@@ -36,11 +36,11 @@
             <ComboBox Classes="default" Grid.Row="0" Items="{Binding DocumentContainer.StyleLibrary.Items}"
                       SelectedItem="{Binding DocumentContainer.StyleLibrary.CurrentItem, Mode=TwoWay}"
                       IsVisible="{Binding !!DocumentContainer.StyleLibrary.CurrentItem}">
-              <ComboBox.DataTemplates>
+              <ComboBox.ItemTemplate>
                 <DataTemplate>
                   <TextBlock Classes="default" Text="{Binding Title}" />
                 </DataTemplate>
-              </ComboBox.DataTemplates>
+              </ComboBox.ItemTemplate>
             </ComboBox>
             <ContentControl Grid.Row="1" Content="{Binding DocumentContainer.StyleLibrary.CurrentItem}" />
           </Grid>
@@ -50,11 +50,11 @@
             <ComboBox Classes="default" Grid.Row="0" Items="{Binding DocumentContainer.GroupLibrary.Items}"
                       SelectedItem="{Binding DocumentContainer.GroupLibrary.CurrentItem, Mode=TwoWay}"
                       IsVisible="{Binding !!DocumentContainer.GroupLibrary.CurrentItem}">
-              <ComboBox.DataTemplates>
+              <ComboBox.ItemTemplate>
                 <DataTemplate>
                   <TextBlock Classes="default" Text="{Binding Title}" />
                 </DataTemplate>
-              </ComboBox.DataTemplates>
+              </ComboBox.ItemTemplate>
             </ComboBox>
             <ContentControl Grid.Row="1" Content="{Binding DocumentContainer.GroupLibrary.CurrentItemm}" />
           </Grid>
@@ -74,11 +74,11 @@
         </TabItem>
         <TabItem Classes="default" Header="Tools">
           <ListBox Classes="default" Items="{Binding Tools}" SelectedItem="{Binding CurrentTool}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding Title}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
       </TabControl>
@@ -98,11 +98,11 @@
         <TabItem Classes="default" Header="Views">
           <ListBox Classes="default" Items="{Binding ContainerViews}" SelectedItem="{Binding ContainerView}"
                    DataContext="{Binding DocumentContainer}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding Title}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Groups">
diff --git a/src/Draw2D/Views/Shapes/ArcShapeView.axaml b/src/Draw2D/Views/Shapes/ArcShapeView.axaml
index c3401886..da770d88 100644
--- a/src/Draw2D/Views/Shapes/ArcShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/ArcShapeView.axaml
@@ -33,11 +33,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/CircleShapeView.axaml b/src/Draw2D/Views/Shapes/CircleShapeView.axaml
index 06f3a77a..89f1ec09 100644
--- a/src/Draw2D/Views/Shapes/CircleShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/CircleShapeView.axaml
@@ -29,11 +29,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/ConicShapeView.axaml b/src/Draw2D/Views/Shapes/ConicShapeView.axaml
index 3d961145..b633bc98 100644
--- a/src/Draw2D/Views/Shapes/ConicShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/ConicShapeView.axaml
@@ -34,11 +34,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/CubicBezierShapeView.axaml b/src/Draw2D/Views/Shapes/CubicBezierShapeView.axaml
index 3de04df6..629ff257 100644
--- a/src/Draw2D/Views/Shapes/CubicBezierShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/CubicBezierShapeView.axaml
@@ -35,11 +35,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/FigureShapeView.axaml b/src/Draw2D/Views/Shapes/FigureShapeView.axaml
index 4f030100..2155b0a2 100644
--- a/src/Draw2D/Views/Shapes/FigureShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/FigureShapeView.axaml
@@ -25,11 +25,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Shapes">
           <ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/GroupShapeView.axaml b/src/Draw2D/Views/Shapes/GroupShapeView.axaml
index 8ef93fab..931d1d22 100644
--- a/src/Draw2D/Views/Shapes/GroupShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/GroupShapeView.axaml
@@ -23,11 +23,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Shapes">
           <ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
@@ -39,11 +39,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/ImageShapeView.axaml b/src/Draw2D/Views/Shapes/ImageShapeView.axaml
index a6b13a34..36bcb92d 100644
--- a/src/Draw2D/Views/Shapes/ImageShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/ImageShapeView.axaml
@@ -34,11 +34,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/LineShapeView.axaml b/src/Draw2D/Views/Shapes/LineShapeView.axaml
index ceaf9304..dc96f65f 100644
--- a/src/Draw2D/Views/Shapes/LineShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/LineShapeView.axaml
@@ -29,11 +29,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/OvalShapeView.axaml b/src/Draw2D/Views/Shapes/OvalShapeView.axaml
index 53ac9c5b..78aec01d 100644
--- a/src/Draw2D/Views/Shapes/OvalShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/OvalShapeView.axaml
@@ -29,11 +29,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/PathShapeView.axaml b/src/Draw2D/Views/Shapes/PathShapeView.axaml
index 49dd5ecf..44fcdbe8 100644
--- a/src/Draw2D/Views/Shapes/PathShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/PathShapeView.axaml
@@ -28,11 +28,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Shapes">
           <ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
@@ -44,11 +44,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/QuadraticBezierShapeView.axaml b/src/Draw2D/Views/Shapes/QuadraticBezierShapeView.axaml
index 0a002a82..4bf12f68 100644
--- a/src/Draw2D/Views/Shapes/QuadraticBezierShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/QuadraticBezierShapeView.axaml
@@ -32,11 +32,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/RectangleShapeView.axaml b/src/Draw2D/Views/Shapes/RectangleShapeView.axaml
index 70e98833..1e10e1e0 100644
--- a/src/Draw2D/Views/Shapes/RectangleShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/RectangleShapeView.axaml
@@ -33,11 +33,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/ReferenceShapeView.axaml b/src/Draw2D/Views/Shapes/ReferenceShapeView.axaml
index 49b247ba..0469b13a 100644
--- a/src/Draw2D/Views/Shapes/ReferenceShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/ReferenceShapeView.axaml
@@ -27,11 +27,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Shapes/TextShapeView.axaml b/src/Draw2D/Views/Shapes/TextShapeView.axaml
index f3d7b790..f2eb9044 100644
--- a/src/Draw2D/Views/Shapes/TextShapeView.axaml
+++ b/src/Draw2D/Views/Shapes/TextShapeView.axaml
@@ -29,11 +29,11 @@
       <TabControl Classes="default" TabStripPlacement="Top">
         <TabItem Classes="default" Header="Points">
           <ListBox x:Name="points" Classes="default" Items="{Binding Points}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
         <TabItem Classes="default" Header="Selected">
diff --git a/src/Draw2D/Views/Tools/ArcToolView.axaml b/src/Draw2D/Views/Tools/ArcToolView.axaml
index 353c309e..8edf8d5e 100644
--- a/src/Draw2D/Views/Tools/ArcToolView.axaml
+++ b/src/Draw2D/Views/Tools/ArcToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/CircleToolView.axaml b/src/Draw2D/Views/Tools/CircleToolView.axaml
index c7fbd237..8436d54d 100644
--- a/src/Draw2D/Views/Tools/CircleToolView.axaml
+++ b/src/Draw2D/Views/Tools/CircleToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/ConicToolView.axaml b/src/Draw2D/Views/Tools/ConicToolView.axaml
index af019b39..d3eba8f6 100644
--- a/src/Draw2D/Views/Tools/ConicToolView.axaml
+++ b/src/Draw2D/Views/Tools/ConicToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/CubicBezierToolView.axaml b/src/Draw2D/Views/Tools/CubicBezierToolView.axaml
index fa6b48e4..5799aa7a 100644
--- a/src/Draw2D/Views/Tools/CubicBezierToolView.axaml
+++ b/src/Draw2D/Views/Tools/CubicBezierToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/LineToolView.axaml b/src/Draw2D/Views/Tools/LineToolView.axaml
index 36f8ec13..ff9fda95 100644
--- a/src/Draw2D/Views/Tools/LineToolView.axaml
+++ b/src/Draw2D/Views/Tools/LineToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/MoveToolView.axaml b/src/Draw2D/Views/Tools/MoveToolView.axaml
index cadfc9a1..4d9439e4 100644
--- a/src/Draw2D/Views/Tools/MoveToolView.axaml
+++ b/src/Draw2D/Views/Tools/MoveToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/NoneToolView.axaml b/src/Draw2D/Views/Tools/NoneToolView.axaml
index 734d5ad4..f7e80d02 100644
--- a/src/Draw2D/Views/Tools/NoneToolView.axaml
+++ b/src/Draw2D/Views/Tools/NoneToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/OvalToolView.axaml b/src/Draw2D/Views/Tools/OvalToolView.axaml
index cb20c7a3..f72d5f68 100644
--- a/src/Draw2D/Views/Tools/OvalToolView.axaml
+++ b/src/Draw2D/Views/Tools/OvalToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/PathToolSettingsView.axaml b/src/Draw2D/Views/Tools/PathToolSettingsView.axaml
index 3367a936..bcda6812 100644
--- a/src/Draw2D/Views/Tools/PathToolSettingsView.axaml
+++ b/src/Draw2D/Views/Tools/PathToolSettingsView.axaml
@@ -24,11 +24,11 @@
           <TextBlock Classes="default" Grid.Column="0" Grid.Row="5" Text="CurrentTool" />
           <ComboBox Classes="default" Grid.Column="1" Grid.Row="5" Items="{Binding Tools}"
                     SelectedItem="{Binding CurrentTool, Mode=OneWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
         </Grid>
       </ScrollViewer>
@@ -43,11 +43,11 @@
         </TabItem>
         <TabItem Classes="default" Header="Tools">
           <ListBox Classes="default" Items="{Binding Tools}" SelectedItem="{Binding CurrentTool}">
-            <ListBox.DataTemplates>
+            <ListBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="list" Text="{Binding Title}" />
               </DataTemplate>
-            </ListBox.DataTemplates>
+            </ListBox.ItemTemplate>
           </ListBox>
         </TabItem>
       </TabControl>
diff --git a/src/Draw2D/Views/Tools/PathToolView.axaml b/src/Draw2D/Views/Tools/PathToolView.axaml
index cadbfa33..12f73a3e 100644
--- a/src/Draw2D/Views/Tools/PathToolView.axaml
+++ b/src/Draw2D/Views/Tools/PathToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/PointToolView.axaml b/src/Draw2D/Views/Tools/PointToolView.axaml
index 5a51fe3c..39ef8100 100644
--- a/src/Draw2D/Views/Tools/PointToolView.axaml
+++ b/src/Draw2D/Views/Tools/PointToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/PolyLineToolView.axaml b/src/Draw2D/Views/Tools/PolyLineToolView.axaml
index 9a6c70a6..bc057951 100644
--- a/src/Draw2D/Views/Tools/PolyLineToolView.axaml
+++ b/src/Draw2D/Views/Tools/PolyLineToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/QuadraticBezierToolView.axaml b/src/Draw2D/Views/Tools/QuadraticBezierToolView.axaml
index 1ff1a91e..581f4d47 100644
--- a/src/Draw2D/Views/Tools/QuadraticBezierToolView.axaml
+++ b/src/Draw2D/Views/Tools/QuadraticBezierToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/RectangleToolView.axaml b/src/Draw2D/Views/Tools/RectangleToolView.axaml
index 3d9754f2..1e86f25c 100644
--- a/src/Draw2D/Views/Tools/RectangleToolView.axaml
+++ b/src/Draw2D/Views/Tools/RectangleToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/ScribbleToolView.axaml b/src/Draw2D/Views/Tools/ScribbleToolView.axaml
index c3819c54..cd0fbc85 100644
--- a/src/Draw2D/Views/Tools/ScribbleToolView.axaml
+++ b/src/Draw2D/Views/Tools/ScribbleToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/SelectionToolView.axaml b/src/Draw2D/Views/Tools/SelectionToolView.axaml
index 71c7c00c..3be90e9d 100644
--- a/src/Draw2D/Views/Tools/SelectionToolView.axaml
+++ b/src/Draw2D/Views/Tools/SelectionToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Views/Tools/TextToolView.axaml b/src/Draw2D/Views/Tools/TextToolView.axaml
index 5ecbdd6c..dfd8576d 100644
--- a/src/Draw2D/Views/Tools/TextToolView.axaml
+++ b/src/Draw2D/Views/Tools/TextToolView.axaml
@@ -15,11 +15,11 @@
         <Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
           <ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
                     SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
-            <ComboBox.DataTemplates>
+            <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Classes="default" Text="{Binding Title}" />
               </DataTemplate>
-            </ComboBox.DataTemplates>
+            </ComboBox.ItemTemplate>
           </ComboBox>
           <ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
         </Grid>
diff --git a/src/Draw2D/Zoom/ZoomControl.cs b/src/Draw2D/Zoom/ZoomControl.cs
index e6e85d22..3a46597c 100644
--- a/src/Draw2D/Zoom/ZoomControl.cs
+++ b/src/Draw2D/Zoom/ZoomControl.cs
@@ -531,39 +531,35 @@ namespace Core2D.UI.Zoom
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-
-            var md = (this.GetVisualRoot() as IInputRoot)?.MouseDevice;
-            if (md != null)
+            
+            this.Capture = () =>
             {
-                this.Capture = () =>
-                {
 #if DEBUG_POINTER_EVENTS
-                    System.Diagnostics.Debug.WriteLine($"[Capture] {_isCaptured}");
+                System.Diagnostics.Debug.WriteLine($"[Capture] {_isCaptured}");
 #endif
-                    _isCaptured = true;
-                };
+                _isCaptured = true;
+            };
 
-                this.Release = () =>
-                {
+            this.Release = () =>
+            {
 #if DEBUG_POINTER_EVENTS
-                    System.Diagnostics.Debug.WriteLine($"[Release] {_isCaptured}");
+                System.Diagnostics.Debug.WriteLine($"[Release] {_isCaptured}");
 #endif
-                    _isCaptured = false;
-                };
+                _isCaptured = false;
+            };
 
-                this.IsCaptured = () =>
-                {
+            this.IsCaptured = () =>
+            {
 #if DEBUG_POINTER_EVENTS
-                    System.Diagnostics.Debug.WriteLine($"[IsCaptured] {_isCaptured}");
+                System.Diagnostics.Debug.WriteLine($"[IsCaptured] {_isCaptured}");
 #endif
-                    return _isCaptured;
-                };
+                return _isCaptured;
+            };
 
-                this.Redraw = () =>
-                {
-                    this.InvalidateVisual();
-                };
-            }
+            this.Redraw = () =>
+            {
+                this.InvalidateVisual();
+            };
 
             if (_inputTarget != null && _drawTarget != null)
             {
@@ -583,9 +579,9 @@ namespace Core2D.UI.Zoom
             }
         }
 
-        protected override void OnPointerEnter(PointerEventArgs e)
+        protected override void OnPointerEntered(PointerEventArgs e)
         {
-            base.OnPointerEnter(e);
+            base.OnPointerEntered(e);
             this.Focus();
         }