Require the custom BA elements to reference built-in BAs.

22 files changed, 348 insertions, 276 deletions

diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
index e6f1d566..1b72c725 100644
--- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost" />
+        <BootstrapperApplication>
+            <bal:WixManagedBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
         </Chain>
diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
index 3ac3df60..5072b813 100644
--- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Variable Name="Test1" bal:Overridable="yes" />
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
index 82b0434d..3ba305b5 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
         </Chain>
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
index 438fc23e..f08cfe6a 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Chain>
             <MsiPackage SourceFile="test.msi" bal:DisplayInternalUICondition="1" />
         </Chain>
diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
index 5cec494d..2bea6d38 100644
--- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FDDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json' Name='Example.EarliestCoreMBA.deps.json' />
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll' Name='Example.EarliestCoreMBA.dll' bal:BAFactoryAssembly='yes' />
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.pdb' Name='Example.EarliestCoreMBA.pdb' />
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json' Name='Example.EarliestCoreMBA.runtimeconfig.json' />
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\mbanative.dll' Name='mbanative.dll' />
-            <Payload SourceFile='publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll' Name='WixToolset.Mba.Core.dll' />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.pdb" Name="Example.EarliestCoreMBA.pdb" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
         </Chain>
diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
index d951ffc6..4e4eb105 100644
--- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="SCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <bal:WixDotNetCoreBootstrapperApplication SelfContainedDeployment="yes" />
+        <BootstrapperApplication>
+            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
             <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
-        </BootstrapperApplicationRef>
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
         </Chain>
diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index 816524ed..0bcd7755 100644
--- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="TrimmedSCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <bal:WixDotNetCoreBootstrapperApplication SelfContainedDeployment="yes" />
+        <BootstrapperApplication>
+            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
             <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
-        </BootstrapperApplicationRef>
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
         </Chain>
diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs
index c95631db..d0acd0e4 100644
--- a/src/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
+        <BootstrapperApplication>
             <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\Example.FullFramework2MBA.dll" />
             <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\mbanative.dll" />
             <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Core.dll" />
             <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Host.config" />
-        </BootstrapperApplicationRef>
+            <bal:WixManagedBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
         </Chain>
diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs
index be0be131..8cb5b431 100644
--- a/src/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
-        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
+        <BootstrapperApplication>
             <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\Example.FullFramework4MBA.dll" />
             <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\mbanative.dll" />
             <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Core.dll" />
             <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Host.config" />
-        </BootstrapperApplicationRef>
+            <bal:WixManagedBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
         </Chain>
diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
index 22fb3d8b..72c576b4 100644
--- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FDDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json' Name='Example.LatestCoreMBA.deps.json' />
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll' Name='Example.LatestCoreMBA.dll' bal:BAFactoryAssembly='yes' />
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.pdb' Name='Example.LatestCoreMBA.pdb' />
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json' Name='Example.LatestCoreMBA.runtimeconfig.json' />
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\mbanative.dll' Name='mbanative.dll' />
-            <Payload SourceFile='publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll' Name='WixToolset.Mba.Core.dll' />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.pdb" Name="Example.LatestCoreMBA.pdb" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
         </Chain>
diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
index 4b0fe38a..5aa10f01 100644
--- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <bal:WixDotNetCoreBootstrapperApplication SelfContainedDeployment="yes" />
+        <BootstrapperApplication>
+            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
             <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
-        </BootstrapperApplicationRef>
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
         </Chain>
diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index eee87933..a9cf1ac7 100644
--- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="TrimmedSCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <bal:WixDotNetCoreBootstrapperApplication SelfContainedDeployment="yes" />
+        <BootstrapperApplication>
+            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
             <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
-        </BootstrapperApplicationRef>
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
         </Chain>
diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
index ecc5e8c1..266a8ecc 100644
--- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FDDWPFCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json' Name='Example.WPFCoreMBA.deps.json' />
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll' Name='Example.WPFCoreMBA.dll' bal:BAFactoryAssembly='yes' />
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb' Name='Example.WPFCoreMBA.pdb' />
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json' Name='Example.WPFCoreMBA.runtimeconfig.json' />
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\mbanative.dll' Name='mbanative.dll' />
-            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll' Name='WixToolset.Mba.Core.dll' />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json" Name="Example.WPFCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb" Name="Example.WPFCoreMBA.pdb" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
         </Chain>
diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs
index 3f2cda05..7e481ee9 100644
--- a/src/wixext/BalBurnBackendExtension.cs
+++ b/src/wixext/BalBurnBackendExtension.cs
@@ -42,8 +42,8 @@ namespace WixToolset.Bal
             }
 
             var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication");
-            var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost");
-            var isDNC = baId.StartsWith("DotNetCoreBootstrapperApplicationHost");
+            var isMBA = baId.StartsWith("WixManagedBootstrapperApplicationHost");
+            var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost");
             var isSCD = isDNC && this.VerifySCD(section);
 
             if (isStdBA || isMBA || isDNC)
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index 484dd9e4..1629a670 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Bal
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// The compiler for the WiX Toolset Bal Extension.
@@ -17,6 +18,31 @@ namespace WixToolset.Bal
     {
         private readonly Dictionary<string, WixMbaPrereqInformationSymbol> prereqInfoSymbolsByPackageId;
 
+        private enum WixDotNetCoreBootstrapperApplicationHostTheme
+        {
+            Unknown,
+            None,
+            Standard,
+        }
+
+        private enum WixManagedBootstrapperApplicationHostTheme
+        {
+            Unknown,
+            None,
+            Standard,
+        }
+
+        private enum WixStandardBootstrapperApplicationTheme
+        {
+            Unknown,
+            HyperlinkLargeLicense,
+            HyperlinkLicense,
+            HyperlinkSidebarLicense,
+            None,
+            RtfLargeLicense,
+            RtfLicense,
+        }
+
         /// <summary>
         /// Instantiate a new BalCompiler.
         /// </summary>
@@ -54,7 +80,7 @@ namespace WixToolset.Bal
                             break;
                     }
                     break;
-                case "BootstrapperApplicationRef":
+                case "BootstrapperApplication":
                     switch (element.Name.LocalName)
                     {
                         case "WixStandardBootstrapperApplication":
@@ -63,8 +89,8 @@ namespace WixToolset.Bal
                         case "WixManagedBootstrapperApplicationHost":
                             this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element);
                             break;
-                        case "WixDotNetCoreBootstrapperApplication":
-                            this.ParseWixDotNetCoreBootstrapperApplicationElement(intermediate, section, element);
+                        case "WixDotNetCoreBootstrapperApplicationHost":
+                            this.ParseWixDotNetCoreBootstrapperApplicationHostElement(intermediate, section, element);
                             break;
                         default:
                             this.ParseHelper.UnexpectedElement(parentElement, element);
@@ -407,6 +433,7 @@ namespace WixToolset.Bal
             string licenseUrl = null;
             string logoFile = null;
             string logoSideFile = null;
+            WixStandardBootstrapperApplicationTheme? theme = null;
             string themeFile = null;
             string localizationFile = null;
             var suppressOptionsUI = YesNoType.NotSet;
@@ -469,6 +496,34 @@ namespace WixToolset.Bal
                         case "SupportCacheOnly":
                             supportCacheOnly = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
+                        case "Theme":
+                            var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (themeValue)
+                            {
+                                case "hyperlinkLargeLicense":
+                                    theme = WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense;
+                                    break;
+                                case "hyperlinkLicense":
+                                    theme = WixStandardBootstrapperApplicationTheme.HyperlinkLicense;
+                                    break;
+                                case "hyperlinkSidebarLicense":
+                                    theme = WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense;
+                                    break;
+                                case "none":
+                                    theme = WixStandardBootstrapperApplicationTheme.None;
+                                    break;
+                                case "rtfLargeLicense":
+                                    theme = WixStandardBootstrapperApplicationTheme.RtfLargeLicense;
+                                    break;
+                                case "rtfLicense":
+                                    theme = WixStandardBootstrapperApplicationTheme.RtfLicense;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "hyperlinkLargeLicense", "hyperlinkLicense", "hyperlinkSidebarLicense", "none", "rtfLargeLicense", "rtfLicense"));
+                                    theme = WixStandardBootstrapperApplicationTheme.Unknown; // set a value to prevent expected attribute error below.
+                                    break;
+                            }
+                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(node, attrib);
                             break;
@@ -482,13 +537,20 @@ namespace WixToolset.Bal
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
 
