diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
index ecf05251d..a30e8caa7 100644
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@@ -6,8 +6,8 @@
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
-        <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-        <AssemblyName>Artemis 2</AssemblyName>
+        <AssemblyTitle>Artemis 2</AssemblyTitle>
+        <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>        
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
index ecf05251d..a70c5dc92 100644
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@@ -6,8 +6,8 @@
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
+        <AssemblyTitle>Artemis 2</AssemblyTitle>
         <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-        <AssemblyName>Artemis 2</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
diff --git a/src/Artemis.UI.Windows/App.axaml.cs b/src/Artemis.UI.Windows/App.axaml.cs
index 46e09a283..78ea2aea9 100644
--- a/src/Artemis.UI.Windows/App.axaml.cs
+++ b/src/Artemis.UI.Windows/App.axaml.cs
@@ -1,6 +1,5 @@
 using Artemis.Core.Services;
 using Artemis.UI.Windows.Ninject;
-using Artemis.UI.Windows.Providers;
 using Artemis.UI.Windows.Providers.Input;
 using Avalonia;
 using Avalonia.Controls;
@@ -14,6 +13,12 @@ namespace Artemis.UI.Windows
 {
     public class App : Application
     {
+        // ReSharper disable NotAccessedField.Local
+        private ApplicationStateManager? _applicationStateManager;
+        // ReSharper restore NotAccessedField.Local
+
+        private StandardKernel? _kernel;
+
         public override void Initialize()
         {
             _kernel = ArtemisBootstrapper.Bootstrap(this, new WindowsModule());
@@ -37,11 +42,5 @@ namespace Artemis.UI.Windows
             IInputService inputService = standardKernel.Get<IInputService>();
             inputService.AddInputProvider(standardKernel.Get<WindowsInputProvider>());
         }
-
-        private StandardKernel? _kernel;
-
-        // ReSharper disable NotAccessedField.Local
-        private ApplicationStateManager? _applicationStateManager;
-        // ReSharper restore NotAccessedField.Local
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
index 050ed0025..0b428e186 100644
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@@ -7,10 +7,8 @@
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
         <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-        <Company>Artemis RGB</Company>
-        <Product>Artemis 2.0</Product>
-        <ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
-        <AssemblyName>Artemis 2</AssemblyName>
+        <AssemblyTitle>Artemis 2</AssemblyTitle>
+        <ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>	    
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
diff --git a/src/Artemis.UI.Windows/Providers/AutoRunProvider.cs b/src/Artemis.UI.Windows/Providers/AutoRunProvider.cs
index 6ead1404e..1edec504c 100644
--- a/src/Artemis.UI.Windows/Providers/AutoRunProvider.cs
+++ b/src/Artemis.UI.Windows/Providers/AutoRunProvider.cs
@@ -41,7 +41,7 @@ public class AutoRunProvider : IAutoRunProvider
 
     private async Task CreateAutoRunTask(TimeSpan autoRunDelay)
     {
-        await using Stream taskFile = _assetLoader.Open(new Uri("avares://Artemis 2/Assets/autorun.xml"));
+        await using Stream taskFile = _assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/autorun.xml"));
 
         XDocument document = await XDocument.LoadAsync(taskFile, LoadOptions.None, CancellationToken.None);
         XElement task = document.Descendants().First();
diff --git a/src/Artemis.UI.Windows/Providers/CursorProvider.cs b/src/Artemis.UI.Windows/Providers/CursorProvider.cs
index f6a2fce09..97a53f032 100644
--- a/src/Artemis.UI.Windows/Providers/CursorProvider.cs
+++ b/src/Artemis.UI.Windows/Providers/CursorProvider.cs
@@ -11,9 +11,9 @@ public class CursorProvider : ICursorProvider
 {
     public CursorProvider(IAssetLoader assetLoader)
     {
-        Rotate = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_rotate.png"))), new PixelPoint(21, 10));
-        Drag = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_drag.png"))), new PixelPoint(11, 3));
-        DragHorizontal = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_drag_horizontal.png"))), new PixelPoint(16, 5));
+        Rotate = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_rotate.png"))), new PixelPoint(21, 10));
+        Drag = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_drag.png"))), new PixelPoint(11, 3));
+        DragHorizontal = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_drag_horizontal.png"))), new PixelPoint(16, 5));
     }
 
     public Cursor Rotate { get; }
diff --git a/src/Artemis.UI.Windows/Providers/UpdateProvider.cs b/src/Artemis.UI.Windows/Providers/UpdateProvider.cs
index c38b736cf..d7e2a5849 100644
--- a/src/Artemis.UI.Windows/Providers/UpdateProvider.cs
+++ b/src/Artemis.UI.Windows/Providers/UpdateProvider.cs
@@ -158,7 +158,6 @@ public class UpdateProvider : IUpdateProvider, IDisposable
             .AddText("An update is available")
             .AddButton(new ToastButton().SetContent("Install").AddArgument("action", "install").SetBackgroundActivation())
             .AddButton(new ToastButton().SetContent("View changes").AddArgument("action", "view-changes"))
-            .AddHeroImage(new Uri(@"C:\Repos\Artemis\src\Artemis.UI\Assets\Images\home-banner.png"))
             .Show();
     }