diff --git a/VisionBuilder.UI.Avalonia.Uno/App.axaml.cs b/VisionBuilder.UI.Avalonia.Uno/App.axaml.cs
index 69848c1..4448855 100644
--- a/VisionBuilder.UI.Avalonia.Uno/App.axaml.cs
+++ b/VisionBuilder.UI.Avalonia.Uno/App.axaml.cs
@@ -12,6 +12,7 @@ using VisionBuilder.UI.IOCommander;
 using VisionBuilder.UI.Recipes.HawkeyeRecipe;
 using VisionBuilder.UI.Ringbuffer;
 using VisionBuilder.UI.Statistics;
+using VisionBuilder.UI.Avalonia;
 using VisionBuilder.UI.Avalonia.Uno.Views;
 using Lindt.Colorballs.Duo.Utils;
 
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml b/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml
index ecd8091..174aff1 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml
+++ b/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:views="using:VisionBuilder.UI.Avalonia.Uno.Views"
+        xmlns:views="using:VisionBuilder.UI.Avalonia.Views"
         x:Class="VisionBuilder.UI.Avalonia.Uno.Views.MainWindow"
         Title="VisionBuilder UNO"
         Width="1920" Height="1080"
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml.cs b/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml.cs
index 7453405..837cf9a 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml.cs
+++ b/VisionBuilder.UI.Avalonia.Uno/Views/MainWindow.axaml.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Threading;
+using VisionBuilder.UI.Avalonia;
 using VisionBuilder.UI.Common.ViewModel;
 using VisionBuilder.UI.Common.ViewModel.Classes;
 
diff --git a/VisionBuilder.UI.Avalonia.Uno/VisionBuilder.UI.Avalonia.Uno.csproj b/VisionBuilder.UI.Avalonia.Uno/VisionBuilder.UI.Avalonia.Uno.csproj
index 829744b..ea618cd 100644
--- a/VisionBuilder.UI.Avalonia.Uno/VisionBuilder.UI.Avalonia.Uno.csproj
+++ b/VisionBuilder.UI.Avalonia.Uno/VisionBuilder.UI.Avalonia.Uno.csproj
@@ -11,12 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.3" />
     <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
     <PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.2.3" />
     <PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
-    <PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />
     <PackageReference Include="swety.OpenCvSharp4.runtime.linux-arm64" Version="4.10.0.20241108" />
     <!-- Override transitive GPU OnnxRuntime with CPU-only (GPU has no linux-arm64 natives) -->
@@ -27,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\VisionBuilder.UI.Avalonia\VisionBuilder.UI.Avalonia.csproj" />
     <ProjectReference Include="..\framework\Inspectron.Settings\Inspectron.Settings.csproj" />
     <ProjectReference Include="..\Hawkeye.VisionBuilder.UI.Sources.Emulation\Hawkeye.VisionBuilder.UI.Sources.Emulation.csproj" />
     <ProjectReference Include="..\VisionBuilder.UI.Camera\VisionBuilder.UI.Camera.csproj" />
diff --git a/VisionBuilder.UI.Avalonia.Uno/AvaloniaUISettings.cs b/VisionBuilder.UI.Avalonia/AvaloniaUISettings.cs
similarity index 88%
rename from VisionBuilder.UI.Avalonia.Uno/AvaloniaUISettings.cs
rename to VisionBuilder.UI.Avalonia/AvaloniaUISettings.cs
index 4d4032f..ecdf086 100644
--- a/VisionBuilder.UI.Avalonia.Uno/AvaloniaUISettings.cs
+++ b/VisionBuilder.UI.Avalonia/AvaloniaUISettings.cs
@@ -1,7 +1,7 @@
 using Inspectron.Settings;
 using VisionBuilder.UI.Common;
 