-            if (String.IsNullOrEmpty(licenseFile) && null == licenseUrl)
+            if (!theme.HasValue)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Theme"));
+            }
+
+            if (theme != WixStandardBootstrapperApplicationTheme.None && String.IsNullOrEmpty(licenseFile) && null == licenseUrl)
             {
                 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true));
             }
 
             if (!this.Messaging.EncounteredError)
             {
+                this.CreateBARef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication");
+
                 if (!String.IsNullOrEmpty(launchTarget))
                 {
                     section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget"))
@@ -611,6 +673,31 @@ namespace WixToolset.Bal
                         symbol.SupportCacheOnly = 1;
                     }
                 }
+
+                string themePayloadGroup = null;
+                switch (theme)
+                {
+                    case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense:
+                        themePayloadGroup = "WixStdbaHyperlinkLargeLicensePayloads";
+                        break;
+                    case WixStandardBootstrapperApplicationTheme.HyperlinkLicense:
+                        themePayloadGroup = "WixStdbaHyperlinkLicensePayloads";
+                        break;
+                    case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense:
+                        themePayloadGroup = "WixStdbaHyperlinkSidebarLicensePayloads";
+                        break;
+                    case WixStandardBootstrapperApplicationTheme.RtfLargeLicense:
+                        themePayloadGroup = "WixStdbaRtfLargeLicensePayloads";
+                        break;
+                    case WixStandardBootstrapperApplicationTheme.RtfLicense:
+                        themePayloadGroup = "WixStdbaRtfLicensePayloads";
+                        break;
+                }
+
+                if (themePayloadGroup != null)
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
+                }
             }
         }
 
@@ -624,6 +711,7 @@ namespace WixToolset.Bal
             string logoFile = null;
             string themeFile = null;
             string localizationFile = null;
+            WixManagedBootstrapperApplicationHostTheme? theme = null;
 
             foreach (var attrib in node.Attributes())
             {
@@ -640,6 +728,22 @@ namespace WixToolset.Bal
                         case "LocalizationFile":
                             localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
+                        case "Theme":
+                            var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (themeValue)
+                            {
+                                case "none":
+                                    theme = WixManagedBootstrapperApplicationHostTheme.None;
+                                    break;
+                                case "standard":
+                                    theme = WixManagedBootstrapperApplicationHostTheme.Standard;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard"));
+                                    theme = WixManagedBootstrapperApplicationHostTheme.Unknown;
+                                    break;
+                            }
+                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(node, attrib);
                             break;
@@ -655,6 +759,8 @@ namespace WixToolset.Bal
 
             if (!this.Messaging.EncounteredError)
             {
+                this.CreateBARef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost");
+
                 if (!String.IsNullOrEmpty(logoFile))
                 {
                     section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo"))
@@ -678,6 +784,19 @@ namespace WixToolset.Bal
                         Value = localizationFile,
                     });
                 }
+
+                string themePayloadGroup = null;
+                switch (theme)
+                {
+                    case WixManagedBootstrapperApplicationHostTheme.Standard:
+                        themePayloadGroup = "MbaPreqStandardPayloads";
+                        break;
+                }
+
+                if (themePayloadGroup != null)
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
+                }
             }
         }
 
@@ -685,13 +804,14 @@ namespace WixToolset.Bal
         /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles.
         /// </summary>
         /// <param name="node">The element to parse.</param>
-        private void ParseWixDotNetCoreBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
             string logoFile = null;
             string themeFile = null;
             string localizationFile = null;
             var selfContainedDeployment = YesNoType.NotSet;
+            WixDotNetCoreBootstrapperApplicationHostTheme? theme = null;
 
             foreach (var attrib in node.Attributes())
             {
@@ -711,6 +831,22 @@ namespace WixToolset.Bal
                         case "SelfContainedDeployment":
                             selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
+                        case "Theme":
+                            var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (themeValue)
+                            {
+                                case "none":
+                                    theme = WixDotNetCoreBootstrapperApplicationHostTheme.None;
+                                    break;
+                                case "standard":
+                                    theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard"));
+                                    theme = WixDotNetCoreBootstrapperApplicationHostTheme.Unknown;
+                                    break;
+                            }
+                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(node, attrib);
                             break;
@@ -722,10 +858,17 @@ namespace WixToolset.Bal
                 }
             }
 
