diff --git a/UserInterface/Properties/PublishProfiles/Standalone.pubxml b/UserInterface/Properties/PublishProfiles/Standalone.pubxml
index abe2514..f2ea5d8 100644
--- a/UserInterface/Properties/PublishProfiles/Standalone.pubxml
+++ b/UserInterface/Properties/PublishProfiles/Standalone.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/UserInterface/UserInterface.csproj b/UserInterface/UserInterface.csproj
index c44e022..342d878 100644
--- a/UserInterface/UserInterface.csproj
+++ b/UserInterface/UserInterface.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <StartupObject>UserInterface.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/hass-workstation-service/Properties/PublishProfiles/AzureHosted.pubxml b/hass-workstation-service/Properties/PublishProfiles/AzureHosted.pubxml
index e571e79..4bf6060 100644
--- a/hass-workstation-service/Properties/PublishProfiles/AzureHosted.pubxml
+++ b/hass-workstation-service/Properties/PublishProfiles/AzureHosted.pubxml
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ApplicationRevision>35</ApplicationRevision>
+    <ApplicationRevision>39</ApplicationRevision>
     <ApplicationVersion>1.0.0.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Release</Configuration>
diff --git a/hass-workstation-service/UserInterface.exe b/hass-workstation-service/UserInterface.exe
new file mode 100644
index 0000000..7ef0348
Binary files /dev/null and b/hass-workstation-service/UserInterface.exe differ
diff --git a/hass-workstation-service/hass-workstation-service.csproj b/hass-workstation-service/hass-workstation-service.csproj
index 33e33ea..cf89a3f 100644
--- a/hass-workstation-service/hass-workstation-service.csproj
+++ b/hass-workstation-service/hass-workstation-service.csproj
@@ -25,7 +25,9 @@
 
   <ItemGroup>
     <None Remove="hass-workstation-service.pdb" />
+    <None Remove="libHarfBuzzSharp.dll" />
     <None Remove="libSkiaSharp.dll" />
+    <None Remove="UserInterface.exe" />
     <None Remove="UserInterface.pdb" />
   </ItemGroup>
 
@@ -33,6 +35,12 @@
     <Content Include="libSkiaSharp.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="libHarfBuzzSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="UserInterface.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
@@ -59,4 +67,8 @@
       <HintPath>..\lib\CoreAudio.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="libHarfBuzzSharp.dll" />
+  </ItemGroup>
 </Project>
diff --git a/hass-workstation-service/hass-workstation-service.exe b/hass-workstation-service/hass-workstation-service.exe
new file mode 100644
index 0000000..387fa26
Binary files /dev/null and b/hass-workstation-service/hass-workstation-service.exe differ
diff --git a/hass-workstation-service/libHarfBuzzSharp.dll b/hass-workstation-service/libHarfBuzzSharp.dll
new file mode 100644
index 0000000..45cd87c
Binary files /dev/null and b/hass-workstation-service/libHarfBuzzSharp.dll differ
diff --git a/hass-workstation-service/libSkiaSharp.dll b/hass-workstation-service/libSkiaSharp.dll
index 1a27091..fe490ac 100644
Binary files a/hass-workstation-service/libSkiaSharp.dll and b/hass-workstation-service/libSkiaSharp.dll differ