-namespace VisionBuilder.UI.Avalonia.Uno;
+namespace VisionBuilder.UI.Avalonia;
 
 public class AvaloniaUISettings : ISettings
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Converters/BoolToVisibilityConverter.cs b/VisionBuilder.UI.Avalonia/Converters/BoolToVisibilityConverter.cs
similarity index 89%
rename from VisionBuilder.UI.Avalonia.Uno/Converters/BoolToVisibilityConverter.cs
rename to VisionBuilder.UI.Avalonia/Converters/BoolToVisibilityConverter.cs
index 639ba7c..6cd47f4 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Converters/BoolToVisibilityConverter.cs
+++ b/VisionBuilder.UI.Avalonia/Converters/BoolToVisibilityConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Converters;
+namespace VisionBuilder.UI.Avalonia.Converters;
 
 public class BoolToVisibilityConverter : IValueConverter
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Converters/MatToBitmapConverter.cs b/VisionBuilder.UI.Avalonia/Converters/MatToBitmapConverter.cs
similarity index 85%
rename from VisionBuilder.UI.Avalonia.Uno/Converters/MatToBitmapConverter.cs
rename to VisionBuilder.UI.Avalonia/Converters/MatToBitmapConverter.cs
index 25a070f..fba9606 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Converters/MatToBitmapConverter.cs
+++ b/VisionBuilder.UI.Avalonia/Converters/MatToBitmapConverter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 using OpenCvSharp;
-using VisionBuilder.UI.Avalonia.Uno.Services;
+using VisionBuilder.UI.Avalonia.Services;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Converters;
+namespace VisionBuilder.UI.Avalonia.Converters;
 
 public class MatToBitmapConverter : IValueConverter
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/ModuleExtensions.cs b/VisionBuilder.UI.Avalonia/ModuleExtensions.cs
similarity index 91%
rename from VisionBuilder.UI.Avalonia.Uno/ModuleExtensions.cs
rename to VisionBuilder.UI.Avalonia/ModuleExtensions.cs
index 018388d..7100734 100644
--- a/VisionBuilder.UI.Avalonia.Uno/ModuleExtensions.cs
+++ b/VisionBuilder.UI.Avalonia/ModuleExtensions.cs
@@ -3,9 +3,9 @@ using VisionBuilder.UI.Common;
 using VisionBuilder.UI.Common.Processing;
 using VisionBuilder.UI.Common.Services;
 using VisionBuilder.UI.Common.ViewModel.Interfaces.UI;
-using VisionBuilder.UI.Avalonia.Uno.Services;
+using VisionBuilder.UI.Avalonia.Services;
 
-namespace VisionBuilder.UI.Avalonia.Uno;
+namespace VisionBuilder.UI.Avalonia;
 
 public static class ModuleExtensions
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaImagePreviewService.cs b/VisionBuilder.UI.Avalonia/Services/AvaloniaImagePreviewService.cs
similarity index 88%
rename from VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaImagePreviewService.cs
rename to VisionBuilder.UI.Avalonia/Services/AvaloniaImagePreviewService.cs
index 18b54ec..eeb4866 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaImagePreviewService.cs
+++ b/VisionBuilder.UI.Avalonia/Services/AvaloniaImagePreviewService.cs
@@ -1,11 +1,11 @@
 using VisionBuilder.UI.Common.ViewModel;
 using VisionBuilder.UI.Common.ViewModel.Interfaces.UI;
-using VisionBuilder.UI.Avalonia.Uno.Views;
+using VisionBuilder.UI.Avalonia.Views;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public class AvaloniaImagePreviewService : IImagePreviewService
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaLoadingService.cs b/VisionBuilder.UI.Avalonia/Services/AvaloniaLoadingService.cs
similarity index 86%
rename from VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaLoadingService.cs
rename to VisionBuilder.UI.Avalonia/Services/AvaloniaLoadingService.cs
index ef8a388..ad5c0e2 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaLoadingService.cs
+++ b/VisionBuilder.UI.Avalonia/Services/AvaloniaLoadingService.cs
@@ -1,7 +1,7 @@
 using Serilog;
 using VisionBuilder.UI.Common.Processing;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public class AvaloniaLoadingService : ILoadingService
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaPasswordInputService.cs b/VisionBuilder.UI.Avalonia/Services/AvaloniaPasswordInputService.cs
similarity index 87%
rename from VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaPasswordInputService.cs
rename to VisionBuilder.UI.Avalonia/Services/AvaloniaPasswordInputService.cs
index d3442f3..dc8b616 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaPasswordInputService.cs
+++ b/VisionBuilder.UI.Avalonia/Services/AvaloniaPasswordInputService.cs
@@ -1,10 +1,10 @@
 using VisionBuilder.UI.Common.Services;
