Fixed remaining compile errors

src/Artemis.Core/Artemis.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <PreserveCompilationContext>false</PreserveCompilationContext>
         <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
         <AssemblyTitle>Artemis.Core</AssemblyTitle>

src/Artemis.Core/Constants.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Reflection;
 using Artemis.Core.JsonConverters;
 using Artemis.Core.Services;
-using Artemis.Core.Services.Core;
 using Artemis.Core.SkiaSharp;
 using Newtonsoft.Json;
 

src/Artemis.Core/Events/UpdateEventArgs.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Artemis.Core;
 

src/Artemis.Core/Services/WebServer/WebModuleRegistration.cs

@@ -1,6 +1,5 @@
 using System;
 using EmbedIO;
-using DryIoc;
 
 namespace Artemis.Core.Services;
 

src/Artemis.Storage/Artemis.Storage.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <PreserveCompilationContext>false</PreserveCompilationContext>
         <Platforms>x64</Platforms>
     </PropertyGroup>

src/Artemis.UI.Linux/App.axaml.cs

@@ -5,7 +5,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
+using Avalonia.ReactiveUI;
 using DryIoc;
 using ReactiveUI;
 

src/Artemis.UI.Linux/Artemis.UI.Linux.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>

src/Artemis.UI.MacOS/App.axaml.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
+using Avalonia.ReactiveUI;
 using DryIoc;
 using ReactiveUI;
 

src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>

src/Artemis.UI.Shared/Artemis.UI.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <OutputPath>bin\</OutputPath>
         <Platforms>x64</Platforms>
@@ -17,7 +17,7 @@
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview6" />
         <PackageReference Include="DynamicData" Version="7.13.1" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview6" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="1.1.10" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" />
         <PackageReference Include="ReactiveUI" Version="18.4.26" />
         <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
         <PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.17" />

src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs

@@ -12,8 +12,6 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using Avalonia.Rendering;
 using Avalonia.Threading;
 
 namespace Artemis.UI.Shared;

src/Artemis.UI.Shared/Controls/EnumComboBox.axaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Shared.EnumComboBox">
-    <ComboBox x:Name="EnumComboBox" HorizontalAlignment="Stretch">
+    <ComboBox x:Name="ChildEnumComboBox" HorizontalAlignment="Stretch">
         <ComboBox.ItemTemplate>
             <DataTemplate>
                 <TextBlock Text="{Binding [1]}" />

src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs

@@ -90,7 +90,7 @@ public partial class EnumComboBox : UserControl
     /// <inheritdoc />
     protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
     {
-        _enumComboBox = this.Get<ComboBox>("EnumComboBox");
+        _enumComboBox = this.Get<ComboBox>("ChildEnumComboBox");
         _enumComboBox.Items = _currentValues;
 
         UpdateValues();

src/Artemis.UI.Shared/ReactiveAppWindow.cs

@@ -4,6 +4,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Media;
 using FluentAvalonia.UI.Windowing;
 using ReactiveUI;
@@ -46,13 +47,9 @@ public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel> whe
         if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || !IsWindows11)
             return;
 
-        // Enable Mica on Windows 11, based on the FluentAvalonia sample application
         TransparencyBackgroundFallback = Brushes.Transparent;
         TransparencyLevelHint = WindowTransparencyLevel.Mica;
-
+        TryEnableMicaEffect();
-        Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", out object? value) ? (Color) value! : new Color2(32, 32, 32);
-        color = color.LightenPercent(-0.5f);
-        Background = new ImmutableSolidColorBrush(color, 0.82);
     }
 
     private void OnDataContextChanged(object? value)
@@ -70,6 +67,31 @@ public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel> whe
         else if (DataContext != value) DataContext = value;
     }
 
+    private void TryEnableMicaEffect()
+    {
+        // The background colors for the Mica brush are still based around SolidBackgroundFillColorBase resource
+        // BUT since we can't control the actual Mica brush color, we have to use the window background to create
+        // the same effect. However, we can't use SolidBackgroundFillColorBase directly since its opaque, and if
+        // we set the opacity the color become lighter than we want. So we take the normal color, darken it and 
+        // apply the opacity until we get the roughly the correct color
+        // NOTE that the effect still doesn't look right, but it suffices. Ideally we need access to the Mica
+        // CompositionBrush to properly change the color but I don't know if we can do that or not
+        if (ActualThemeVariant == ThemeVariant.Dark)
+        {
+            Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", ThemeVariant.Dark, out object? value) ? (Color) value : new Color2(32, 32, 32);
+            color = color.LightenPercent(-0.5f);
+
+            Background = new ImmutableSolidColorBrush(color, 0.78);
+        }
+        else if (ActualThemeVariant == ThemeVariant.Light)
+        {
+            // Similar effect here
+            Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", ThemeVariant.Light, out object? value) ? (Color) value : new Color2(243, 243, 243);
+            color = color.LightenPercent(0.5f);
+
+            Background = new ImmutableSolidColorBrush(color, 0.9);
+        }
+    }
 
     /// <summary>
     ///     The ViewModel.

src/Artemis.UI.Shared/Services/Builders/ContentDialogBuilder.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;

src/Artemis.UI.Windows/App.axaml.cs

@@ -13,7 +13,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
+using Avalonia.ReactiveUI;
 using DryIoc;
 using ReactiveUI;
 

src/Artemis.UI.Windows/Artemis.UI.Windows.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net7.0-windows10.0.17763.0</TargetFramework>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>

src/Artemis.UI.Windows/DryIoc/ContainerExtensions.cs

@@ -20,7 +20,7 @@ public static class UIContainerExtensions
     public static void RegisterProviders(this IContainer container)
     {
         container.Register<ICursorProvider, CursorProvider>(Reuse.Singleton);
-        container.Register<IGraphicsContextProvider, GraphicsContextProvider>(Reuse.Singleton);
+        // container.Register<IGraphicsContextProvider, GraphicsContextProvider>(Reuse.Singleton);
         container.Register<IAutoRunProvider, AutoRunProvider>();
         container.Register<InputProvider, WindowsInputProvider>(serviceKey: WindowsInputProvider.Id);
         container.Register<IUpdateNotificationProvider, WindowsUpdateNotificationProvider>();

src/Artemis.UI.Windows/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Artemis.UI.Windows": {
       "commandName": "Project",
-      "commandLineArgs": "--force-elevation --disable-forced-shutdown --pcmr"
+      "commandLineArgs": "--disable-forced-shutdown --pcmr"
     }
   }
 }

