diff --git a/ProjectTemplates/ShinyApp/.template.config/template.json b/ProjectTemplates/ShinyApp/.template.config/template.json
index 9919d38..ed58bfa 100644
--- a/ProjectTemplates/ShinyApp/.template.config/template.json
+++ b/ProjectTemplates/ShinyApp/.template.config/template.json
@@ -752,7 +752,11 @@
         {
             "condition": "(androidauto == false)",
             "exclude": "Platforms/Android/Resources/xml/automotive_app_desc.xml"
-        },        
+        },
+        {
+            "condition": "(androidauto == false)",
+            "exclude": "RunAndroidAuto.cmd"
+        },
         {
             "condition": "(carplay == false)",
             "exclude": "Platforms/iOS/CarPlayImplementation/**"
@@ -760,11 +764,11 @@
         {
             "condition": "(authservice == false || usemsal == false)",
             "exclude": "Services/Impl/MsalAuthenticationService.cs"
-        },    
+        },
         {
             "condition": "(authservice == false || usewebauthenticator == false)",
             "exclude": "Services/Impl/WebAuthenticatorAuthenticationService.cs"
-        },             
+        },
         {
             "condition": "(authservice == false || refit == false)",
             "exclude": "Services/Impl/IApiClient.cs"
@@ -772,7 +776,7 @@
         {
             "condition": "(usecsharpmarkup == false)",
             "exclude": "CSharpMarkupPage.cs"
-        },        
+        },
         {
             "condition": "(storereview == false)",
             "exclude": "Platforms/Android/proguard.cfg"
diff --git a/ProjectTemplates/ShinyApp/RunAndroidAuto.cmd b/ProjectTemplates/ShinyApp/RunAndroidAuto.cmd
new file mode 100644
index 0000000..600bb3c
--- /dev/null
+++ b/ProjectTemplates/ShinyApp/RunAndroidAuto.cmd
@@ -0,0 +1,5 @@
+: https://cvstrydom.co.za
+: This script forwards your ADB port and launches the Android Auto Desktop Head Unit if it's installed in the default location
+: Be sure to start the head unit server on your Android phone first
+adb forward tcp:5277 tcp:5277
+start "" "%USERPROFILE%\AppData\Local\Android\Sdk\extras\google\auto\desktop-head-unit.exe"
\ No newline at end of file
diff --git a/ProjectTemplates/ShinyApp/ShinyApp.csproj b/ProjectTemplates/ShinyApp/ShinyApp.csproj
index 69ece94..d6215b1 100644
--- a/ProjectTemplates/ShinyApp/ShinyApp.csproj
+++ b/ProjectTemplates/ShinyApp/ShinyApp.csproj
@@ -58,10 +58,6 @@
 		<UseHardenedRuntime Condition="'$(Configuration)' == 'Release'">true</UseHardenedRuntime>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(Configuration)' == 'Release'">
-		<TrimmerRootDescriptor Include="Linker.xml" />
-    </ItemGroup>	
-
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
 		<CustomEntitlements Include="com.apple.security.app-sandbox" Type="boolean" Value="true" />
 		<CustomEntitlements Include="com.apple.security.get-task-allow" Type="boolean" Value="true" />
@@ -109,6 +105,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<TrimmerRootDescriptor Include="Linker.xml" Condition="'$(Configuration)' == 'Release'" />
+
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 
@@ -155,10 +153,10 @@
 		<PackageReference Include="Shiny.Hosting.Maui" Version="$(ShinyVersion)" />
 		<!--#endif-->
 		<!--#if (shinymediator)-->
-		<PackageReference Include="Shiny.Mediator" Version="1.0.0-alpha-0053" />
-		<PackageReference Include="Shiny.Mediator.Maui" Version="1.0.0-alpha-0053" />
+		<PackageReference Include="Shiny.Mediator" Version="1.0.0" />
+		<PackageReference Include="Shiny.Mediator.Maui" Version="1.0.0" />
 		<!--#if (useblazor)-->
-		<PackageReference Include="Shiny.Mediator.Blazor" Version="1.0.0-alpha-0053" />
+		<PackageReference Include="Shiny.Mediator.Blazor" Version="1.0.0" />
 		<!--#endif-->
 		<!--#endif-->
 		<!--#if (localization)-->