+            if (!theme.HasValue)
+            {
+                theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard;
+            }
+
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
 
             if (!this.Messaging.EncounteredError)
             {
+                this.CreateBARef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost");
+
                 if (!String.IsNullOrEmpty(logoFile))
                 {
                     section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))
@@ -757,6 +900,33 @@ namespace WixToolset.Bal
                         SelfContainedDeployment = 1,
                     });
                 }
+
+                string themePayloadGroup = null;
+                switch (theme)
+                {
+                    case WixDotNetCoreBootstrapperApplicationHostTheme.Standard:
+                        themePayloadGroup = "DncPreqStandardPayloads";
+                        break;
+                }
+
+                if (themePayloadGroup != null)
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
+                }
+            }
+        }
+
+        private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name)
+        {
+            var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86);
+            if (id == null)
+            {
+                this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName));
+            }
+
+            if (!this.Messaging.EncounteredError)
+            {
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id);
             }
         }
     }
diff --git a/src/wixlib/BalExtension_platform.wxi b/src/wixlib/BalExtension_platform.wxi
new file mode 100644
index 00000000..fa7d1182
--- /dev/null
+++ b/src/wixlib/BalExtension_platform.wxi
@@ -0,0 +1,25 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?include caDecor.wxi ?>
+    <Fragment>
+        <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
+            <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" />
+            <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" />
+        </BootstrapperApplication>
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
+            <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />
+            <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
+        </BootstrapperApplication>
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)">
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
+        </BootstrapperApplication>
+    </Fragment>
+</Include>
diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/BalExtension_x86.wxs
index e3ad07e8..3cdd4015 100644
--- a/src/wixlib/wixstdba_x86.wxs
+++ b/src/wixlib/BalExtension_x86.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
-    <?include wixstdba_platform.wxi ?>
+    <?include BalExtension_platform.wxi ?>
 </Wix>
diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs
index 9b5dc0ee..d777c473 100644
--- a/src/wixlib/Dnc.wxs
+++ b/src/wixlib/Dnc.wxs
@@ -6,54 +6,15 @@
      Dnc.wxs - .NET Core BA resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost">
-            <PayloadGroupRef Id="Dnc" />
-            <PayloadGroupRef Id="DncPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense">
-            <PayloadGroupRef Id="Dnc" />
-            <PayloadGroupRef Id="DncPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <PayloadGroup Id="Dnc">
-            <Payload Compressed="yes" SourceFile="WixToolset.Dnc.Host.dll" />
-            <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="dncpreq.dll" />
+        <PayloadGroup Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads">
+            <Payload SourceFile="WixToolset.Dnc.Host.dll" />
         </PayloadGroup>
     </Fragment>
-
     <Fragment>
-        <PayloadGroup Id="DncPreqStandard">
-            <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
-            <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
-            <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
+        <PayloadGroup Id="DncPreqStandardPayloads">
+            <Payload Name="mbapreq.thm" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
+            <Payload Name="mbapreq.png" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="mbapreq.wxl" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
         </PayloadGroup>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs
index 4667904a..2d407c88 100644
--- a/src/wixlib/Mba.wxs
+++ b/src/wixlib/Mba.wxs
@@ -3,79 +3,41 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <!--
-     Mba.wxs - Managed UX resources.
+     Mba.wxs - Managed BA resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost">
-            <PayloadGroupRef Id="Mba" />
-            <PayloadGroupRef Id="MbaPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense">
-            <PayloadGroupRef Id="Mba" />
-            <PayloadGroupRef Id="MbaPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal">
-            <PayloadGroupRef Id="Mba" />
-            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal">
-            <PayloadGroupRef Id="Mba" />
-            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation">
-            <PayloadGroupRef Id="Mba" />
-            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <PayloadGroup Id="Mba">
-            <Payload Compressed="yes" SourceFile="WixToolset.Mba.Host.dll" />
-            <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="mbapreq.dll" />
+        <PayloadGroup Id="WixManagedBootstrapperApplicationHostManagedPayloads">
+            <Payload SourceFile="WixToolset.Mba.Host.dll" />
         </PayloadGroup>
     </Fragment>
-
     <Fragment>
