diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
index 76b4e1d0..10972d16 100644
--- a/Desktop.Linux/Program.cs
+++ b/Desktop.Linux/Program.cs
@@ -16,6 +16,8 @@ using Avalonia;
 using Immense.RemoteControl.Desktop.UI;
 using Desktop.Shared.Services;
 
+namespace Remotely.Desktop.XPlat;
+
 public class Program
 {
     // This is needed for the visual designer to work.
@@ -105,4 +107,4 @@ public class Program
         }
         catch (TaskCanceledException) { }
     }
-}
+}
\ No newline at end of file
diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
index 19c75459..3528e3f6 100644
--- a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
+++ b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\linux-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\linux-x64\Desktop</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
index ea8d1bd5..64a932a8 100644
--- a/Desktop.Win/Program.cs
+++ b/Desktop.Win/Program.cs
@@ -15,6 +15,8 @@ using Avalonia;
 using Immense.RemoteControl.Desktop.UI;
 using Desktop.Shared.Services;
 
+namespace Remotely.Desktop.Win;
+
 public class Program
 {
     // This is needed for the visual designer to work.
@@ -95,4 +97,4 @@ public class Program
         }
         catch (TaskCanceledException) { }
     }
-}
+}
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
index 846519dc..4389db11 100644
--- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
index 525132a4..524005f6 100644
--- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishSingleFile>false</PublishSingleFile>
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
index 0f1e16fe..0d321d1a 100644
--- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x86\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x86\Desktop</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
deleted file mode 100644
index 56eb1c86..00000000
--- a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>x64</Platform>
-    <TargetFramework>net7.0-windows</TargetFramework>
-    <PublishDir>bin\Release\win-x64\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
deleted file mode 100644
index 2144ba58..00000000
--- a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>x86</Platform>
-    <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>bin\Release\win-x86\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1
index ddb607fd..e4eb184a 100644
--- a/Utilities/Publish.ps1
+++ b/Utilities/Publish.ps1
@@ -92,25 +92,25 @@ if ([string]::IsNullOrWhiteSpace($MSBuildPath) -or !(Test-Path -Path $MSBuildPat
 
     
 # Clear publish folders.
-if ((Test-Path -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish") -eq $true) {
-	Get-ChildItem -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path "$Root\Agent\bin\publish\win-x64") -eq $true) {
+	Get-ChildItem -Path "$Root\Agent\bin\publish\win-x64" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path  "$Root\Agent\bin\Release\net7.0\win-x86\publish" ) -eq $true) {
-	Get-ChildItem -Path  "$Root\Agent\bin\Release\net7.0\win-x86\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path  "$Root\Agent\bin\publish\win-x86" ) -eq $true) {
+	Get-ChildItem -Path  "$Root\Agent\bin\publish\win-x86" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish") -eq $true) {
-	Get-ChildItem -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path "$Root\Agent\bin\publish\linux-x64") -eq $true) {
+	Get-ChildItem -Path "$Root\Agent\bin\publish\linux-x64" | Remove-Item -Force -Recurse
 }
 
 
 # Publish Core clients.
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\win-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\linux-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x86 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\win-x86\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x64 --self-contained --configuration Release --output "$Root\Agent\bin\publish\win-x64" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\publish\linux-x64" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x86 --self-contained --configuration Release --output "$Root\Agent\bin\publish\win-x86" "$Root\Agent"
 
-New-Item -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish\Desktop\" -ItemType Directory -Force
-New-Item -Path "$Root\Agent\bin\Release\net7.0\win-x86\publish\Desktop\" -ItemType Directory -Force
-New-Item -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\win-x64\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\win-x86\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\linux-x64\Desktop\" -ItemType Directory -Force
 
 
 # Publish Linux ScreenCaster
@@ -155,7 +155,7 @@ if ($SignAssemblies) {
 }
 
 # Compress Core clients.
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\win-x64\publish"
+$PublishDir =  "$Root\Agent\bin\publish\win-x64"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win-x64.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win-x64.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x64.zip"
@@ -163,7 +163,7 @@ while ((Test-Path -Path "$PublishDir\Remotely-Win-x64.zip") -eq $false){
 }
 Move-Item -Path "$PublishDir\Remotely-Win-x64.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win-x64.zip" -Force
 
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\win-x86\publish"
+$PublishDir =  "$Root\Agent\bin\publish\win-x86"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win-x86.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win-x86.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x86.zip"
@@ -171,7 +171,7 @@ while ((Test-Path -Path "$PublishDir\Remotely-Win-x86.zip") -eq $false){
 }
 Move-Item -Path "$PublishDir\Remotely-Win-x86.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win-x86.zip" -Force
 
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\linux-x64\publish"
+$PublishDir =  "$Root\Agent\bin\publish\linux-x64"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x86.zip"
diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
index 7b16798d..9395713c 160000
--- a/submodules/Immense.RemoteControl
+++ b/submodules/Immense.RemoteControl
@@ -1 +1 @@
-Subproject commit 7b16798dd39d3fd8e2877a380cc50d7c4e55eb4d
+Subproject commit 9395713ca70430b8b473cccb6fd63f888aeb6aa9