src/Artemis.UI.Windows/Providers/Input/SpongeWindow.cs

@@ -1,25 +0,0 @@
-using System;
-using Avalonia.Win32;
-
-namespace Artemis.UI.Windows.Providers.Input;
-
-public class SpongeWindow : WindowImpl
-{
-    public event EventHandler<SpongeWindowEventArgs>? WndProcCalled;
-
-    #region Overrides of WindowImpl
-
-    /// <inheritdoc />
-    protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-    {
-        OnWndProcCalled(new SpongeWindowEventArgs(hWnd, msg, wParam, lParam));
-        return base.WndProc(hWnd, msg, wParam, lParam);
-    }
-
-    #endregion
-
-    protected virtual void OnWndProcCalled(SpongeWindowEventArgs e)
-    {
-        WndProcCalled?.Invoke(this, e);
-    }
-}

src/Artemis.UI.Windows/Providers/Input/SpongeWindowEventArgs.cs

@@ -1,19 +0,0 @@
-using System;
-
-namespace Artemis.UI.Windows.Providers.Input;
-
-public class SpongeWindowEventArgs : EventArgs
-{
-    public SpongeWindowEventArgs(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-    {
-        HWnd = hWnd;
-        Msg = msg;
-        WParam = wParam;
-        LParam = lParam;
-    }
-
-    public IntPtr HWnd { get; }
-    public uint Msg { get; }
-    public IntPtr WParam { get; }
-    public IntPtr LParam { get; }
-}

src/Artemis.UI.Windows/Providers/Input/WindowsInputProvider.cs

@@ -5,6 +5,8 @@ using System.Timers;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Windows.Utilities;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform;
 using Linearstar.Windows.RawInput;
 using Linearstar.Windows.RawInput.Native;
 using Serilog;
@@ -17,7 +19,6 @@ public class WindowsInputProvider : InputProvider
 
     private readonly IInputService _inputService;
     private readonly ILogger _logger;
-    private readonly SpongeWindow _sponge;
     private readonly Timer _taskManagerTimer;
     private int _lastProcessId;
 
@@ -25,16 +26,24 @@ public class WindowsInputProvider : InputProvider
     {
         _logger = logger;
         _inputService = inputService;
-
+        
-        _sponge = new SpongeWindow();
-        _sponge.WndProcCalled += SpongeOnWndProcCalled;
-
         _taskManagerTimer = new Timer(500);
         _taskManagerTimer.Elapsed += TaskManagerTimerOnElapsed;
         _taskManagerTimer.Start();
 
-        RawInputDevice.RegisterDevice(HidUsageAndPage.Keyboard, RawInputDeviceFlags.InputSink, _sponge.Handle.Handle);
+        // if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        RawInputDevice.RegisterDevice(HidUsageAndPage.Mouse, RawInputDeviceFlags.InputSink, _sponge.Handle.Handle);
+        // {
+        //     IWindowImpl window = desktop.MainWindow!.PlatformImpl!;
+        //     
+        //     // https://github.com/sanjay900/guitar-configurator/blob/master/Notify/WindowsDeviceNotifierAvalonia.cs
+        //     // _hWndProcHook = GetWindowLongPtr(window.Handle.Handle, GwlWndproc);
+        //     // _fnWndProcHook = CustomWndProc;
+        //     // var newLong = Marshal.GetFunctionPointerForDelegate(_fnWndProcHook);
+        //     // SetWindowLongPtr(window.Handle.Handle, GwlWndproc, newLong);
+        //     
+        //     RawInputDevice.RegisterDevice(HidUsageAndPage.Keyboard, RawInputDeviceFlags.InputSink, window.Handle.Handle);
+        //     RawInputDevice.RegisterDevice(HidUsageAndPage.Mouse, RawInputDeviceFlags.InputSink, window.Handle.Handle);
+        // }
     }
 
     public static Guid Id { get; } = new("6737b204-ffb1-4cd9-8776-9fb851db303a");
@@ -55,19 +64,18 @@ public class WindowsInputProvider : InputProvider
     {
         if (disposing)
         {
-            _sponge.Dispose();
             _taskManagerTimer.Dispose();
         }
 
         base.Dispose(disposing);
     }
 
-    private void SpongeOnWndProcCalled(object? sender, SpongeWindowEventArgs message)
+    private void OnWndProcCalled(nint hWnd, uint msg, nint wParam, nint lParam)
     {
-        if (message.Msg != WM_INPUT)
+        if (msg != WM_INPUT)
             return;
 
-        RawInputData data = RawInputData.FromHandle(message.LParam);
+        RawInputData data = RawInputData.FromHandle(lParam);
         switch (data)
         {
             case RawInputMouseData mouse:

src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs

@@ -9,7 +9,6 @@ using Artemis.UI.Screens.Settings;
 using Artemis.UI.Services.Updating;
 using Artemis.UI.Shared.Services.MainWindow;
 using Avalonia.Threading;
-using DryIoc.ImTools;
 using Microsoft.Toolkit.Uwp.Notifications;
 using ReactiveUI;
 

src/Artemis.UI.Windows/SkiaSharp/Vulkan/Win32VkContext.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Avalonia.Controls;
 using Avalonia.Win32;
 using SharpVk;
 using SharpVk.Khronos;
@@ -10,10 +11,10 @@ internal sealed class Win32VkContext : VkContext
 {
     public Win32VkContext()
     {
-        Window = new WindowImpl();
+        Window = new Window();
         Instance = Instance.Create(null, new[] {"VK_KHR_surface", "VK_KHR_win32_surface"});
         PhysicalDevice = Instance.EnumeratePhysicalDevices().First();
-        Surface = Instance.CreateWin32Surface(Kernel32.CurrentModuleHandle, Window.Handle.Handle);
+        Surface = Instance.CreateWin32Surface(Kernel32.CurrentModuleHandle, Window.PlatformImpl!.Handle.Handle);
 
         (GraphicsFamily, PresentFamily) = FindQueueFamilies();
 
@@ -43,12 +44,12 @@ internal sealed class Win32VkContext : VkContext
         };
     }
 
-    public WindowImpl Window { get; }
+    public Window Window { get; }
 
     public override void Dispose()
     {
         base.Dispose();
-        Window.Dispose();
+        Window.Close();
     }
 
     private IntPtr Proc(string name, IntPtr instanceHandle, IntPtr deviceHandle)

src/Artemis.UI/Artemis.UI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <OutputPath>bin/</OutputPath>
         <Platforms>x64</Platforms>
@@ -29,8 +29,8 @@
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview6" />
         <PackageReference Include="Flurl.Http" Version="3.2.4" />
         <PackageReference Include="Live.Avalonia" Version="1.3.1" />
-        <PackageReference Include="Markdown.Avalonia.Tight" Version="0.10.13" />
+        <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.0-b1" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="1.1.10" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" />
         <PackageReference Include="Octopus.Octodiff" Version="2.0.100" />
         <PackageReference Include="ReactiveUI" Version="18.4.26" />
         <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />

src/Artemis.UI/MainWindow.axaml

@@ -1,8 +1,9 @@
-<controls:CoreWindow xmlns="https://github.com/avaloniaui"
+<windowing:AppWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+                     xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
                      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                      x:Class="Artemis.UI.MainWindow"
                      Icon="/Assets/Images/Logo/application.ico"
@@ -26,4 +27,4 @@
         </DockPanel>
         <StackPanel Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
     </Panel>
-</controls:CoreWindow>
+</windowing:AppWindow>

src/Artemis.UI/MainWindow.axaml.cs

@@ -7,13 +7,12 @@ using Artemis.UI.Shared;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
+using Avalonia.ReactiveUI;
-using FluentAvalonia.Core.ApplicationModel;
 using ReactiveUI;
 
 namespace Artemis.UI;
 
-public class MainWindow : ReactiveAppWindow<RootViewModel>
+public partial class MainWindow : ReactiveAppWindow<RootViewModel>
 {
     private readonly Panel _rootPanel;
     private readonly ContentControl _sidebarContentControl;
@@ -25,7 +24,7 @@ public class MainWindow : ReactiveAppWindow<RootViewModel>
         Activated += OnActivated;
         Deactivated += OnDeactivated;
 
-        ApplyWindowSize();
+        // ApplyWindowSize();
         InitializeComponent();
 
         _rootPanel = this.Get<Panel>("RootPanel");
@@ -67,12 +66,12 @@ public class MainWindow : ReactiveAppWindow<RootViewModel>
     private void OnOpened(object? sender, EventArgs e)
     {
         Opened -= OnOpened;
-        ICoreApplicationView coreAppTitleBar = this;
+        // ICoreApplicationView coreAppTitleBar = this;
-        if (coreAppTitleBar.TitleBar != null)
+        // if (coreAppTitleBar.TitleBar != null)
-        {
+        // {
-            coreAppTitleBar.TitleBar.ExtendViewIntoTitleBar = true;
+        //     coreAppTitleBar.TitleBar.ExtendViewIntoTitleBar = true;
-            SetTitleBar(this.Get<Border>("DragHandle"));
+        //     SetTitleBar(this.Get<Border>("DragHandle"));
-        }
+        // }
     }
 
     private void OnActivated(object? sender, EventArgs e)

src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml

@@ -9,7 +9,6 @@
         <TextBlock Classes="subtitle" Text="{Binding Profiler.Name}" Margin="10 10 0 0" />
 
         <DataGrid Items="{Binding Measurements}"
-                  d:DataContext="{d:DesignInstance Type={x:Type local:PerformanceDebugMeasurementViewModel}}"
                   CanUserSortColumns="True"
                   IsReadOnly="True"
                   AutoGenerateColumns="False"

src/Artemis.UI/Screens/Home/HomeView.axaml

@@ -117,7 +117,7 @@
 						</controls:HyperlinkButton>
 						<TextBlock Grid.Row="1"
 								   Grid.Column="1"
-								   Foreground="{DynamicResource MaterialDesignBodyLight}"
+						           Classes="subtitle"
 								   TextWrapping="Wrap"
 								   VerticalAlignment="Center">
 							Feel like making a donation? It would be gratefully received. Click the button to donate via PayPal.

src/Artemis.UI/Screens/Plugins/PluginPrerequisiteView.axaml

@@ -18,7 +18,7 @@
             <TextBlock Text=" - " />
             <TextBlock Text="{CompiledBinding ActiveAction.Action.Name, Mode=OneWay, FallbackValue=''}" />
         </StackPanel>
-        <TextBlock Foreground="{DynamicResource MaterialDesignBodyLight}" TextWrapping="Wrap" IsVisible="{CompiledBinding Actions.Count}">
+        <TextBlock Classes="subtitle" TextWrapping="Wrap" IsVisible="{CompiledBinding Actions.Count}">
 
         </TextBlock>
         <TextBlock Classes="h4" TextWrapping="Wrap" Text="{CompiledBinding ActiveAction.Action.Name, Mode=OneWay}" IsVisible="{CompiledBinding !Actions.Count}" />

src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs

@@ -1,5 +1,4 @@
 using System;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/Plugins/PluginViewModel.cs

@@ -13,7 +13,6 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Avalonia.Controls;
 using Avalonia.Threading;
-using DryIoc;
 using Material.Icons;
 using ReactiveUI;
 

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs

@@ -3,7 +3,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Generators;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Disposables;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Disposables;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml

@@ -23,8 +23,8 @@
         <converters:ColorOpacityConverter x:Key="ColorOpacityConverter" />
     </UserControl.Resources>
     <UserControl.Styles>
-        <StyleInclude Source="avares://Avalonia.Xaml.Interactions/Draggable/Styles.axaml" />
+        <StyleInclude Source="avares://Avalonia.Xaml.Interactions.Draggable/Styles.axaml" />
-        <Style Selector="TreeView#ProfileTreeView">
+        <Style Selector="TreeView#Profile">
             <Style.Resources>
                 <profileBehaviors:ProfileTreeViewDropHandler x:Key="ProfileTreeViewDropHandler" />
             </Style.Resources>
@@ -37,7 +37,7 @@
             </Setter>
         </Style>
 
-        <Style Selector="TreeView#ProfileTreeView TreeViewItem">
+        <Style Selector="TreeView#Profile TreeViewItem">
             <Setter Property="IsExpanded" Value="True" />
             <Setter Property="(Interaction.Behaviors)">
                 <BehaviorCollectionTemplate>
@@ -48,7 +48,7 @@
             </Setter>
         </Style>
 
-        <Style Selector="TreeView#ProfileTreeView TreeViewItem:dragging-before">
+        <Style Selector="TreeView#Profile TreeViewItem:dragging-before">
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,28">
@@ -60,7 +60,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style Selector="TreeView#ProfileTreeView TreeViewItem:dragging-into">
+        <Style Selector="TreeView#Profile TreeViewItem:dragging-into">
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,28">
@@ -76,7 +76,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style Selector="TreeView#ProfileTreeView TreeViewItem:dragging-after">
+        <Style Selector="TreeView#Profile TreeViewItem:dragging-after">
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,28">
@@ -90,7 +90,7 @@
         </Style>
     </UserControl.Styles>
     <Grid RowDefinitions="*,Auto">
-        <TreeView Name="ProfileTreeView" Classes="no-right-margin draggable"
+        <TreeView Name="Profile" Classes="no-right-margin draggable"
                   Items="{CompiledBinding Children}"
                   SelectedItem="{CompiledBinding SelectedChild}"
                   SelectionChanged="ProfileTreeView_OnSelectionChanged">

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs

@@ -120,6 +120,6 @@ public partial class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
 
     private void ProfileTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
-        ProfileTreeView.Focus();
+        Profile.Focus();
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs

@@ -1,5 +1,3 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs

@@ -1,5 +1,3 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs

@@ -1,5 +1,3 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs

@@ -5,7 +5,6 @@ using Artemis.Core;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs

@@ -12,7 +12,6 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs

@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes;
-using Artemis.UI.Shared;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.Extensions;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs

@@ -6,7 +6,6 @@ using Artemis.Core;
 using Artemis.UI.Shared.Extensions;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Mixins;
 using Avalonia.Controls.PanAndZoom;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;

src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs

@@ -2,9 +2,7 @@ using System;
 using System.Linq;
 using System.Reactive.Disposables;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.PanAndZoom;
-using Avalonia.Controls.Shapes;
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Linq;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.PanAndZoom;
-using Avalonia.Controls.Shapes;
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.ProfileEditor;

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml

@@ -8,8 +8,7 @@
              xmlns:shared="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.ProfileEditorView"
-             x:DataType="profileEditor:ProfileEditorViewModel"
+             x:DataType="profileEditor:ProfileEditorViewModel">
-             Name="ProfileEditorView">
     <UserControl.Resources>
         <converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" />
     </UserControl.Resources>

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 

src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml

@@ -29,7 +29,7 @@
                 <TextBlock Grid.Row="1"
                            Grid.Column="1"
                            VerticalAlignment="Top"
-                           Foreground="{DynamicResource MaterialDesignBodyLight}"
+                           Classes="subtitle"
                            Text="{Binding Version}" />
 
                 <controls:HyperlinkButton Grid.Row="1"

src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml

@@ -14,7 +14,7 @@
                 <ColumnDefinition MinWidth="165" MaxWidth="400" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins" Margin="0 0 10 0" />
+            <TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins"  Margin="0 0 10 0" />
 
             <StackPanel Spacing="5" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
                 <controls:HyperlinkButton VerticalAlignment="Top" NavigateUri="https://wiki.artemis-rgb.com/en/guides/user/plugins">

src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml

@@ -157,166 +157,7 @@
                 <Separator Grid.Row="1" Classes="card-separator" />
 
                 <avalonia:MarkdownScrollViewer Grid.Row="2" Markdown="{CompiledBinding Changelog}">
-                    <avalonia:MarkdownScrollViewer.Styles>
+                  
-                        <Style Selector="ctxt|CTextBlock">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
-                                <Setter Property="Margin" Value="0,5" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="TextBlock">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CTextBlock.Heading1">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 3.2}" />
-                                <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
-                                <Setter Property="FontWeight" Value="Light" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CTextBlock.Heading2">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
-                                <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
-                                <Setter Property="FontWeight" Value="Light" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CTextBlock.Heading3">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
-                                <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                                <Setter Property="FontWeight" Value="Light" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CTextBlock.Heading4">
-                            <Style.Setters>
-                                <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.2}" />
-                                <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                                <Setter Property="FontWeight" Value="Light" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CHyperlink">
-                            <Style.Setters>
-                                <Setter Property="IsUnderline" Value="true" />
-                                <Setter Property="Foreground" Value="{StaticResource SystemAccentColor}" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="ctxt|CHyperlink:pointerover">
-                            <Setter Property="Foreground" Value="{mde:Complementary SystemAccentColor}" />
-                        </Style>
-
-                        <Style Selector="Border.Table">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="5" />
-                                <Setter Property="BorderThickness" Value="0,0,1,1" />
-                                <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Grid.Table > Border">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="0" />
-                                <Setter Property="BorderThickness" Value="1,1,0,0" />
-                                <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                                <Setter Property="Padding" Value="2" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Border.TableHeader">
-                            <Style.Setters>
-                                <Setter Property="Background" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.3}" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="Border.TableHeader ctxt|CTextBlock">
-                            <Style.Setters>
-                                <Setter Property="FontWeight" Value="DemiBold" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Border.EvenTableRow">
-                            <Style.Setters>
-                                <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Border.CodeBlock">
-                            <Style.Setters>
-                                <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                                <Setter Property="BorderThickness" Value="0,5,0,5" />
-                                <Setter Property="Margin" Value="5,0,5,0" />
-                                <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="TextBlock.CodeBlock">
-                            <Style.Setters>
-                                <Setter Property="FontFamily" Value="menlo,monaco,consolas,droid sans mono,inconsolata,courier new,monospace,dejavu sans mono" />
-                                <Setter Property="Foreground" Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="Border.NoContainer">
-                            <Style.Setters>
-                                <Setter Property="BorderBrush" Value="Red" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="ctxt|CCode">
-                            <Style.Setters>
-                                <Setter Property="Foreground" Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}" />
-                                <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Border.Note">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="5,0,5,0" />
-                                <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                                <Setter Property="BorderThickness" Value="3,3,3,3" />
-                                <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="ctxt|CTextBlock.Note">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="10, 5" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Grid.List">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="15,0,0,0" />
-                            </Style.Setters>
-                        </Style>
-                        <Style Selector="ctxt|CTextBlock.ListMarker">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="0,5,5,5" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="Border.Blockquote">
-                            <Style.Setters>
-                                <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                                <Setter Property="BorderThickness" Value="5,0,0,0" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="StackPanel.Blockquote">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="10, 5" />
-                            </Style.Setters>
-                        </Style>
-
-                        <Style Selector="mdc|Rule">
-                            <Style.Setters>
-                                <Setter Property="Margin" Value="0,3" />
-                            </Style.Setters>
-                        </Style>
-                    </avalonia:MarkdownScrollViewer.Styles>
                 </avalonia:MarkdownScrollViewer>
             </Grid>
         </Border>

src/Artemis.UI/Screens/Sidebar/Behaviors/ProfileConfigurationDropHandler.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Generators;
 using Avalonia.Input;
 using Avalonia.VisualTree;
 using Avalonia.Xaml.Interactions.DragAndDrop;

src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs

@@ -2,7 +2,6 @@ using System;
 using System.Reactive.Disposables;
 using Artemis.UI.Shared;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using ReactiveUI;
 

src/Artemis.UI/Screens/Sidebar/SidebarView.axaml

@@ -9,15 +9,12 @@
              x:Class="Artemis.UI.Screens.Sidebar.SidebarView"
              x:DataType="sidebar:SidebarViewModel">
     <UserControl.Styles>
-        <StyleInclude Source="avares://Avalonia.Xaml.Interactions/Draggable/Styles.axaml" />
+        <StyleInclude Source="avares://Avalonia.Xaml.Interactions.Draggable/Styles.axaml" />
     </UserControl.Styles>
     <Grid RowDefinitions="60,Auto,Auto,*,Auto,Auto">
         <Grid Grid.Row="0" IsHitTestVisible="False" ColumnDefinitions="Auto,*">
             <Image Grid.Column="0" Margin="12" Source="/Assets/Images/Logo/bow.png" RenderOptions.BitmapInterpolationMode="HighQuality" />
-            <TextBlock Grid.Column="1"
+            <TextBlock Grid.Column="1" FontSize="24" VerticalAlignment="Center">
-                       FontSize="24"
-                       VerticalAlignment="Center"
-                       Foreground="{DynamicResource MaterialDesignDarkForeground}">
                 Artemis 2
             </TextBlock>
         </Grid>

src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs

@@ -3,9 +3,7 @@ using System.Reactive.Disposables;
 using Artemis.UI.Screens.StartupWizard.Steps;
 using Artemis.UI.Shared;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
 using ReactiveUI;
 

src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs

@@ -3,15 +3,12 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
-using System.Reflection;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.DeviceProviders;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Plugins;
-using Artemis.UI.Services.Interfaces;
-using Artemis.UI.Services.Updating;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Providers;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml

@@ -30,7 +30,7 @@
             <TextBlock Grid.Row="1"
                        Grid.Column="1"
                        VerticalAlignment="Top"
-                       Foreground="{DynamicResource MaterialDesignBodyLight}"
+                       Classes="subtitle"
                        Text="{Binding Version}" />
 
             <controls:HyperlinkButton Grid.Row="1"

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml

@@ -64,7 +64,7 @@
     </UserControl.Resources>
     <Grid Margin="0 0 15 15" ColumnDefinitions="*,400">
         <Border Grid.Column="0" Classes="card-condensed">
-            <paz:ZoomBorder Name="ZoomBorder"
+            <paz:ZoomBorder Name="ContainerZoomBorder"
                             Stretch="None"
                             ClipToBounds="True"
                             Focusable="True"

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs

@@ -1,10 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.UI.Shared;
 using Artemis.UI.Shared.Events;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Generators;
 using Avalonia.Controls.PanAndZoom;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
@@ -18,7 +16,7 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
     public SurfaceEditorView()
     {
         InitializeComponent();
-        ZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
+        ContainerZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
         UpdateZoomBorderBackground();
     }
 
@@ -36,7 +34,7 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
     private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e)
     {
         UpdateZoomBorderBackground();
-        SurfaceBounds.BorderThickness = new Thickness(2 / ZoomBorder.ZoomX);
+        SurfaceBounds.BorderThickness = new Thickness(2 / ContainerZoomBorder.ZoomX);
     }
 
     private void SelectionRectangle_OnSelectionUpdated(object? sender, SelectionRectangleEventArgs e)
