diff --git a/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs b/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
index 3c97a982ec..cf18a3c496 100644
--- a/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
+++ b/src/ServiceControl.Config.Tests/ServiceControlAddScreenLoadedTests.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.ComponentModel;
+    using System.Linq;
     using NUnit.Framework;
     using ServiceControlInstaller.Engine.Configuration.ServiceControl;
     using UI.InstanceAdd;
@@ -277,5 +278,86 @@ public void Full_text_search_on_bodies_is_enabled()
                 Assert.That(viewModel.AuditEnableFullTextSearchOnBodies.Value, Is.EqualTo(true));
             }
         }
+
+        [Test]
+        public void Instance_sections_are_expanded_by_default()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(viewModel.IsServiceControlExpanded, Is.True);
+                Assert.That(viewModel.IsServiceControlAuditExpanded, Is.True);
+            }
+        }
+
+        [Test]
+        public void Integrated_ServicePulse_is_enabled_by_default()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(viewModel.ErrorEnableIntegratedServicePulseOptions, Is.Not.Empty);
+                Assert.That(viewModel.ErrorEnableIntegratedServicePulse.Value, Is.True);
+            }
+        }
+
+        [Test]
+        public void Integrated_ServicePulse_can_be_disabled()
+        {
+            var viewModel = new ServiceControlAddViewModel();
+
+            var offOption = viewModel.ErrorEnableIntegratedServicePulseOptions.First(o => !o.Value);
+            viewModel.ServiceControl.EnableIntegratedServicePulse = offOption;
+
+            Assert.That(viewModel.ErrorEnableIntegratedServicePulse.Value, Is.False);
+        }
+
+        [Test]
+        public void Audit_only_configuration_has_no_validation_errors_for_error_fields()
+        {
+            var viewModel = new ServiceControlAddViewModel(() => [])
+            {
+                InstallErrorInstance = false,
+                InstallAuditInstance = true,
+                SubmitAttempted = true
+            };
+
+            var notifyErrorInfo = (INotifyDataErrorInfo)viewModel;
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorInstanceName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorHostName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorPortNumber)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorDestinationPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorLogPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.ErrorDatabasePath)), Is.Empty);
+            }
+        }
+
+        [Test]
+        public void Error_only_configuration_has_no_validation_errors_for_audit_fields()
+        {
+            var viewModel = new ServiceControlAddViewModel(() => [])
+            {
+                InstallErrorInstance = true,
+                InstallAuditInstance = false,
+                SubmitAttempted = true
+            };
+
+            var notifyErrorInfo = (INotifyDataErrorInfo)viewModel;
+
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditInstanceName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditHostName)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditPortNumber)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditDestinationPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditLogPath)), Is.Empty);
+                Assert.That(notifyErrorInfo.GetErrors(nameof(viewModel.AuditDatabasePath)), Is.Empty);
+            }
+        }
     }
 }