-using VisionBuilder.UI.Avalonia.Uno.Views;
+using VisionBuilder.UI.Avalonia.Views;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public class AvaloniaPasswordInputService : IPasswordInputService
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaRecipeSelectionDialogService.cs b/VisionBuilder.UI.Avalonia/Services/AvaloniaRecipeSelectionDialogService.cs
similarity index 92%
rename from VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaRecipeSelectionDialogService.cs
rename to VisionBuilder.UI.Avalonia/Services/AvaloniaRecipeSelectionDialogService.cs
index b306d3f..31dcd26 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaRecipeSelectionDialogService.cs
+++ b/VisionBuilder.UI.Avalonia/Services/AvaloniaRecipeSelectionDialogService.cs
@@ -1,11 +1,11 @@
 using VisionBuilder.UI.Common.ViewModel;
 using VisionBuilder.UI.Common.ViewModel.Interfaces.UI;
-using VisionBuilder.UI.Avalonia.Uno.Views;
+using VisionBuilder.UI.Avalonia.Views;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public class AvaloniaRecipeSelectionDialogService : IRecipeSelectionDialogService
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaSettingsService.cs b/VisionBuilder.UI.Avalonia/Services/AvaloniaSettingsService.cs
similarity index 80%
rename from VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaSettingsService.cs
rename to VisionBuilder.UI.Avalonia/Services/AvaloniaSettingsService.cs
index 8c08a47..a9c3408 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/AvaloniaSettingsService.cs
+++ b/VisionBuilder.UI.Avalonia/Services/AvaloniaSettingsService.cs
@@ -1,6 +1,6 @@
 using VisionBuilder.UI.Common.ViewModel.Interfaces.UI;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public class AvaloniaSettingsService : ISettingsService
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Services/ImageConverter.cs b/VisionBuilder.UI.Avalonia/Services/ImageConverter.cs
similarity index 86%
rename from VisionBuilder.UI.Avalonia.Uno/Services/ImageConverter.cs
rename to VisionBuilder.UI.Avalonia/Services/ImageConverter.cs
index a0147b7..a83adcb 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Services/ImageConverter.cs
+++ b/VisionBuilder.UI.Avalonia/Services/ImageConverter.cs
@@ -1,6 +1,6 @@
 using OpenCvSharp;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Services;
+namespace VisionBuilder.UI.Avalonia.Services;
 
 public static class ImageConverter
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml b/VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml
similarity index 98%
rename from VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml
rename to VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml
index d3fe185..e84860c 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml
+++ b/VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="VisionBuilder.UI.Avalonia.Uno.Views.ImagePreviewDialog"
+        x:Class="VisionBuilder.UI.Avalonia.Views.ImagePreviewDialog"
         Title="Image Preview"
         WindowState="Maximized"
         WindowStartupLocation="CenterOwner"
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml.cs b/VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml.cs
similarity index 96%
rename from VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml.cs
rename to VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml.cs
index 745a85a..66531f9 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/ImagePreviewDialog.axaml.cs
+++ b/VisionBuilder.UI.Avalonia/Views/ImagePreviewDialog.axaml.cs
@@ -1,9 +1,9 @@
 using System.ComponentModel;
 using Avalonia.Controls;
-using VisionBuilder.UI.Avalonia.Uno.Services;
+using VisionBuilder.UI.Avalonia.Services;
 using VisionBuilder.UI.Common.ViewModel;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Views;
+namespace VisionBuilder.UI.Avalonia.Views;
 
 public partial class ImagePreviewDialog : Window
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml b/VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml
similarity index 94%
rename from VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml
rename to VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml
index b189db7..0525825 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml
+++ b/VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="VisionBuilder.UI.Avalonia.Uno.Views.PasswordDialog"
+        x:Class="VisionBuilder.UI.Avalonia.Views.PasswordDialog"
         Title="Password Required"
         Width="400" Height="180"
         CanResize="False"
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml.cs b/VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml.cs
similarity index 91%
rename from VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml.cs
rename to VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml.cs
index 712a80b..0c114b0 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/PasswordDialog.axaml.cs
+++ b/VisionBuilder.UI.Avalonia/Views/PasswordDialog.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Views;
+namespace VisionBuilder.UI.Avalonia.Views;
 
 public partial class PasswordDialog : Window
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml b/VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml
similarity index 96%
rename from VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml
rename to VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml
index 8b51910..4e7ab57 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml
+++ b/VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="VisionBuilder.UI.Avalonia.Uno.Views.RecipeSelectionDialog"
+        x:Class="VisionBuilder.UI.Avalonia.Views.RecipeSelectionDialog"
         Title="Select Recipe"
         Width="800" Height="600"
         WindowStartupLocation="CenterOwner"
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml.cs b/VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml.cs
similarity index 97%
rename from VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml.cs
rename to VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml.cs
index 48a1cec..1264440 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/RecipeSelectionDialog.axaml.cs
+++ b/VisionBuilder.UI.Avalonia/Views/RecipeSelectionDialog.axaml.cs
@@ -2,12 +2,12 @@ using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
-using VisionBuilder.UI.Avalonia.Uno.Services;
+using VisionBuilder.UI.Avalonia.Services;
 using VisionBuilder.UI.Common.ViewModel;
 using VisionBuilder.UI.Common.ViewModel.Classes;
 using VisionBuilder.UI.Common.ViewModel.Interfaces.UI;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Views;