@@ -54,7 +52,7 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
 
     private void UpdateZoomBorderBackground()
     {
-        if (ZoomBorder.Background is VisualBrush visualBrush)
+        if (ContainerZoomBorder.Background is VisualBrush visualBrush)
-            visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
+            visualBrush.DestinationRect = new RelativeRect(ContainerZoomBorder.OffsetX * -1, ContainerZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
     }
 }

src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs

@@ -3,8 +3,6 @@ using System.Linq;
 using System.Reactive.Disposables;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Mixins;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;

src/Artemis.UI/Screens/VisualScripting/DragCableView.axaml.cs

@@ -2,9 +2,6 @@ using System;
 using System.Linq;
 using System.Reactive.Disposables;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Mixins;
-using Avalonia.Controls.Shapes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.ReactiveUI;

src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml.cs

@@ -3,8 +3,6 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Mixins;
 using Avalonia.Controls.PanAndZoom;
 using Avalonia.Input;
 using Avalonia.LogicalTree;

src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml

@@ -35,7 +35,7 @@
         <KeyBinding Command="{CompiledBinding History.Undo}" Gesture="Ctrl+Z" />
         <KeyBinding Command="{CompiledBinding History.Redo}" Gesture="Ctrl+Y" />
     </UserControl.KeyBindings>