diff --git a/src/ServiceControl.Config.Tests/SetupModeTests.cs b/src/ServiceControl.Config.Tests/SetupModeTests.cs
new file mode 100644
index 0000000000..9d64da6d6b
--- /dev/null
+++ b/src/ServiceControl.Config.Tests/SetupModeTests.cs
@@ -0,0 +1,51 @@
+namespace ServiceControl.Config.Tests
+{
+    using NUnit.Framework;
+    using UI.Shell;
+
+    [TestFixture]
+    class SetupModeTests
+    {
+        [TestCase(SetupMode.ErrorHandling, true, false, false)]
+        [TestCase(SetupMode.ErrorAndAudit, true, true, false)]
+        [TestCase(SetupMode.AuditOnly, false, true, false)]
+        [TestCase(SetupMode.MonitoringOnly, false, false, true)]
+        public void Scenario_selects_the_instances_to_install(SetupMode mode, bool serviceControl, bool audit, bool monitoring)
+        {
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(mode.InstallsServiceControl(), Is.EqualTo(serviceControl));
+                Assert.That(mode.InstallsAudit(), Is.EqualTo(audit));
+                Assert.That(mode.InstallsMonitoring(), Is.EqualTo(monitoring));
+            }
+        }
+
+        [TestCase(SetupMode.ErrorHandling)]
+        [TestCase(SetupMode.ErrorAndAudit)]
+        [TestCase(SetupMode.AuditOnly)]
+        [TestCase(SetupMode.MonitoringOnly)]
+        public void Every_scenario_installs_at_least_one_instance(SetupMode mode)
+        {
+            // The Next button is always enabled, so no scenario may resolve to nothing.
+            Assert.That(mode.InstallsServiceControl() || mode.InstallsAudit() || mode.InstallsMonitoring(), Is.True);
+        }
+
+        [TestCase(SetupMode.ErrorHandling)]
+        [TestCase(SetupMode.ErrorAndAudit)]
+        public void Integrated_ServicePulse_follows_the_choice_when_an_error_instance_is_installed(SetupMode mode)
+        {
+            using (Assert.EnterMultipleScope())
+            {
+                Assert.That(mode.InstallsServicePulse(wanted: true), Is.True);
+                Assert.That(mode.InstallsServicePulse(wanted: false), Is.False);
+            }
+        }
+
+        [TestCase(SetupMode.AuditOnly)]
+        [TestCase(SetupMode.MonitoringOnly)]
+        public void Integrated_ServicePulse_is_never_installed_without_an_error_instance(SetupMode mode)
+        {
+            Assert.That(mode.InstallsServicePulse(wanted: true), Is.False);
+        }
+    }
+}
diff --git a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
index c8ce21013e..2b9bb7a74d 100644
--- a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
+++ b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs
@@ -1,6 +1,8 @@
-namespace ServiceControl.Config.Commands
+namespace ServiceControl.Config.Commands
 {
     using System;
+    using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
     using Framework;
     using Framework.Commands;
@@ -18,17 +20,32 @@ public AddServiceControlInstanceCommand(IServiceControlWindowManager windowManag
 
         public override async Task ExecuteAsync(object obj)
         {
-            if (!await commandChecks.CanAddInstance(true))
+            await ExecuteWithOptions(installError: true, installAudit: true, installServicePulse: true);
+        }
+
+        public async Task ExecuteWithOptions(bool installError, bool installAudit, bool installServicePulse, CancellationToken cancellationToken = default)
+        {
+            if (!await commandChecks.CanAddInstance(true, cancellationToken))
             {
                 return;
             }
 
             var instanceViewModel = addInstance();
-            await windowManager.ShowInnerDialog(instanceViewModel);
+            instanceViewModel.InstallErrorInstance = installError;
+            instanceViewModel.InstallAuditInstance = installAudit;
+
+            if (installError)
+            {
+                // The options list always carries both an On and an Off entry.
+                instanceViewModel.ServiceControl.EnableIntegratedServicePulse = instanceViewModel.ServiceControl
+                    .EnableIntegratedServicePulseOptions.First(o => o.Value == installServicePulse);
+            }
+
+            await windowManager.ShowInnerDialog(instanceViewModel, cancellationToken: cancellationToken);
         }
 
         readonly Func<ServiceControlAddViewModel> addInstance;
         readonly IServiceControlWindowManager windowManager;
         readonly ScmuCommandChecks commandChecks;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
index 00da1aaecd..f5e16d6643 100644
--- a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
+++ b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
@@ -46,7 +46,7 @@
                            Visibility="{Binding InMaintenanceMode, Converter={StaticResource boolToVisInverted}}"
                            Margin="0,0,0,20"
                 >
-                Enter database maintenance mode to access to RavenDB Management Studio.  While in this mode all message processing is disabled and the REST API is unavailable. This will prevent ServicePulse and ServiceInsight connecting to this instance.
+                Enter database maintenance mode to access to RavenDB Management Studio.  While in this mode all message processing is disabled and the REST API is unavailable. This will prevent ServicePulse connecting to this instance.
                 </TextBlock>
 
                 <TextBlock FontSize="12px"
@@ -54,7 +54,7 @@
                            Visibility="{Binding InMaintenanceMode, Converter={StaticResource boolToVis}}"
                            Margin="0,0,0,20"
                 >
-                This instance is in database maintenance mode. All message processing is disabled and the REST API is unavailable.<LineBreak />ServicePulse and ServiceInsight cannot connect to this instance while it is in maintenance mode.<LineBreak />Launch <Hyperlink Command="{Binding OpenUrl}" CommandParameter="{Binding RavenDbStudioUrl}">
+                This instance is in database maintenance mode. All message processing is disabled and the REST API is unavailable.<LineBreak />ServicePulse cannot connect to this instance while it is in maintenance mode.<LineBreak />Launch <Hyperlink Command="{Binding OpenUrl}" CommandParameter="{Binding RavenDbStudioUrl}">
                         RavenDB Management Studio
                         <Hyperlink.ContextMenu>
                             <ContextMenu>
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
index 2e0edd5bfe..8b34111dc8 100644
--- a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
+++ b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddView.xaml
@@ -73,34 +73,14 @@
                                                   Converter={StaticResource boolToVis}}" />
                 </StackPanel>
 
-                <TextBlock Padding="0, 0, 0, 10" Visibility="{Binding OneInstanceTypeSelected, Converter={StaticResource boolToVisInverted}}"
-                            FontSize="13px"
-                            Foreground="{StaticResource ErrorBrush}"
-                            Text="Must select either an audit or an error instance." />
-
-                <StackPanel>
-                    <!-- Horizontal layout: CheckBox + Expander side by side -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <CheckBox Grid.Column="0" 
-                                  Padding="0, 0, 0, 0" 
-                                  IsChecked="{Binding InstallErrorInstance}"
-                                  VerticalAlignment="Top"
-                                  Margin="0,8,8,5"/>
-
-                        <Expander Grid.Column="1" 
-                                  Header="ServiceControl" 
-                                  IsExpanded="{Binding IsServiceControlExpanded}" 
-                                  IsEnabled="{Binding InstallErrorInstance}"
-                                  Margin="0,5,0,5"
-                                  MouseDown="Button_MouseDown" 
-                                  PreviewMouseDown="Button_MouseDown" 
-                                  PreviewMouseLeftButtonDown="Button_MouseDown">
-                            <StackPanel Margin="60,0,60,0" Visibility="{Binding InstallErrorInstance, Converter={StaticResource boolToVis}}">
+                <StackPanel Visibility="{Binding InstallErrorInstance, Converter={StaticResource boolToVis}}">
+                    <Expander Header="ServiceControl"
+                              IsExpanded="{Binding IsServiceControlExpanded}"
+                              Margin="0,5,0,5"
+                              MouseDown="Button_MouseDown"
+                              PreviewMouseDown="Button_MouseDown"
+                              PreviewMouseLeftButtonDown="Button_MouseDown">
+                            <StackPanel Margin="60,0,60,0">
                                 <Border Margin="0,40,0,20"
                                 BorderBrush="{StaticResource Gray70Brush}"
                                 BorderThickness="0,0,0,1">
@@ -261,34 +241,17 @@
                                                ItemsSource="{Binding ErrorEnableIntegratedServicePulseOptions}"
                                                SelectedValue="{Binding ErrorEnableIntegratedServicePulse}" />
                             </StackPanel>
-                        </Expander>
-                    </Grid>
+                    </Expander>
                 </StackPanel>
 
-                <StackPanel>
-                    <!-- Horizontal layout: CheckBox + Expander side by side -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <CheckBox Grid.Column="0" 
-                                  Padding="0, 0, 0, 0" 
-                                  IsChecked="{Binding InstallAuditInstance}" 
-                                  IsThreeState="False"
-                                  VerticalAlignment="Top"
-                                  Margin="0,8,8,5"/>
-
-                        <Expander Grid.Column="1" 
-                                  Header="ServiceControl Audit" 
-                                  IsExpanded="{Binding IsServiceControlAuditExpanded}" 
-                                  IsEnabled="{Binding InstallAuditInstance}"
-                                  Margin="0,5,0,5"
-                                  MouseDown="Button_MouseDown" 
-                                  PreviewMouseDown="Button_MouseDown" 
-                                  PreviewMouseLeftButtonDown="Button_MouseDown">
-                            <StackPanel Margin="60,0,60,0" Visibility="{Binding InstallAuditInstance, Converter={StaticResource boolToVis}}">
+                <StackPanel Visibility="{Binding InstallAuditInstance, Converter={StaticResource boolToVis}}">
+                    <Expander Header="ServiceControl Audit"
+                              IsExpanded="{Binding IsServiceControlAuditExpanded}"
+                              Margin="0,5,0,5"
+                              MouseDown="Button_MouseDown"
+                              PreviewMouseDown="Button_MouseDown"
+                              PreviewMouseLeftButtonDown="Button_MouseDown">
+                            <StackPanel Margin="60,0,60,0">
                                 <Border Margin="0,40,0,20"
                                 BorderBrush="{StaticResource Gray70Brush}"
                                 BorderThickness="0,0,0,1">
@@ -458,8 +421,7 @@
                                                ItemsSource="{Binding AuditEnableFullTextSearchOnBodiesOptions}"
                                                SelectedValue="{Binding AuditEnableFullTextSearchOnBodies}" />
                             </StackPanel>
-                        </Expander>
-                    </Grid>
+                    </Expander>
                 </StackPanel>
             </StackPanel>
         </sie:SharedServiceControlEditorView.SharedContent>
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
index 0b9621251b..02ddc46a89 100644
--- a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
+++ b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlAddViewModel.cs
@@ -396,9 +396,9 @@ public string AuditDatabasePath
 
         public TimeSpanUnits AuditRetentionUnits => ServiceControlAudit.AuditRetentionUnits;
 
-        public bool IsServiceControlExpanded { get; set; }
+        public bool IsServiceControlExpanded { get; set; } = true;
 
-        public bool IsServiceControlAuditExpanded { get; set; }
+        public bool IsServiceControlAuditExpanded { get; set; } = true;
 
         public double AuditRetention
         {
diff --git a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlEditorViewModel.cs b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlEditorViewModel.cs
index 05a9f44501..603d4d0252 100644
--- a/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlEditorViewModel.cs
+++ b/src/ServiceControl.Config/UI/InstanceAdd/ServiceControlEditorViewModel.cs
@@ -36,8 +36,6 @@ public virtual void OnSelectedTransportChanged()
         // Needs to exist in base class for Fody to call it so it can be executed in superclass
     }
 
-    public bool OneInstanceTypeSelected => InstallErrorInstance || InstallAuditInstance;
-
     public string TransportWarning => SelectedTransport?.Help;
 
     public string ConnectionString { get; set; }
diff --git a/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml b/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
index a602496fcc..6721feccc1 100644
--- a/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
+++ b/src/ServiceControl.Config/UI/NoInstances/NoInstancesView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ServiceControl.Config.UI.NoInstances.NoInstancesView"
+<UserControl x:Class="ServiceControl.Config.UI.NoInstances.NoInstancesView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,26 +7,11 @@
              d:DesignWidth="600"
              mc:Ignorable="d">
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
         <TextBlock Margin="10"
                    HorizontalAlignment="Center"
-                   VerticalAlignment="Bottom"
+                   VerticalAlignment="Center"
                    FontSize="20"
                    Foreground="{StaticResource Gray60Brush}"
                    Text="No service instances installed" />
-
-        <Button Grid.Row="1"
-                Margin="10"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Top"
-                Command="{Binding AddInstance}"
-                Content="Add new instance"
-                Style="{StaticResource HiliteButton}"
-                Visibility="{Binding ShowMonitoringInstances,
-                             Converter={StaticResource boolToVisInverted}}" />
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs b/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
index 1ade6d7782..6ebf3873b8 100644
--- a/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
+++ b/src/ServiceControl.Config/UI/NoInstances/NoInstancesViewModel.cs
@@ -1,21 +1,12 @@
-namespace ServiceControl.Config.UI.NoInstances
+namespace ServiceControl.Config.UI.NoInstances
 {
-    using System.Windows.Input;
-    using Commands;
     using Framework.Rx;
 
     class NoInstancesViewModel : RxScreen
     {
-        public NoInstancesViewModel(AddServiceControlInstanceCommand addInstance)
+        public NoInstancesViewModel()
         {
             DisplayName = "DEPLOYED INSTANCES";
-
-            AddInstance = addInstance;
         }
-
-        public ICommand AddInstance { get; }
-
-        [FeatureToggle(Feature.MonitoringInstances)]
-        public bool ShowMonitoringInstances { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
index e33628785b..904067072f 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml
@@ -1,161 +1,221 @@
-<UserControl x:Class="ServiceControl.Config.UI.Shell.NewInstanceOverlay"
+<UserControl x:Class="ServiceControl.Config.UI.Shell.NewInstanceOverlay"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="600">
-    <Grid Margin="0" Background="Black">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="2*" />
-        </Grid.ColumnDefinitions>
-
-        <Grid Grid.Column="0" Margin="20">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="14" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Border Margin="-5,5,0,5" Height="40" Grid.Row="0" Grid.ColumnSpan="2">
-                <Grid>
+             d:DesignHeight="500" d:DesignWidth="600">
+    <UserControl.Resources>
+        <Style x:Key="ModeButton" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Border x:Name="border"
+                                Background="{StaticResource Gray10Brush}"
+                                BorderBrush="{StaticResource Gray20Brush}"
+                                BorderThickness="1"
+                                Padding="10,8"
+                                Cursor="Hand"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              RecognizesAccessKey="True" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource Gray20Brush}" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="{StaticResource DarkThemeBrush}" />
+                                <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource ThemeBrush}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="ModeLabel" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="TextAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="ModeSubLabel" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="10" />
+            <Setter Property="Foreground" Value="{StaticResource Gray60Brush}" />
+            <Setter Property="TextAlignment" Value="Center" />
+            <Setter Property="Margin" Value="0,2,0,0" />
+        </Style>
+        <!-- Legible against both the unselected (Gray10) and selected (DarkTheme) tab backgrounds -->
+        <Style x:Key="ModeSubLabelHighlight" TargetType="TextBlock" BasedOn="{StaticResource ModeSubLabel}">
+            <Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
+            <Setter Property="Opacity" Value="0.85" />
+        </Style>
+        <!-- Installed components are outcomes, not controls, so they are ticks rather than
+             check boxes: the only box on the screen is the only thing worth clicking. -->
+        <Style x:Key="CheckGlyph" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{StaticResource LightThemeBrush}" />
+            <Setter Property="FontSize" Value="13" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Width" Value="16" />
+            <Setter Property="TextAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Margin" Value="0,1,0,0" />
+        </Style>
+        <Style x:Key="ComponentCheckBox" TargetType="CheckBox">
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Cursor" Value="Hand" />
+        </Style>
+        <Style x:Key="ComponentLabel" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="13" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ComponentDescription" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="Foreground" Value="{StaticResource Gray60Brush}" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="Margin" Value="0,2,0,0" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Background="Black" MinWidth="500">
+        <StackPanel Margin="20">
+
+            <!-- Header -->
+            <TextBlock FontSize="15"
+                       FontWeight="SemiBold"
+                       Foreground="White"
+                       Margin="0,0,0,15"
+                       Text="Choose a setup scenario" />
+
+            <!-- Scenario selection. These are mutually exclusive, so they are the only
+                 thing driving what gets installed. -->
+            <UniformGrid Columns="4" Margin="0,0,0,20">
+                <RadioButton x:Name="ModeErrorHandling"
+                             GroupName="SetupMode"
+                             Style="{StaticResource ModeButton}"
+                             Checked="Mode_Checked">
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource ModeLabel}" Text="Error handling" />
+                        <TextBlock Style="{StaticResource ModeSubLabel}" Text="Failed messages" />
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="ModeErrorAndAudit"
+                             GroupName="SetupMode"
+                             IsChecked="True"
+                             Style="{StaticResource ModeButton}"
+                             Checked="Mode_Checked">
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource ModeLabel}" Text="Error + Audit" />
+                        <TextBlock Style="{StaticResource ModeSubLabelHighlight}" Text="Failed and audit messages" />
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="ModeAuditOnly"
+                             GroupName="SetupMode"
+                             Style="{StaticResource ModeButton}"
+                             Checked="Mode_Checked">
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource ModeLabel}" Text="Audit only" />
+                        <TextBlock Style="{StaticResource ModeSubLabel}" Text="Add to existing Error instance" />
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton x:Name="ModeMonitoringOnly"
+                             GroupName="SetupMode"
+                             Style="{StaticResource ModeButton}"
+                             Checked="Mode_Checked">
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource ModeLabel}" Text="Monitoring only" />
+                        <TextBlock Style="{StaticResource ModeSubLabel}" Text="Add to existing Error instance" />
+                    </StackPanel>
+                </RadioButton>
+            </UniformGrid>
+
+            <TextBlock FontSize="13"
+                       FontWeight="SemiBold"
+                       Foreground="{StaticResource Gray70Brush}"
+                       Margin="0,0,0,5"
+                       Text="This will install:" />
+
+            <!-- MinHeight keeps the popup from resizing as scenarios with different
+                 numbers of components are selected. -->
+            <StackPanel MinHeight="150">
+
+                <Grid x:Name="ServiceControlRow" Margin="0,8,0,0">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="30" />
                         <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-