-        <PayloadGroup Id="MbaPreqStandard">
-            <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)" />
-            <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.PreqbaLogo=SourceDir\mbapreq.png)" />
-            <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)" />
-            <Payload Name="1028\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)" />
-            <Payload Name="1029\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)" />
-            <Payload Name="1030\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)" />
-            <Payload Name="1031\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)" />
-            <Payload Name="1032\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)" />
-            <Payload Name="1035\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)" />
-            <Payload Name="1036\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)" />
-            <Payload Name="1038\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)" />
-            <Payload Name="1040\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)" />
-            <Payload Name="1041\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)" />
-            <Payload Name="1042\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)" />
-            <Payload Name="1043\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)" />
-            <Payload Name="1044\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)" />
-            <Payload Name="1045\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)" />
-            <Payload Name="1046\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)" />
-            <Payload Name="1049\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)" />
-            <Payload Name="1051\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)" />
-            <Payload Name="1053\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)" />
-            <Payload Name="1055\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)" />
-            <Payload Name="1060\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)" />
-            <Payload Name="2052\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)" />
-            <Payload Name="2070\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)" />
-            <Payload Name="3082\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" />
+        <PayloadGroup Id="MbaPreqStandardPayloads">
+            <Payload Name="mbapreq.thm" SourceFile="!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)" />
+            <Payload Name="mbapreq.png" SourceFile="!(wix.PreqbaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)" />
+            <Payload Name="1028\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)" />
+            <Payload Name="1029\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)" />
+            <Payload Name="1030\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)" />
+            <Payload Name="1031\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)" />
+            <Payload Name="1032\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)" />
+            <Payload Name="1035\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)" />
+            <Payload Name="1036\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)" />
+            <Payload Name="1038\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)" />
+            <Payload Name="1040\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)" />
+            <Payload Name="1041\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)" />
+            <Payload Name="1042\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)" />
+            <Payload Name="1043\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)" />
+            <Payload Name="1044\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)" />
+            <Payload Name="1045\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)" />
+            <Payload Name="1046\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)" />
+            <Payload Name="1049\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)" />
+            <Payload Name="1051\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)" />
+            <Payload Name="1053\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)" />
+            <Payload Name="1055\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)" />
+            <Payload Name="1060\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)" />
+            <Payload Name="2052\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)" />
+            <Payload Name="2070\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)" />
+            <Payload Name="3082\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" />
         </PayloadGroup>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
new file mode 100644
index 00000000..b1711518
--- /dev/null
+++ b/src/wixlib/caDecor.wxi
@@ -0,0 +1,39 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?ifdef Prefix ?>
+        <?undef Prefix ?>
+    <?endif?>
+
+    <?define Prefix="Wix4" ?>
+
+    <?ifndef platform ?>
+        <?define platform="x86" ?>
+    <?endif?>
+
+    <?if $(var.platform)="" ?>
+        <?undef platform ?>
+        <?define platform="x86" ?>
+    <?endif?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+    <?endif?>
+
+    <?if $(var.platform)~="x86" ?>
+        <?define Suffix="_X86" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="x64" ?>
+        <?define Suffix="_X64" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="arm" ?>
+        <?define Suffix="_A32" ?>
+    <?endif?>
+
+    <?if $(var.platform)~="arm64" ?>
+        <?define Suffix="_A64" ?>
+    <?endif?>
+</Include>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
deleted file mode 100644
index 18436269..00000000
--- a/src/wixlib/caSuffix.wxi
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifndef platform ?>
-        <?error Required value "platform" not defined in include caSuffix.wxi ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-        <?undef DeferredSuffix ?>
-    <?endif?>
-
-    <?if $(var.platform)="x86" ?>
-        <?define Suffix="" ?>
-        <?define DeferredSuffix="" ?>
-    <?endif?>
-
-    <?if $(var.platform)="x64" ?>
-        <?define Suffix="_x64" ?>
-        <?define DeferredSuffix="_64" ?>
-    <?endif?>
-
-    <?if $(var.platform)="arm" ?>
-        <?define Suffix="_ARM" ?>
-        <?define DeferredSuffix="_ARM" ?>
-    <?endif?>
-</Include>
diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi
deleted file mode 100644
index fae52b80..00000000
--- a/src/wixlib/wixstdba_platform.wxi
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caSuffix.wxi ?>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)">
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-</Include>