-    <paz:ZoomBorder Name="ZoomBorder"
+    <paz:ZoomBorder Name="NodeScriptZoomBorder"
                     Stretch="None"
                     Focusable="True"
                     VerticalAlignment="Stretch"
@@ -86,7 +86,7 @@
             </ItemsControl>
 
             <shared:SelectionRectangle Name="SelectionRectangle"
-                                       InputElement="{Binding #ZoomBorder}"
+                                       InputElement="{Binding #NodeScriptZoomBorder}"
                                        SelectionUpdated="SelectionRectangle_OnSelectionUpdated"
                                        SelectionFinished="SelectionRectangle_OnSelectionFinished"
                                        BorderBrush="{DynamicResource SystemAccentColor}"

src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs

@@ -2,11 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Disposables;
-using Artemis.UI.Shared;
 using Artemis.UI.Shared.Events;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Generators;
 using Avalonia.Controls.PanAndZoom;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -25,26 +23,26 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
     {
         InitializeComponent();
 
-        ZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
+        // NodeScriptZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
-        UpdateZoomBorderBackground();
+        // UpdateZoomBorderBackground();
-
+        //
-        ZoomBorder.AddHandler(PointerReleasedEvent, CanvasOnPointerReleased, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
+        // NodeScriptZoomBorder.AddHandler(PointerReleasedEvent, CanvasOnPointerReleased, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
-        ZoomBorder.AddHandler(PointerWheelChangedEvent, ZoomOnPointerWheelChanged, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
+        // NodeScriptZoomBorder.AddHandler(PointerWheelChangedEvent, ZoomOnPointerWheelChanged, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
-        ZoomBorder.AddHandler(PointerMovedEvent, ZoomOnPointerMoved, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
+        // NodeScriptZoomBorder.AddHandler(PointerMovedEvent, ZoomOnPointerMoved, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
-
+        //
-        this.WhenActivated(d =>
+        // this.WhenActivated(d =>
-        {
+        // {
-            ViewModel!.AutoFitRequested += ViewModelOnAutoFitRequested;
+        //     ViewModel!.AutoFitRequested += ViewModelOnAutoFitRequested;
-            ViewModel.PickerPositionSubject.Subscribe(ShowPickerAt).DisposeWith(d);
+        //     ViewModel.PickerPositionSubject.Subscribe(ShowPickerAt).DisposeWith(d);
-            if (ViewModel.IsPreview)
+        //     if (ViewModel.IsPreview)
-            {
+        //     {
-                BoundsProperty.Changed.Subscribe(BoundsPropertyChanged).DisposeWith(d);
+        //         BoundsProperty.Changed.Subscribe(BoundsPropertyChanged).DisposeWith(d);
-                ViewModel.NodeViewModels.ToObservableChangeSet().Subscribe(_ => AutoFitIfPreview()).DisposeWith(d);
+        //         ViewModel.NodeViewModels.ToObservableChangeSet().Subscribe(_ => AutoFitIfPreview()).DisposeWith(d);
-            }
+        //     }
-
+        //
-            Dispatcher.UIThread.InvokeAsync(() => AutoFit(true), DispatcherPriority.ContextIdle);
+        //     Dispatcher.UIThread.InvokeAsync(() => AutoFit(true), DispatcherPriority.ContextIdle);
-            Disposable.Create(() => ViewModel.AutoFitRequested -= ViewModelOnAutoFitRequested).DisposeWith(d);
+        //     Disposable.Create(() => ViewModel.AutoFitRequested -= ViewModelOnAutoFitRequested).DisposeWith(d);
-        });
+        // });
     }
 
     protected override Size MeasureOverride(Size availableSize)
@@ -56,7 +54,7 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
     private void ZoomOnPointerWheelChanged(object? sender, PointerWheelEventArgs e)
     {
         // If scroll events aren't handled here the ZoomBorder does some random panning when at the zoom limit
-        if (e.Delta.Y > 0 && ZoomBorder.ZoomX >= 1)
+        if (e.Delta.Y > 0 && NodeScriptZoomBorder.ZoomX >= 1)
             e.Handled = true;
     }
 
@@ -71,7 +69,7 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
         if (ViewModel == null)
             return;
         ViewModel.NodePickerViewModel.Position = point;
-        ZoomBorder?.ContextFlyout?.ShowAt(ZoomBorder);
+        NodeScriptZoomBorder?.ContextFlyout?.ShowAt(NodeScriptZoomBorder);
     }
 
     private void AutoFitIfPreview()
@@ -111,8 +109,8 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
         double scale = Math.Min(1, Math.Min(Bounds.Width / scriptRect.Width, Bounds.Height / scriptRect.Height));
 
         // Pan and zoom to make the script fit
-        ZoomBorder.Zoom(scale, 0, 0, skipTransitions);
+        NodeScriptZoomBorder.Zoom(scale, 0, 0, skipTransitions);
-        ZoomBorder.Pan(Bounds.Center.X - scriptRect.Center.X * scale, Bounds.Center.Y - scriptRect.Center.Y * scale, skipTransitions);
+        NodeScriptZoomBorder.Pan(Bounds.Center.X - scriptRect.Center.X * scale, Bounds.Center.Y - scriptRect.Center.Y * scale, skipTransitions);
     }
 
     private void ViewModelOnAutoFitRequested(object? sender, EventArgs e)
@@ -122,14 +120,14 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
 
     private void ZoomBorderOnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
     {
-        if (e.Property.Name == nameof(ZoomBorder.Background))
+        if (e.Property.Name == nameof(NodeScriptZoomBorder.Background))
             UpdateZoomBorderBackground();
     }
 
     private void UpdateZoomBorderBackground()
     {
-        if (ZoomBorder.Background is VisualBrush visualBrush)
+        if (NodeScriptZoomBorder.Background is VisualBrush visualBrush)
-            visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
+            visualBrush.DestinationRect = new RelativeRect(NodeScriptZoomBorder.OffsetX * -1, NodeScriptZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
     }
 
     private void InitializeComponent()
@@ -140,7 +138,7 @@ public partial class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
     private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e)
     {
         if (ViewModel != null)
-            ViewModel.PanMatrix = ZoomBorder.Matrix;
+            ViewModel.PanMatrix = NodeScriptZoomBorder.Matrix;
         UpdateZoomBorderBackground();
     }
 

src/Artemis.UI/Services/Updating/UpdateService.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.Storage.Entities.General;
 using Artemis.Storage.Repositories;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Shared.Services.MainWindow;
@@ -110,6 +109,9 @@ public class UpdateService : IUpdateService
 
     private async void HandleAutoUpdateEvent(object? sender, EventArgs e)
     {
+        if (Constants.CurrentVersion == "local")
+            return;
+        
         // The event can trigger from multiple sources with a timer acting as a fallback, only actual perform an action once per max 59 minutes
         if (DateTime.UtcNow - _lastAutoUpdateCheck < TimeSpan.FromMinutes(59))
             return;
@@ -204,6 +206,9 @@ public class UpdateService : IUpdateService
     /// <inheritdoc />
     public bool Initialize()
     {
+        if (Constants.CurrentVersion == "local")
+            return false;
+        
         string? channelArgument = Constants.StartupArguments.FirstOrDefault(a => a.StartsWith("--channel="));
         if (channelArgument != null)
             Channel = channelArgument.Split("=")[1];

src/Artemis.UI/Styles/Artemis.axaml

@@ -1,10 +1,11 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:styling="clr-namespace:FluentAvalonia.Styling;assembly=FluentAvalonia">
+        xmlns:styling="clr-namespace:FluentAvalonia.Styling;assembly=FluentAvalonia"
+        xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia">
     <!-- Third party styles -->
     <styling:FluentAvaloniaTheme PreferSystemTheme="False" RequestedTheme="Dark"/>
+    <avalonia:MaterialIconStyles />
+    
     <!-- <FluentTheme Mode="Dark"></FluentTheme> -->
-    <StyleInclude Source="avares://Material.Icons.Avalonia/App.xaml" />
     <StyleInclude Source="avares://Artemis.UI.Shared/Styles/Artemis.axaml" />
-    <StyleInclude Source="avares://Artemis.UI/Styles/Markdown.axaml" />
 </Styles>

src/Artemis.UI/Styles/Markdown.axaml

@@ -1,191 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:avalonia="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
-        xmlns:mdc="clr-namespace:Markdown.Avalonia.Controls;assembly=Markdown.Avalonia"
-        xmlns:mde="clr-namespace:Markdown.Avalonia.Extensions;assembly=Markdown.Avalonia"
-        xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <avalonia:MarkdownScrollViewer Classes="Test">
-                <avalonia:MarkdownScrollViewer.Styles>
-                    <Style Selector="ctxt|CTextBlock">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
-                            <Setter Property="Margin" Value="0,5" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="TextBlock">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CTextBlock.Heading1">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 3.2}" />
-                            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
-                            <Setter Property="FontWeight" Value="Light" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CTextBlock.Heading2">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
-                            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
-                            <Setter Property="FontWeight" Value="Light" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CTextBlock.Heading3">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
-                            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                            <Setter Property="FontWeight" Value="Light" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CTextBlock.Heading4">
-                        <Style.Setters>
-                            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.2}" />
-                            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                            <Setter Property="FontWeight" Value="Light" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CHyperlink">
-                        <Style.Setters>
-                            <Setter Property="IsUnderline" Value="true" />
-                            <Setter Property="Foreground" Value="{StaticResource SystemAccentColor}" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="ctxt|CHyperlink:pointerover">
-                        <Setter Property="Foreground" Value="{mde:Complementary SystemAccentColor}" />
-                    </Style>
-
-                    <Style Selector="Border.Table">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="5" />
-                            <Setter Property="BorderThickness" Value="0,0,1,1" />
-                            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Grid.Table > Border">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="0" />
-                            <Setter Property="BorderThickness" Value="1,1,0,0" />
-                            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
-                            <Setter Property="Padding" Value="2" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Border.TableHeader">
-                        <Style.Setters>
-                            <Setter Property="Background" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.3}" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="Border.TableHeader ctxt|CTextBlock">
-                        <Style.Setters>
-                            <Setter Property="FontWeight" Value="DemiBold" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Border.EvenTableRow">
-                        <Style.Setters>
-                            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Border.CodeBlock">
-                        <Style.Setters>
-                            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                            <Setter Property="BorderThickness" Value="0,5,0,5" />
-                            <Setter Property="Margin" Value="5,0,5,0" />
-                            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="TextBlock.CodeBlock">
-                        <Style.Setters>
-                            <Setter Property="FontFamily" Value="menlo,monaco,consolas,droid sans mono,inconsolata,courier new,monospace,dejavu sans mono" />
-                            <Setter Property="Foreground" Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="Border.NoContainer">
-                        <Style.Setters>
-                            <Setter Property="BorderBrush" Value="Red" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="ctxt|CCode">
-                        <Style.Setters>
-                            <Setter Property="Foreground" Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}" />
-                            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Border.Note">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="5,0,5,0" />
-                            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                            <Setter Property="BorderThickness" Value="3,3,3,3" />
-                            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="ctxt|CTextBlock.Note">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="10, 5" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Grid.List">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="15,0,0,0" />
-                        </Style.Setters>
-                    </Style>
-                    <Style Selector="ctxt|CTextBlock.ListMarker">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="0,5,5,5" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="Border.Blockquote">
-                        <Style.Setters>
-                            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
-                            <Setter Property="BorderThickness" Value="5,0,0,0" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="StackPanel.Blockquote">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="10, 5" />
-                        </Style.Setters>
-                    </Style>
-
-                    <Style Selector="mdc|Rule">
-                        <Style.Setters>
-                            <Setter Property="Margin" Value="0,3" />
-                        </Style.Setters>
-                    </Style>
-                </avalonia:MarkdownScrollViewer.Styles>
-                ## Core
-                * Cleaned up ProfileService render condition
-                * Core - Added fading in and out of profiles
-                * Core - Apply opacity layer only when fading
-                * Core - Fixed when condition stops being true mid-fade
-                * Core - Removed FadingStatus enum
-
-                # General
-                - Meta - Fixed warnings
-                - Meta - Update RGB.NET
-
-                # Plugins
-                - Plugins - Ignore version when loading shared assemblies
-
-                # UI
-                - Sidebar - Improved category reordering code
-            </avalonia:MarkdownScrollViewer>
-        </Border>
-    </Design.PreviewWith>
-
-
-</Styles>

src/Artemis.UI/ViewLocator.cs

@@ -11,7 +11,7 @@ namespace Artemis.UI;
 
 public class ViewLocator : IDataTemplate
 {
-    public IControl Build(object data)
+    public Control Build(object data)
     {
         Type dataType = data.GetType();
         string name = dataType.FullName!.Split('`')[0].Replace("ViewModel", "View");

src/Artemis.VisualScripting/Artemis.VisualScripting.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>

src/Artemis.VisualScripting/Nodes/Color/Screens/ColorGradientNodeCustomView.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Color.Screens;
 
-public class ColorGradientNodeCustomView : ReactiveUserControl<ColorGradientNodeCustomViewModel>
+public partial class ColorGradientNodeCustomView : ReactiveUserControl<ColorGradientNodeCustomViewModel>
 {
     public ColorGradientNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Color/Screens/RampSKColorNodeCustomView.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Color.Screens;
 
-public class RampSKColorNodeCustomView : ReactiveUserControl<RampSKColorNodeCustomViewModel>
+public partial class RampSKColorNodeCustomView : ReactiveUserControl<RampSKColorNodeCustomViewModel>
 {
     public RampSKColorNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventCycleNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.DataModel.Screens;
 
-public class DataModelEventCycleNodeCustomView : ReactiveUserControl<DataModelEventCycleNodeCustomViewModel>
+public partial class DataModelEventCycleNodeCustomView : ReactiveUserControl<DataModelEventCycleNodeCustomViewModel>
 {
     public DataModelEventCycleNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.DataModel.Screens;
 
-public class DataModelEventNodeCustomView : ReactiveUserControl<DataModelEventNodeCustomViewModel>
+public partial class DataModelEventNodeCustomView : ReactiveUserControl<DataModelEventNodeCustomViewModel>
 {
     public DataModelEventNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.DataModel.Screens;
 
-public class DataModelNodeCustomView : ReactiveUserControl<DataModelNodeCustomViewModel>
+public partial class DataModelNodeCustomView : ReactiveUserControl<DataModelNodeCustomViewModel>
 {
     public DataModelNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.External.Screens;
 
-public class LayerPropertyNodeCustomView : ReactiveUserControl<LayerPropertyNodeCustomViewModel>
+public partial class LayerPropertyNodeCustomView : ReactiveUserControl<LayerPropertyNodeCustomViewModel>
 {
     public LayerPropertyNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomViewModel.cs

@@ -1,10 +1,10 @@
 using System.Collections.ObjectModel;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.VisualScripting;
 using Artemis.VisualScripting.Nodes.External.Commands;
-using Avalonia.Controls.Mixins;
 using DynamicData;
 using ReactiveUI;
 

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomView.axaml.cs

@@ -1,6 +1,4 @@
 using Artemis.UI.Shared;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomViewModel.cs

@@ -1,9 +1,9 @@
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Input.Screens;

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomView.axaml.cs

@@ -1,6 +1,4 @@
 using Artemis.UI.Shared;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomViewModel.cs

@@ -1,9 +1,9 @@
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Input.Screens;

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomView.axaml.cs

@@ -1,6 +1,4 @@
 using Artemis.UI.Shared;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 

src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomViewModel.cs

@@ -1,9 +1,9 @@
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Input.Screens;

src/Artemis.VisualScripting/Nodes/Input/Screens/PressedKeyPositionNodeCustomViewModel.cs

@@ -1,10 +1,10 @@
 using System.Collections.ObjectModel;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 using static Artemis.VisualScripting.Nodes.Input.PressedKeyPositionNodeEntity;
 

src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomView.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Mathematics.Screens;
 
-public class MathExpressionNodeCustomView : ReactiveUserControl<MathExpressionNodeCustomViewModel>
+public partial class MathExpressionNodeCustomView : ReactiveUserControl<MathExpressionNodeCustomViewModel>
 {
     public MathExpressionNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomViewModel.cs

@@ -1,10 +1,10 @@
-using System.Reactive.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Events;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using ReactiveUI;
 using ReactiveUI.Validation.Extensions;
 

src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml

@@ -7,7 +7,6 @@
     <ComboBox IsEnabled="{Binding EnumValues.Count}"
               Items="{Binding EnumValues}"
               SelectedItem="{Binding CurrentValue}"
-              VirtualizationMode="Simple"
               PlaceholderText="Select a value"
               Classes="condensed"
               VerticalAlignment="Center">

src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Operators.Screens;
 
-public class EnumEqualsNodeCustomView : ReactiveUserControl<EnumEqualsNodeCustomViewModel>
+public partial class EnumEqualsNodeCustomView : ReactiveUserControl<EnumEqualsNodeCustomViewModel>
 {
     public EnumEqualsNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomViewModel.cs

@@ -1,11 +1,11 @@
 using System.Collections.ObjectModel;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Events;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Artemis.UI.Shared.VisualScripting;
-using Avalonia.Controls.Mixins;
 using Avalonia.Threading;
 using DynamicData;
 using Humanizer;

src/Artemis.VisualScripting/Nodes/Static/Screens/DisplayValueNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Static.Screens;
 
-public class DisplayValueNodeCustomView : ReactiveUserControl<DisplayValueNodeCustomViewModel>
+public partial class DisplayValueNodeCustomView : ReactiveUserControl<DisplayValueNodeCustomViewModel>
 {
     public DisplayValueNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Static/Screens/StaticNumericValueNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Static.Screens;
 
-public class StaticNumericValueNodeCustomView : ReactiveUserControl<StaticNumericValueNodeCustomViewModel>
+public partial class StaticNumericValueNodeCustomView : ReactiveUserControl<StaticNumericValueNodeCustomViewModel>
 {
     public StaticNumericValueNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Static/Screens/StaticSKColorValueNodeCustomView.axaml.cs

@@ -4,7 +4,7 @@ using FluentAvalonia.UI.Controls;
 
 namespace Artemis.VisualScripting.Nodes.Static.Screens;
 
-public class StaticSKColorValueNodeCustomView : ReactiveUserControl<StaticSKColorValueNodeCustomViewModel>
+public partial class StaticSKColorValueNodeCustomView : ReactiveUserControl<StaticSKColorValueNodeCustomViewModel>
 {
     public StaticSKColorValueNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Static/Screens/StaticStringValueNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Static.Screens;
 
-public class StaticStringValueNodeCustomView : ReactiveUserControl<StaticStringValueNodeCustomViewModel>
+public partial class StaticStringValueNodeCustomView : ReactiveUserControl<StaticStringValueNodeCustomViewModel>
 {
     public StaticStringValueNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionNodeCustomView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.VisualScripting.Nodes.Transition.Screens;
 
-public class EasingFunctionNodeCustomView : ReactiveUserControl<EasingFunctionNodeCustomViewModel>
+public partial class EasingFunctionNodeCustomView : ReactiveUserControl<EasingFunctionNodeCustomViewModel>
 {
     public EasingFunctionNodeCustomView()
     {

src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
 
 namespace Artemis.VisualScripting.Nodes.Transition.Screens;
 
-public class EasingFunctionView : UserControl
+public partial class EasingFunctionView : UserControl
 {
     public EasingFunctionView()
     {

src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>