diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index 4859d49..cb27fa1 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -20,6 +20,15 @@
     <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
     <Property Id="MSIINSTALLPERUSER" Value="1" />
 
+    <!-- Launch application after installation -->
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch NFC Actions" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
+    <Property Id="WixShellExecTarget" Value="[#NfcActionsExe]" />
+    <CustomAction Id="LaunchApplication"
+                  BinaryKey="WixCA"
+                  DllEntry="WixShellExec"
+                  Impersonate="yes" />
+
     <Icon Id="ProductIcon" SourceFile="..\NfcActions\Resources\icon.ico" />
     <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
     <Property Id="ARPHELPLINK" Value="https://dangerousthings.com" />
@@ -32,6 +41,21 @@
       <ComponentRef Id="AutoStartRegistry" />
     </Feature>
 
+    <UI>
+      <!-- Use WixUI_Minimal without license page -->
+      <UIRef Id="WixUI_InstallDir" />
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+
+      <!-- Skip the license page -->
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
+
+      <Publish Dialog="ExitDialog"
+               Control="Finish"
+               Event="DoAction"
+               Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+    </UI>
+
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="LocalAppDataFolder">
         <Directory Id="CompanyFolder" Name="DangerousThings">
diff --git a/NfcActions-Setup-v1.0.1.msi b/NfcActions-Setup-v1.0.1.msi
deleted file mode 100644
index 17b76f5..0000000
Binary files a/NfcActions-Setup-v1.0.1.msi and /dev/null differ
diff --git a/NfcActions-Setup.msi b/NfcActions-Setup-v1.0.2-NET8.msi
similarity index 81%
rename from NfcActions-Setup.msi
rename to NfcActions-Setup-v1.0.2-NET8.msi
index 86808bb..ea2f4a6 100644
Binary files a/NfcActions-Setup.msi and b/NfcActions-Setup-v1.0.2-NET8.msi differ
diff --git a/NfcActions/App.config b/NfcActions/App.config
new file mode 100644
index 0000000..e88f2ce
--- /dev/null
+++ b/NfcActions/App.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <!-- Force software rendering to prevent DirectWrite crashes -->
+    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotUsePresentationDpiCapabilityTier2OrGreater=true;Switch.System.Windows.DoNotScaleForDpiChanges=false" />
+  </runtime>
+</configuration>
diff --git a/NfcActions/App.xaml.cs b/NfcActions/App.xaml.cs
index cf971fd..9c929de 100644
--- a/NfcActions/App.xaml.cs
+++ b/NfcActions/App.xaml.cs
@@ -25,6 +25,24 @@ public partial class App : Application
     private LogService? _logService;
     private MainViewModel? _viewModel;
 
+    public App()
+    {
+        // CRITICAL: Set software rendering mode BEFORE any WPF initialization
+        // This must be done in the constructor before InitializeComponent()
+        try
+        {
+            // Set environment variable as additional safeguard
+            Environment.SetEnvironmentVariable("DOTNET_SYSTEM_WINDOWS_DONOTUSEPRESENTATIONDPICAPABILITYTIER2ORGREATER", "1");
+
+            // Force software rendering
+            RenderOptions.ProcessRenderMode = System.Windows.Interop.RenderMode.SoftwareOnly;
+        }
+        catch
+        {
+            // If this fails, try to continue anyway
+        }
+    }
+
     private void Application_Startup(object sender, StartupEventArgs e)
     {
         // Ensure only one instance runs at a time
@@ -41,15 +59,6 @@ public partial class App : Application
             return;
         }
 
-        // Workaround for DirectWrite crash - force software rendering
-        try
-        {
-            RenderOptions.ProcessRenderMode = System.Windows.Interop.RenderMode.SoftwareOnly;
-        }
-        catch
-        {
-            // Ignore if this fails
-        }
         // Initialize services
         _logService = new LogService();
         _cardReaderService = new CardReaderService(_logService);
diff --git a/NfcActions/NfcActions.csproj b/NfcActions/NfcActions.csproj
index 1eec0c7..d2f2489 100644
--- a/NfcActions/NfcActions.csproj
+++ b/NfcActions/NfcActions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
@@ -20,7 +20,7 @@
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
     <PublishTrimmed>false</PublishTrimmed>
     <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
   </PropertyGroup>
diff --git a/build-release.ps1 b/build-release.ps1
index 95bd945..c8f57ca 100644
--- a/build-release.ps1
+++ b/build-release.ps1
@@ -9,7 +9,7 @@ param(
 $ErrorActionPreference = "Stop"
 $scriptPath = Split-Path -Parent $MyInvocation.MyCommand.Path
 $projectPath = Join-Path $scriptPath "NfcActions\NfcActions.csproj"
-$publishPath = Join-Path $scriptPath "NfcActions\bin\Release\net7.0-windows\win-x64\publish"
+$publishPath = Join-Path $scriptPath "NfcActions\bin\Release\net8.0-windows\win-x64\publish"
 $installerPath = Join-Path $scriptPath "Installer"
 
 Write-Host "=== NFC Actions Release Build ===" -ForegroundColor Cyan
@@ -83,6 +83,12 @@ if ($BuildInstaller) {
             exit 1
         }
 
+        # Update the harvested file to set ID to NfcActions.exe
+        Write-Host "  Setting file ID for NfcActions.exe..." -ForegroundColor Gray
+        $harvestedContent = Get-Content obj\HarvestedFiles.wxs -Raw
+        $harvestedContent = $harvestedContent -replace '(<File Id=")([^"]+)(" KeyPath="yes" Source="\$\(var\.PublishDir\)\\NfcActions\.exe")', '$1NfcActionsExe$3'
+        Set-Content obj\HarvestedFiles.wxs -Value $harvestedContent
+
         # Run candle (compile) on both wxs files
         Write-Host "  Compiling installer..." -ForegroundColor Gray
         & candle.exe Product.wxs obj\HarvestedFiles.wxs "-dPublishDir=$publishPath" -out obj\ -arch x64
@@ -94,7 +100,7 @@ if ($BuildInstaller) {
 
         # Run light (link)
         Write-Host "  Linking MSI package..." -ForegroundColor Gray
-        & light.exe obj\Product.wixobj obj\HarvestedFiles.wixobj -out bin\NfcActions-Setup.msi -ext WixUIExtension -sval
+        & light.exe obj\Product.wixobj obj\HarvestedFiles.wixobj -out bin\NfcActions-Setup.msi -ext WixUIExtension -ext WixUtilExtension -sval
         if ($LASTEXITCODE -ne 0) {
             Pop-Location
             Write-Host "Light (WiX link) failed!" -ForegroundColor Red