-                    <ContentControl Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    SnapsToDevicePixels="True"
-                                    Template="{StaticResource NewControlInstanceIcon}" />
-
-                    <TextBlock Grid.Column="1"
-                               Margin="10"
-                               FontSize="13"
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center">
-                        <Hyperlink Command="{Binding AddInstance}"  Style="{StaticResource UnderlinedLink}">Add ServiceControl and Audit Instances...</Hyperlink>
-                    </TextBlock>
-
+                    <TextBlock Grid.Column="0" Style="{StaticResource CheckGlyph}" Text="&#x2713;" />
+                    <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                        <TextBlock Style="{StaticResource ComponentLabel}" Text="ServiceControl Instance" />
+                        <TextBlock Style="{StaticResource ComponentDescription}"
+                                   Text="Ability to retry failed / dead lettered messages" />
+                    </StackPanel>
                 </Grid>
-            </Border>
-
-            <TextBlock Grid.Column="0" Grid.Row="1"
-                       Margin="1,10,0,0"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
-
-            <TextBlock Grid.Column="0" Grid.Row="2"
-                       Margin="1,10,0,0"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
-
-            <TextBlock Grid.Column="1" Grid.Row="1"
-                       FontSize="13"
-                       Foreground="{StaticResource Gray90Brush}"
-                       Margin="0,10,10,10"
-                       Text="Collects Audited messages for visualization with ServiceInsight"
-                       TextWrapping="Wrap" />
-
-            <TextBlock Grid.Column="1" Grid.Row="2"
-                    FontSize="13"
-                    Foreground="{StaticResource Gray90Brush}"
-                    Margin="0,10,10,10"
-                    Text="Collects Failed messages to be retried with ServicePulse or ServiceInsight"
-                    TextWrapping="Wrap" />
-        </Grid>
-
-        <Rectangle Grid.Column="1"
-                   Width="1"
-                   Fill="{StaticResource Gray20Brush}"
-                   Margin="10"
-                   />
-
-        <Grid Grid.Column="2" Margin="20">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="14" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
 