+namespace VisionBuilder.UI.Avalonia.Views;
 
 public partial class RecipeSelectionDialog : global::Avalonia.Controls.Window
 {
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml b/VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml
similarity index 97%
rename from VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml
rename to VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml
index bdb4756..877a02d 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml
+++ b/VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="using:VisionBuilder.UI.Avalonia.Uno.Converters"
-             x:Class="VisionBuilder.UI.Avalonia.Uno.Views.SingleCameraView"
+             xmlns:converters="using:VisionBuilder.UI.Avalonia.Converters"
+             x:Class="VisionBuilder.UI.Avalonia.Views.SingleCameraView"
              Background="White">
 
     <UserControl.Resources>
diff --git a/VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml.cs b/VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml.cs
similarity index 99%
rename from VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml.cs
rename to VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml.cs
index 69ff7a6..b72436e 100644
--- a/VisionBuilder.UI.Avalonia.Uno/Views/SingleCameraView.axaml.cs
+++ b/VisionBuilder.UI.Avalonia/Views/SingleCameraView.axaml.cs
@@ -10,12 +10,12 @@ using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using OpenCvSharp;
-using VisionBuilder.UI.Avalonia.Uno.Services;
+using VisionBuilder.UI.Avalonia.Services;
 using VisionBuilder.UI.Common;
 using VisionBuilder.UI.Common.ViewModel;
 using VisionBuilder.UI.Common.ViewModel.Classes;
 
-namespace VisionBuilder.UI.Avalonia.Uno.Views;
+namespace VisionBuilder.UI.Avalonia.Views;
 
 public partial class SingleCameraView : UserControl
 {
diff --git a/VisionBuilder.UI.Avalonia/VisionBuilder.UI.Avalonia.csproj b/VisionBuilder.UI.Avalonia/VisionBuilder.UI.Avalonia.csproj
new file mode 100644
index 0000000..25d0863
--- /dev/null
+++ b/VisionBuilder.UI.Avalonia/VisionBuilder.UI.Avalonia.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
+    <PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\framework\Inspectron.Settings\Inspectron.Settings.csproj" />
+    <ProjectReference Include="..\VisionBuilder.UI.Common\VisionBuilder.UI.Common.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VisionBuilder.UI.sln b/VisionBuilder.UI.sln
index 5d25be6..cc28148 100644
--- a/VisionBuilder.UI.sln
+++ b/VisionBuilder.UI.sln
@@ -117,6 +117,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisionBuilder.UI.Avalonia.U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LindtLeerformPlugin", "Plugins\LindtLeerformPlugin\LindtLeerformPlugin.csproj", "{5A1D9E37-353C-4E30-A302-48487DC3A9E8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisionBuilder.UI.Avalonia", "VisionBuilder.UI.Avalonia\VisionBuilder.UI.Avalonia.csproj", "{0549063E-5B22-4332-AD54-0D799B6DB4D2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -629,6 +631,18 @@ Global
 		{5A1D9E37-353C-4E30-A302-48487DC3A9E8}.Release|x64.Build.0 = Release|Any CPU
 		{5A1D9E37-353C-4E30-A302-48487DC3A9E8}.Release|x86.ActiveCfg = Release|Any CPU
 		{5A1D9E37-353C-4E30-A302-48487DC3A9E8}.Release|x86.Build.0 = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|x64.Build.0 = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Debug|x86.Build.0 = Debug|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|x64.ActiveCfg = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|x64.Build.0 = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|x86.ActiveCfg = Release|Any CPU
+		{0549063E-5B22-4332-AD54-0D799B6DB4D2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE