diff --git a/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml b/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml
index bbe26983..9059cdab 100644
--- a/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml
+++ b/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml
@@ -5,7 +5,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:constants="clr-namespace:Samples"
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
+    xmlns:vm="clr-namespace:Samples.Checkboxes"
+    x:DataType="vm:CheckboxesViewModel"
     Title="CheckboxesView">
+    
     <ContentPage.Resources>
         <Style TargetType="freakyControls:FreakyChip">
             <Setter Property="Padding" Value="10" />
diff --git a/MAUI.FreakyControls/Samples/ImageViews/ImagesPage.xaml b/MAUI.FreakyControls/Samples/ImageViews/ImagesPage.xaml
index 53b97b39..373b9f11 100644
--- a/MAUI.FreakyControls/Samples/ImageViews/ImagesPage.xaml
+++ b/MAUI.FreakyControls/Samples/ImageViews/ImagesPage.xaml
@@ -6,8 +6,9 @@
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
     xmlns:samples="clr-namespace:Samples"
     xmlns:vm="clr-namespace:Samples.ImageViews"
-    Title="ImageViews"
-    x:DataType="vm:ImagesViewModel">
+    x:DataType="vm:ImagesViewModel"    
+    Title="ImageViews">
+    
     <ScrollView>
         <VerticalStackLayout Padding="30" Spacing="10">
 
diff --git a/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml b/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml
index cefd83dd..05d57835 100644
--- a/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml
+++ b/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml
@@ -4,7 +4,10 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
+    xmlns:vm="clr-namespace:Samples.Pickers"
+    x:DataType="vm:PickersViewModel"    
     Title="PickersView">
+    
     <VerticalStackLayout Padding="30" Spacing="10">
         <Label Text="Freaky DatePicker below: " TextColor="Black" />
         <Border>
diff --git a/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml.cs b/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml.cs
index 62891a97..f88f9f6e 100644
--- a/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml.cs
+++ b/MAUI.FreakyControls/Samples/Pickers/PickersView.xaml.cs
@@ -5,6 +5,6 @@ public partial class PickersView : ContentPage
     public PickersView()
     {
         InitializeComponent();
-        this.BindingContext = new PickersViewModel();
+        BindingContext = new PickersViewModel();
     }
 }
\ No newline at end of file
diff --git a/MAUI.FreakyControls/Samples/PinView/PinView.xaml b/MAUI.FreakyControls/Samples/PinView/PinView.xaml
index ac235afe..f5bf9402 100644
--- a/MAUI.FreakyControls/Samples/PinView/PinView.xaml
+++ b/MAUI.FreakyControls/Samples/PinView/PinView.xaml
@@ -4,7 +4,11 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
+    xmlns:vm="clr-namespace:Samples.PinView"
+    x:DataType="vm:PinViewModel"     
     Title="PinView">
+    
+    
     <Grid RowDefinitions="*,Auto,4*">
 
         <Image
diff --git a/MAUI.FreakyControls/Samples/RadioButtons/RadioButtonsView.xaml b/MAUI.FreakyControls/Samples/RadioButtons/RadioButtonsView.xaml
index 86781160..4a40f001 100644
--- a/MAUI.FreakyControls/Samples/RadioButtons/RadioButtonsView.xaml
+++ b/MAUI.FreakyControls/Samples/RadioButtons/RadioButtonsView.xaml
@@ -5,7 +5,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
     xmlns:samples="clr-namespace:Samples"
+    xmlns:vm="clr-namespace:Samples.RadioButtons"
+    x:DataType="vm:RadioButtonsViewModel"     
     Title="RadioButtonsView">
+    
     <VerticalStackLayout
         Padding="30"
         HorizontalOptions="Center"
diff --git a/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml b/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml
index 6646292a..0cfe137f 100644
--- a/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml
+++ b/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml
@@ -7,6 +7,7 @@
     xmlns:samples="clr-namespace:Samples.SignatureView"
     Title="SignatureView"
     x:DataType="samples:SignatureViewModel">
+    
     <Grid Padding="5" RowDefinitions="*, Auto">
         <freakyControls:FreakySignaturePadView
             x:Name="svgPad"
diff --git a/MAUI.FreakyControls/Samples/Switch/SwitchsView.xaml b/MAUI.FreakyControls/Samples/Switch/SwitchsView.xaml
index 71840f6d..045f8387 100644
--- a/MAUI.FreakyControls/Samples/Switch/SwitchsView.xaml
+++ b/MAUI.FreakyControls/Samples/Switch/SwitchsView.xaml
@@ -4,7 +4,10 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
-    Title="Switchs">
+    xmlns:vm="clr-namespace:Samples.Switch"
+    x:DataType="vm:SwitchesViewModel"     
+    Title="Switches">
+    
     <VerticalStackLayout
         HorizontalOptions="Center"
         Spacing="10"
diff --git a/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageView.xaml b/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageView.xaml
index a81bb0c7..5ec1bd26 100644
--- a/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageView.xaml
+++ b/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageView.xaml
@@ -4,7 +4,10 @@
              x:Class="Samples.ZoomImage.ZoomImageView"
              xmlns:sample="clr-namespace:Samples"
              xmlns:freakyControls="clr-namespace:Maui.FreakyControls;assembly=Maui.FreakyControls"
+             xmlns:vm="clr-namespace:Samples.ZoomImage"
+             x:DataType="vm:ZoomImageViewModel"              
              Title="ZoomImageView">
+    
     <Grid BackgroundColor="#88000000">
         <freakyControls:FreakyZoomableView>
             <Image Aspect="AspectFit" Source="{x:Static sample:ImageUrls.Female1}"/>
diff --git a/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageViewModel.cs b/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageViewModel.cs
index ada4fe9f..feba0dab 100644
--- a/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageViewModel.cs
+++ b/MAUI.FreakyControls/Samples/ZoomImage/ZoomImageViewModel.cs
@@ -1,4 +1,3 @@
-using System;
 namespace Samples.ZoomImage;
 
 public class ZoomImageViewModel