-            <Border Margin="-5,0,5,0" Height="40" Grid.ColumnSpan="2" Grid.Row="0">
-                <Grid>
+                <!-- Nested under the instance that hosts it, and the one genuine choice here -->
+                <CheckBox x:Name="CbServicePulse"
+                          Style="{StaticResource ComponentCheckBox}"
+                          Margin="26,8,0,0"
+                          IsChecked="True"
+                          Checked="ServicePulse_Changed"
+                          Unchecked="ServicePulse_Changed">
+                    <StackPanel Margin="5,0,0,0">
+                        <TextBlock Style="{StaticResource ComponentLabel}" Text="Integrated ServicePulse" />
+                        <TextBlock Style="{StaticResource ComponentDescription}"
+                                   Text="Built-in web UI hosted by the Error instance" />
+                    </StackPanel>
+                </CheckBox>
+
+                <Grid x:Name="AuditRow" Margin="0,8,0,0">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="30" />
-                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-
-                    <ContentControl Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    SnapsToDevicePixels="True"
-                                    Template="{StaticResource NewMonitoringInstanceIcon}" />
-
-                    <TextBlock Grid.Column="1"
-                               Margin="10"
-                               FontSize="13"
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center">
-                        <Hyperlink Command="{Binding AddMonitoringInstance}" Style="{StaticResource UnderlinedLink}">Add monitoring instance...</Hyperlink>
-                    </TextBlock>
-
+                    <TextBlock Grid.Column="0" Style="{StaticResource CheckGlyph}" Text="&#x2713;" />
+                    <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                        <TextBlock Style="{StaticResource ComponentLabel}" Text="ServiceControl Audit Instance" />
+                        <TextBlock Style="{StaticResource ComponentDescription}"
+                                   Text="Collects audited messages from endpoints for visualization with ServicePulse" />
+                    </StackPanel>
                 </Grid>
-            </Border>
-
-            <TextBlock Grid.Column="0" Grid.Row="1"
-                       Margin="1,10,0,10"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Top"
-                       Text="•"
-                       Foreground="{StaticResource Gray90Brush}" />
 
-            <TextBlock Grid.Column="1" Grid.Row="1"
-                       Foreground="{StaticResource Gray90Brush}"
-                       FontSize="13"
-                       Margin="0,10,10,10"
-                       Text="Collects Monitoring data from endpoints running the NServiceBus.Metrics.ServiceControl plugin"
-                       TextWrapping="Wrap" />
+                <Grid x:Name="MonitoringRow" Margin="0,8,0,0" Visibility="Collapsed">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource CheckGlyph}" Text="&#x2713;" />
+                    <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                        <TextBlock Style="{StaticResource ComponentLabel}" Text="Monitoring Instance" />
+                        <TextBlock Style="{StaticResource ComponentDescription}"
+                                   Text="Collects monitoring data from endpoints for visualization with ServicePulse" />
+                    </StackPanel>
+                </Grid>
 
-            <ContentControl Grid.Column="0"
-                            Grid.Row="2"
-                            Margin="0,5,3,0"
-                            VerticalContentAlignment="Center" VerticalAlignment="Center"
-                            Width="12"
-                            Height="12"
-                            SnapsToDevicePixels="True"
-                            Foreground="White"
-                            Template="{StaticResource ExternalLink}"
-                            Visibility="Hidden" />
+            </StackPanel>
 
-            <TextBlock Grid.Row="2" Grid.Column="1"
-                       Margin="0,10,10,10"
-                       FontSize="13"
-                       FontWeight="Normal"
+            <TextBlock FontSize="11"
+                       FontStyle="Italic"
+                       Foreground="{StaticResource Gray50Brush}"
                        TextWrapping="Wrap"
-                       VerticalAlignment="Center"
-                       Visibility="Hidden">
-                <Hyperlink Foreground="White"
-                           TextDecorations="Underline"
-                           Command="{Binding}">Learn more about monitoring</Hyperlink>
-            </TextBlock>
-
-        </Grid>
-
+                       Margin="0,14,0,0"
+                       Text="Pick a scenario above to change what gets installed." />
+
+            <StackPanel Orientation="Horizontal"
+                        HorizontalAlignment="Right"
+                        Margin="0,15,0,5">
+                <Button Content="Cancel"
+                        Style="{StaticResource BasicButton}"
+                        Padding="30,8"
+                        Click="Cancel_Click" />
+                <Button Content="Next"
+                        Style="{StaticResource HiliteButton}"
+                        Padding="30,8"
+                        Margin="10,0,0,0"
+                        Click="Next_Click" />
+            </StackPanel>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
index d5cc45dd44..1ce931f3e8 100644
--- a/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
+++ b/src/ServiceControl.Config/UI/Shell/NewInstancePopup.xaml.cs
@@ -1,13 +1,119 @@
-namespace ServiceControl.Config.UI.Shell
+namespace ServiceControl.Config.UI.Shell
 {
-    /// <summary>
-    /// Interaction logic for NewInstanceOverlay.xaml
-    /// </summary>
+    using System.Windows;
+    using System.Windows.Controls.Primitives;
+
     public partial class NewInstanceOverlay
     {
         public NewInstanceOverlay()
         {
             InitializeComponent();
+            IsVisibleChanged += OnIsVisibleChanged;
         }
+
+        void OnIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                ResetToDefaults();
+            }
+        }
+
+        void ResetToDefaults()
+        {
+            installServicePulse = true;
+
+            // Assigning IsChecked when it is already true raises no Checked event, so the
+            // mode is set directly rather than relying on the radio button to report it.
+            selectedMode = SetupMode.ErrorAndAudit;
+            ModeErrorAndAudit.IsChecked = true;
+
+            UpdateComponentList();
+        }
+
+        bool InstallServiceControl => selectedMode.InstallsServiceControl();
+
+        bool InstallAudit => selectedMode.InstallsAudit();
+
+        bool InstallMonitoring => selectedMode.InstallsMonitoring();
+
+        bool InstallServicePulse => selectedMode.InstallsServicePulse(installServicePulse);
+
+        void Mode_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!IsLoaded)
+            {
+                return;
+            }
+
+            selectedMode = sender switch
+            {
+                _ when sender == ModeErrorHandling => SetupMode.ErrorHandling,
+                _ when sender == ModeAuditOnly => SetupMode.AuditOnly,
+                _ when sender == ModeMonitoringOnly => SetupMode.MonitoringOnly,
+                _ => SetupMode.ErrorAndAudit
+            };
+
+            UpdateComponentList();
+        }
+
+        void ServicePulse_Changed(object sender, RoutedEventArgs e)
+        {
+            if (!IsLoaded)
+            {
+                return;
+            }
+
+            installServicePulse = CbServicePulse.IsChecked == true;
+        }
+
+        void UpdateComponentList()
+        {
+            ServiceControlRow.Visibility = Visible(InstallServiceControl);
+            AuditRow.Visibility = Visible(InstallAudit);
+            MonitoringRow.Visibility = Visible(InstallMonitoring);
+
+            // ServicePulse is hosted by the error instance, so it is only on offer in the
+            // scenarios that install one. The choice is remembered across scenario changes.
+            CbServicePulse.Visibility = Visible(InstallServiceControl);
+            CbServicePulse.IsChecked = installServicePulse;
+        }
+
+        static Visibility Visible(bool visible) => visible ? Visibility.Visible : Visibility.Collapsed;
+
+#pragma warning disable PS0027 // Click is an event delegate, so there is nothing to return the task to. Awaiting routes failures to the dispatcher's unhandled exception handler instead of dropping them on an unobserved task.
+        async void Next_Click(object sender, RoutedEventArgs e)
+        {
+            ClosePopup();
+
+            if (DataContext is ShellViewModel shell)
+            {
+                if (InstallMonitoring)
+                {
+                    shell.LaunchMonitoringAdd();
+                }
+                else
+                {
+                    await shell.LaunchServiceControlAdd(InstallServiceControl, InstallAudit, InstallServicePulse);
+                }
+            }
+        }
+#pragma warning restore PS0027
+
+        void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            ClosePopup();
+        }
+
+        void ClosePopup()
+        {
+            if (Parent is Popup popup)
+            {
+                popup.IsOpen = false;
+            }
+        }
+
+        SetupMode selectedMode = SetupMode.ErrorAndAudit;
+        bool installServicePulse = true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Config/UI/Shell/SetupMode.cs b/src/ServiceControl.Config/UI/Shell/SetupMode.cs
new file mode 100644
index 0000000000..0abd6c51d3
--- /dev/null
+++ b/src/ServiceControl.Config/UI/Shell/SetupMode.cs
@@ -0,0 +1,30 @@
+namespace ServiceControl.Config.UI.Shell
+{
+    // The scenario chosen in the new-instance popup. It is the only thing that decides
+    // which instances get installed, so the mapping lives here rather than in the code
+    // behind, where it would sit behind WPF's IsLoaded guard and be untestable.
+    enum SetupMode
+    {
+        ErrorHandling,
+        ErrorAndAudit,
+        AuditOnly,
+        MonitoringOnly
+    }
+
+    static class SetupModeExtensions
+    {
+        public static bool InstallsServiceControl(this SetupMode mode) =>
+            mode is SetupMode.ErrorHandling or SetupMode.ErrorAndAudit;
+
+        public static bool InstallsAudit(this SetupMode mode) =>
+            mode is SetupMode.ErrorAndAudit or SetupMode.AuditOnly;
+
+        public static bool InstallsMonitoring(this SetupMode mode) =>
+            mode is SetupMode.MonitoringOnly;
+
+        // Integrated ServicePulse is hosted by the error instance, so it is only on offer
+        // in the scenarios that install one.
+        public static bool InstallsServicePulse(this SetupMode mode, bool wanted) =>
+            mode.InstallsServiceControl() && wanted;
+    }
+}
diff --git a/src/ServiceControl.Config/UI/Shell/ShellView.xaml b/src/ServiceControl.Config/UI/Shell/ShellView.xaml
index dea57a4a05..1281d5b11a 100644
--- a/src/ServiceControl.Config/UI/Shell/ShellView.xaml
+++ b/src/ServiceControl.Config/UI/Shell/ShellView.xaml
@@ -73,15 +73,9 @@
                         Visibility="{Binding IsModal,
                                              Converter={StaticResource boolToVisInverted}}">
 
-                <Button Command="{Binding AddInstance}" Style="{StaticResource OriginalNewButton}"
-                        Visibility="{Binding ShowMonitoringInstances,
-                                     Converter={StaticResource boolToVisInverted}}" />
-
                 <ToggleButton Name="AddInstanceButton"
                               Style="{StaticResource NewButton}"
-                              IsChecked="{Binding ShowingMenuOverlay, Mode=TwoWay}"
-                              Visibility="{Binding ShowMonitoringInstances,
-                                                   Converter={StaticResource boolToVis}}" />
+                              IsChecked="{Binding ShowingMenuOverlay, Mode=TwoWay}" />
 
                 <Popup PlacementTarget="{Binding ElementName=RootBorder}"
                        Focusable="False"
diff --git a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
index fb50e3a731..8e051a585d 100644
--- a/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
+++ b/src/ServiceControl.Config/UI/Shell/ShellViewModel.cs
@@ -28,16 +28,14 @@ IEventAggregator eventAggregator
         {
             this.listInstances = listInstances;
             this.noInstances = noInstances;
+            this.addInstance = addInstance;
+            this.addMonitoringInstance = addMonitoringInstance;
             OpenUrl = new OpenURLCommand();
-            AddInstance = addInstance;
-            AddMonitoringInstance = addMonitoringInstance;
             LicenseStatusManager = licenseStatusManager;
             DisplayName = "ServiceControl Config";
             IsModal = false;
             LoadAppVersion();
             CopyrightInfo = $"{DateTime.UtcNow.Year} © Particular Software";
-            addInstance.OnCommandExecuting = () => ShowingMenuOverlay = false;
-            addMonitoringInstance.OnCommandExecuting = () => ShowingMenuOverlay = false;
 
             RefreshInstancesCmd = Command.Create(async () =>
             {
@@ -47,6 +45,18 @@ IEventAggregator eventAggregator
             });
         }
 
+        public async Task LaunchServiceControlAdd(bool installError, bool installAudit, bool installServicePulse, CancellationToken cancellationToken = default)
+        {
+            ShowingMenuOverlay = false;
+            await addInstance.ExecuteWithOptions(installError, installAudit, installServicePulse, cancellationToken);
+        }
+
+        public void LaunchMonitoringAdd()
+        {
+            ShowingMenuOverlay = false;
+            addMonitoringInstance.Execute(null);
+        }
+
         public object ActiveContext { get; set; }
 
         public bool IsModal { get; set; }
@@ -65,13 +75,6 @@ IEventAggregator eventAggregator
 
         public bool HasInstances { get; private set; }
 
-        [FeatureToggle(Feature.MonitoringInstances)]
-        public bool ShowMonitoringInstances { get; set; }
-
-        public ICommand AddInstance { get; private set; }
-
-        public ICommand AddMonitoringInstance { get; private set; }
-
         public ICommand OpenUrl { get; private set; }
 
         public ICommand OpenFeedBack { get; set; }
@@ -171,5 +174,7 @@ async Task CheckForUpdates(CancellationToken cancellationToken)
         Task updateCheckTask;
         readonly ListInstancesViewModel listInstances;
         readonly NoInstancesViewModel noInstances;
+        readonly AddServiceControlInstanceCommand addInstance;
+        readonly ICommand addMonitoringInstance;
     }
 }