diff --git a/windows/Flock.Screenshots/ScreenshotSession.cs b/windows/Flock.Screenshots/ScreenshotSession.cs
index 08c683d..5f769ae 100644
--- a/windows/Flock.Screenshots/ScreenshotSession.cs
+++ b/windows/Flock.Screenshots/ScreenshotSession.cs
@@ -2,6 +2,7 @@
 using Flock.Tray.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 namespace Flock.Tray;
 
@@ -79,6 +80,32 @@ internal async Task<Window> ShowAddDomain(string site, string domain)
         return window;
     }
 
+    /// <summary>A destructive confirmation, without changing the demo project folders.</summary>
+    internal async Task<Window> ShowRemoveProjectFolder()
+    {
+        var window = (SettingsWindow)await ShowSettings(SettingsPane.General);
+        await Settled();
+        _ = window.Confirm("Remove C:\\Projects from project folders?",
+            "Its folders stop being served as sites. Nothing is deleted from disk.", "Remove", true);
+        await Settled();
+        var dialog = VisualTreeHelper.GetOpenPopupsForXamlRoot(window.XamlRoot)
+            .Select(popup => popup.Child is { } child ? Find<ContentDialog>(child, _ => true) : null)
+            .FirstOrDefault(found => found is not null)
+            ?? throw new InvalidOperationException("The confirmation dialog did not open.");
+        var remove = Find<Button>(dialog, button => button.Name == "PrimaryButton");
+        var cancel = Find<Button>(dialog, button => button.Name == "CloseButton");
+        if (remove?.Background is not SolidColorBrush { Color: { R: 196, G: 43, B: 28 } or { R: 178, G: 38, B: 25 } or { R: 160, G: 34, B: 22 } }
+            || cancel?.Background is not SolidColorBrush cancelBackground
+            || cancelBackground.Color == ((SolidColorBrush)remove.Background).Color
+            || !ReferenceEquals(cancel.Style, Ui.Resource<Style>("DefaultButtonStyle"))
+            || dialog.DefaultButton != ContentDialogButton.None
+            || !ReferenceEquals(FocusManager.GetFocusedElement(window.XamlRoot), cancel))
+        {
+            throw new InvalidOperationException($"Unexpected button colors: Remove={(remove?.Background as SolidColorBrush)?.Color}, Cancel={(cancel?.Background as SolidColorBrush)?.Color}, Default={dialog.DefaultButton}.");
+        }
+        return window;
+    }
+
     /// <summary>A site's "…" menu, open.</summary>
     internal async Task<Window> ShowSiteMenu(string site)
     {
diff --git a/windows/Flock.Screenshots/Screenshots.cs b/windows/Flock.Screenshots/Screenshots.cs
index ab42ea5..b6867b4 100644
--- a/windows/Flock.Screenshots/Screenshots.cs
+++ b/windows/Flock.Screenshots/Screenshots.cs
@@ -13,6 +13,8 @@ internal sealed class Screenshots(Screenshots.Options options)
     private static readonly Shot[] All =
     [
         new("settings-general-project-folders", app => app.ShowSettings(SettingsPane.General, "Updates")),
+        new("settings-remove-project-folder", app => app.ShowRemoveProjectFolder()),
+        new("settings-general-daemon", app => app.ShowSettings(SettingsPane.General)),
         new("settings-sites", app => app.ShowSite("shop")),
         new("settings-sites-https", app => app.ShowSite("acme")),
         new("settings-sites-add-domain", app => app.ShowAddDomain("acme", "admin")),
@@ -24,6 +26,8 @@ internal sealed class Screenshots(Screenshots.Options options)
         new("settings-services-postgres", app => app.ShowService("postgres")),
         new("settings-services-install", app => app.ShowService("mariadb")),
         new("settings-debugger", app => app.ShowSettings(SettingsPane.Debugger)),
+        new("settings-mail", app => app.ShowSettings(SettingsPane.Mail)),
+        new("settings-about", app => app.ShowSettings(SettingsPane.About)),
         new("logs-window", app => app.ShowLog("acme")),
         new("mail-window", app => app.ShowMail()),
         new("dumps-window", app => app.ShowWindow(WindowKind.Dumps)),
diff --git a/windows/Flock.Tray/FlockWindow.xaml.cs b/windows/Flock.Tray/FlockWindow.xaml.cs
index ba5962c..8e2016e 100644
--- a/windows/Flock.Tray/FlockWindow.xaml.cs
+++ b/windows/Flock.Tray/FlockWindow.xaml.cs
@@ -67,6 +67,24 @@ protected void InitializeChrome(Grid root, Grid titleBar, TextBlock caption, Ima
         ExtendsContentIntoTitleBar = true;
         AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
         SetTitleBar(titleBar);
+        root.Loaded += (_, _) => UpdateTitleBarTheme(root);
+        root.ActualThemeChanged += (sender, _) => UpdateTitleBarTheme(sender);
+        UpdateTitleBarTheme(root);
+    }
+
+    private void UpdateTitleBarTheme(FrameworkElement root)
+    {
+        var light = root.ActualTheme == ElementTheme.Light;
+        var titleBar = AppWindow.TitleBar;
+        var foreground = light ? Colors.Black : Colors.White;
+        titleBar.ButtonForegroundColor = foreground;
+        titleBar.ButtonHoverForegroundColor = foreground;
+        titleBar.ButtonPressedForegroundColor = foreground;
+        titleBar.ButtonInactiveForegroundColor = Colors.Gray;
+        titleBar.ButtonBackgroundColor = Colors.Transparent;
+        titleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+        titleBar.ButtonHoverBackgroundColor = light ? Microsoft.UI.ColorHelper.FromArgb(255, 230, 230, 230) : Microsoft.UI.ColorHelper.FromArgb(255, 55, 55, 55);
+        titleBar.ButtonPressedBackgroundColor = light ? Microsoft.UI.ColorHelper.FromArgb(255, 240, 240, 240) : Microsoft.UI.ColorHelper.FromArgb(255, 45, 45, 45);
     }
 
     private static string DisplayTitle(string title) => App.Current.Options.Identity.IsDevelopment ? title + " [Dev]" : title;
diff --git a/windows/Flock.Tray/PanelWindow.xaml b/windows/Flock.Tray/PanelWindow.xaml
index 36e85e2..c2e985f 100644
--- a/windows/Flock.Tray/PanelWindow.xaml
+++ b/windows/Flock.Tray/PanelWindow.xaml
@@ -272,22 +272,22 @@
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Orientation="Horizontal" Spacing="8">
+                        <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
                             <FontIcon Glyph="{StaticResource GlyphBug}" FontFamily="{StaticResource SymbolsFont}" FontSize="14" />
-                            <TextBlock Text="Xdebug" />
+                            <TextBlock Text="Xdebug" VerticalAlignment="Center" />
                         </StackPanel>
-                        <ToggleSwitch Grid.Column="1" IsOn="{Binding Xdebug, Mode=TwoWay}" OnContent="" OffContent="" MinWidth="0" />
+                        <ToggleSwitch Grid.Column="1" IsOn="{Binding Xdebug, Mode=TwoWay}" OnContent="" OffContent="" MinWidth="0" VerticalAlignment="Center" />
                     </Grid>
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Orientation="Horizontal" Spacing="8">
+                        <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
                             <FontIcon Glyph="{StaticResource GlyphDownload}" FontFamily="{StaticResource SymbolsFont}" FontSize="14" />
-                            <TextBlock Text="Capture dumps" />
+                            <TextBlock Text="Capture dumps" VerticalAlignment="Center" />
                         </StackPanel>
-                        <ToggleSwitch Grid.Column="1" IsOn="{Binding Dumps, Mode=TwoWay}" IsEnabled="{Binding CaptureEnabled}" OnContent="" OffContent="" MinWidth="0" />
+                        <ToggleSwitch Grid.Column="1" IsOn="{Binding Dumps, Mode=TwoWay}" IsEnabled="{Binding CaptureEnabled}" OnContent="" OffContent="" MinWidth="0" VerticalAlignment="Center" />
                     </Grid>
                 </StackPanel>
 
diff --git a/windows/Flock.Tray/Settings/AboutPane.xaml b/windows/Flock.Tray/Settings/AboutPane.xaml
index 8a31732..e37f5b8 100644
--- a/windows/Flock.Tray/Settings/AboutPane.xaml
+++ b/windows/Flock.Tray/Settings/AboutPane.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StackPanel Spacing="0">
         <StackPanel Orientation="Horizontal" Spacing="20" Margin="0,0,0,24">
-            <Image Source="Assets/AppIcon.png" Width="72" Height="72" />
+            <Image x:Name="AppIcon" Width="72" Height="72" />
             <StackPanel Spacing="2" VerticalAlignment="Center">
                 <TextBlock Text="Flock" Style="{StaticResource TitleLargeTextBlockStyle}" />
                 <TextBlock Text="A native local development environment for Laravel." Style="{StaticResource CaptionTextBlockStyle}"
@@ -17,7 +17,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="App" /><TextBlock x:Name="AppVersion" Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="App" VerticalAlignment="Center" /><TextBlock x:Name="AppVersion" Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -25,7 +25,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Daemon" /><TextBlock Text="{Binding DaemonVersion}" Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Daemon" VerticalAlignment="Center" /><TextBlock Text="{Binding DaemonVersion}" Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -33,11 +33,11 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Data folder" />
                         <TextBlock Text="{Binding DataFolder}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextTrimming="CharacterEllipsis" />
                     </StackPanel>
-                    <Button Grid.Column="1" Content="Show in Explorer" Click="ShowDataFolder" />
+                    <Button Grid.Column="1" Content="Show in Explorer" Click="ShowDataFolder" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -45,7 +45,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Flock documentation" /><Button Grid.Column="1" Content="Open" Click="OpenDocumentation" />
+                    <TextBlock Text="Flock documentation" VerticalAlignment="Center" /><Button Grid.Column="1" Content="Open" Click="OpenDocumentation" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -53,12 +53,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Found a bug?" />
                         <TextBlock Text="Opens a new GitHub issue with your versions filled in." Style="{StaticResource CaptionTextBlockStyle}"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <Button Grid.Column="1" Content="Report an issue" Click="ReportIssue" />
+                    <Button Grid.Column="1" Content="Report an issue" Click="ReportIssue" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -66,12 +66,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="License" />
                         <TextBlock Text="Copyright © Guava s.r.o. Licensed under the AGPL-3.0." Style="{StaticResource CaptionTextBlockStyle}"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <Button Grid.Column="1" Content="View" Click="OpenLicense" />
+                    <Button Grid.Column="1" Content="View" Click="OpenLicense" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
@@ -82,14 +82,14 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Uninstall Flock" />
                         <TextBlock Text="Stops Flock and removes it from this PC. Your sites, databases and settings are kept."
                                    Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <Button Grid.Column="1" Content="Uninstall Flock…" Click="ConfirmUninstallClicked" />
+                    <Button Grid.Column="1" Content="Uninstall Flock…" Click="ConfirmUninstallClicked" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/windows/Flock.Tray/Settings/AboutPane.xaml.cs b/windows/Flock.Tray/Settings/AboutPane.xaml.cs
index 742f861..0959186 100644
--- a/windows/Flock.Tray/Settings/AboutPane.xaml.cs
+++ b/windows/Flock.Tray/Settings/AboutPane.xaml.cs
@@ -5,6 +5,7 @@
 using Flock.Tray.Infrastructure;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
 namespace Flock.Tray.Settings;
 
 internal sealed partial class AboutPane : UserControl, ISettingsPane
@@ -17,6 +18,7 @@ public AboutPane(SettingsWindow window, RuntimeService model)
     {
         this.model = model;
         InitializeComponent();
+        AppIcon.Source = new BitmapImage(new Uri(Path.Combine(AppContext.BaseDirectory, "Assets", "AppIcon.png")));
         version = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "dev";
         viewModel = new AboutViewModel(model);
         DataContext = viewModel;
@@ -110,4 +112,4 @@ private void Changed()
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DaemonVersion)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/windows/Flock.Tray/Settings/AiPane.xaml b/windows/Flock.Tray/Settings/AiPane.xaml
index c767727..7e85e5f 100644
--- a/windows/Flock.Tray/Settings/AiPane.xaml
+++ b/windows/Flock.Tray/Settings/AiPane.xaml
@@ -18,12 +18,12 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <StackPanel Spacing="1">
+                                <StackPanel Spacing="1" VerticalAlignment="Center">
                                     <TextBlock Text="{Binding Name}" />
                                     <TextBlock Text="{Binding Description}" Style="{StaticResource CaptionTextBlockStyle}"
                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                                 </StackPanel>
-                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
+                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
                                     <Button Content="Add" Command="{Binding RegisterCommand}"
                                             Visibility="{Binding IsAvailable, Converter={StaticResource BooleanVisibilityConverter}}" />
                                     <Button Content="Remove" Command="{Binding UnregisterCommand}"
diff --git a/windows/Flock.Tray/Settings/DebuggerPane.xaml b/windows/Flock.Tray/Settings/DebuggerPane.xaml
index 3d4ae93..6de3f3d 100644
--- a/windows/Flock.Tray/Settings/DebuggerPane.xaml
+++ b/windows/Flock.Tray/Settings/DebuggerPane.xaml
@@ -9,12 +9,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Detect Xdebug requests" />
                         <TextBlock Text="Xdebug loads only for requests that ask for it, so everything else stays fast." Style="{StaticResource CaptionTextBlockStyle}"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <ToggleSwitch Grid.Column="1" MinWidth="0" IsOn="{Binding Enabled, Mode=TwoWay}" OnContent="" OffContent="" />
+                    <ToggleSwitch Grid.Column="1" MinWidth="0" IsOn="{Binding Enabled, Mode=TwoWay}" OnContent="" OffContent="" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -22,13 +22,13 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Detect PhpStorm breakpoints" />
                         <TextBlock Text="While a project has breakpoints in PhpStorm, every request to its site is debugged."
                                    Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
                     <ToggleSwitch x:Name="Breakpoints" Grid.Column="1" MinWidth="0" IsOn="{Binding Breakpoints, Mode=TwoWay}" IsEnabled="{Binding Enabled}"
-                                  OnContent="" OffContent="" />
+                                  OnContent="" OffContent="" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
@@ -42,10 +42,10 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Text="{Binding}" />
-                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6">
-                                    <FontIcon Glyph="&#xEBE8;" FontFamily="{StaticResource SymbolsFont}" />
-                                    <TextBlock Text="Breakpoints in PhpStorm" Style="{StaticResource CaptionTextBlockStyle}" />
+                                <TextBlock Text="{Binding}" VerticalAlignment="Center" />
+                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
+                                    <FontIcon Glyph="&#xEBE8;" FontFamily="{StaticResource SymbolsFont}" VerticalAlignment="Center" />
+                                    <TextBlock Text="Breakpoints in PhpStorm" Style="{StaticResource CaptionTextBlockStyle}" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -60,7 +60,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Client port" /><TextBlock Grid.Column="1" Text="9003" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Client port" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="9003" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -68,7 +68,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Mode" /><TextBlock Grid.Column="1" Text="debug, develop" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Mode" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="debug, develop" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -110,4 +110,4 @@
             </ItemsControl>
         </StackPanel>
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/windows/Flock.Tray/Settings/DumpsPane.xaml b/windows/Flock.Tray/Settings/DumpsPane.xaml
index 59545d9..2bafc2c 100644
--- a/windows/Flock.Tray/Settings/DumpsPane.xaml
+++ b/windows/Flock.Tray/Settings/DumpsPane.xaml
@@ -9,12 +9,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Capture dumps" />
                         <TextBlock Text="Turn it off to see dumps in the page again." Style="{StaticResource CaptionTextBlockStyle}"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <ToggleSwitch Grid.Column="1" MinWidth="0" IsOn="{Binding Capturing, Mode=TwoWay}" OnContent="" OffContent="" />
+                    <ToggleSwitch Grid.Column="1" MinWidth="0" IsOn="{Binding Capturing, Mode=TwoWay}" OnContent="" OffContent="" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -22,7 +22,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Captured" /><Button Grid.Column="1" Content="Open Dumps" Click="OpenDumps" />
+                    <TextBlock Text="Captured" VerticalAlignment="Center" /><Button Grid.Column="1" Content="Open Dumps" Click="OpenDumps" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
@@ -33,7 +33,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Open files in" /><ComboBox x:Name="Editor" Grid.Column="1" MinWidth="160" SelectionChanged="EditorChanged" />
+                    <TextBlock Text="Open files in" VerticalAlignment="Center" /><ComboBox x:Name="Editor" Grid.Column="1" MinWidth="160" SelectionChanged="EditorChanged" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
diff --git a/windows/Flock.Tray/Settings/GeneralPane.xaml b/windows/Flock.Tray/Settings/GeneralPane.xaml
index 1c0c3ce..03656ed 100644
--- a/windows/Flock.Tray/Settings/GeneralPane.xaml
+++ b/windows/Flock.Tray/Settings/GeneralPane.xaml
@@ -11,7 +11,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Status" />
+                    <TextBlock Text="Status" VerticalAlignment="Center" />
                     <Grid Grid.Column="1" ColumnSpacing="8" VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" /><ColumnDefinition Width="Auto" />
@@ -26,7 +26,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Version" /><TextBlock Grid.Column="1" Text="{Binding VersionText}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Version" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="{Binding VersionText}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}" Visibility="{Binding StatusVisibility}">
@@ -34,7 +34,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Process" /><TextBlock Grid.Column="1" Text="{Binding ProcessText}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Process" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="{Binding ProcessText}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -42,12 +42,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Restart" />
                         <TextBlock Text="Restarts the daemon and every service it runs." Style="{StaticResource CaptionTextBlockStyle}"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <Button Grid.Column="1" Command="{Binding RestartCommand}">
+                    <Button Grid.Column="1" Command="{Binding RestartCommand}" VerticalAlignment="Center">
                         <controls:BusyContent Text="Restart Daemon" BusyText="Restarting…" IsBusy="{Binding IsRestarting}" />
                     </Button>
                 </Grid>
@@ -73,11 +73,11 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Folder" />
                         <TextBlock Text="{Binding Root}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextTrimming="CharacterEllipsis" />
                     </StackPanel>
-                    <Button Grid.Column="1" Content="Show in Explorer" Click="ShowRoot" />
+                    <Button Grid.Column="1" Content="Show in Explorer" Click="ShowRoot" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
@@ -88,12 +88,12 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Open Flock at sign-in" />
                         <TextBlock Text="Shows the Flock icon in the notification area when you sign in. The daemon itself always starts at sign-in."
                                    Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
-                    <ToggleSwitch x:Name="Startup" Grid.Column="1" MinWidth="0" Toggled="StartupToggled" OnContent="" OffContent="" />
+                    <ToggleSwitch x:Name="Startup" Grid.Column="1" MinWidth="0" Toggled="StartupToggled" OnContent="" OffContent="" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
@@ -105,13 +105,13 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <StackPanel Spacing="1">
+                    <StackPanel Spacing="1" VerticalAlignment="Center">
                         <TextBlock Text="Beta versions" />
                         <TextBlock Text="Get new versions of Flock, PHP and services earlier, including pre-releases. They may not work yet."
                                    Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
                     </StackPanel>
                     <ToggleSwitch x:Name="Beta" Grid.Column="1" MinWidth="0" IsOn="{Binding IsBeta}" IsEnabled="{Binding BetaEnabled}" Toggled="BetaToggled" OnContent=""
-                                  OffContent="" />
+                                  OffContent="" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <TextBlock Text="Experimental channel: packages that aren't released yet are offered. `flock channel stable` switches back."
diff --git a/windows/Flock.Tray/Settings/MailPane.xaml b/windows/Flock.Tray/Settings/MailPane.xaml
index fc2b4de..743f9b2 100644
--- a/windows/Flock.Tray/Settings/MailPane.xaml
+++ b/windows/Flock.Tray/Settings/MailPane.xaml
@@ -16,7 +16,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Host" /><TextBlock Grid.Column="1" Text="127.0.0.1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Host" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="127.0.0.1" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -24,7 +24,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Port" /><TextBlock Grid.Column="1" Text="{Binding Port}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Port" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="{Binding Port}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -32,7 +32,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Status" />
+                    <TextBlock Text="Status" VerticalAlignment="Center" />
                     <Grid Grid.Column="1" ColumnSpacing="8" VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" /><ColumnDefinition Width="Auto" />
@@ -63,7 +63,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Caught emails" /><TextBlock Grid.Column="1" Text="{Binding Count}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock Text="Caught emails" VerticalAlignment="Center" /><TextBlock Grid.Column="1" Text="{Binding Count}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" />
                 </Grid>
             </Border>
             <Border Style="{StaticResource CardStyle}">
@@ -71,7 +71,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Text="Open Mail" /><Button Grid.Column="1" Content="Open Mail" Click="OpenMail" />
+                    <TextBlock Grid.Column="0" Text="Open Mail" VerticalAlignment="Center" /><Button Grid.Column="1" Content="Open Mail" Click="OpenMail" VerticalAlignment="Center" />
                 </Grid>
             </Border>
         </StackPanel>
diff --git a/windows/Flock.Tray/Settings/NodePane.xaml.cs b/windows/Flock.Tray/Settings/NodePane.xaml.cs
index 1d312ce..13ab9ef 100644
--- a/windows/Flock.Tray/Settings/NodePane.xaml.cs
+++ b/windows/Flock.Tray/Settings/NodePane.xaml.cs
@@ -3,6 +3,7 @@
 using Flock.Tray.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 namespace Flock.Tray.Settings;
 
 internal sealed partial class NodePane : UserControl, ISettingsPane
@@ -78,7 +79,12 @@ private void OpenNodeActions(object sender, RoutedEventArgs args)
             return;
         }
 
-        var menu = new MenuFlyout();
+        var menu = new MenuFlyout
+        {
+            Placement = FlyoutPlacementMode.BottomEdgeAlignedRight,
+            ShouldConstrainToRootBounds = true,
+            MenuFlyoutPresenterStyle = Ui.OpaqueMenuPresenterStyle(),
+        };
         if (row.CanUpdateNpm) menu.Items.Add(Item("Update npm", () => _ = row.UpdateNpmCommand.ExecuteAsync(null)));
         if (row.CanMakeDefault) menu.Items.Add(Item("Make default", () => _ = row.SetDefaultCommand.ExecuteAsync(null)));
         if (row.CanUninstall && row.HasUpdate) menu.Items.Add(Item("Uninstall…", () => _ = UninstallNodeAsync(row)));
@@ -177,4 +183,4 @@ private async Task ConfirmPendingLinkAsync(InstallLinkResolution request, Cancel
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/windows/Flock.Tray/Settings/PhpPane.xaml.cs b/windows/Flock.Tray/Settings/PhpPane.xaml.cs
index 3f450c3..3c86823 100644
--- a/windows/Flock.Tray/Settings/PhpPane.xaml.cs
+++ b/windows/Flock.Tray/Settings/PhpPane.xaml.cs
@@ -7,6 +7,7 @@
 using Flock.Tray.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 namespace Flock.Tray.Settings;
 
 internal sealed partial class PhpPane : UserControl, ISettingsPane
@@ -146,7 +147,12 @@ private void OpenPhpActions(object sender, RoutedEventArgs args)
     {
         if (sender is Button button && Row(button) is { } row)
         {
-            var menu = new MenuFlyout();
+            var menu = new MenuFlyout
+            {
+                Placement = FlyoutPlacementMode.BottomEdgeAlignedRight,
+                ShouldConstrainToRootBounds = true,
+                MenuFlyoutPresenterStyle = Ui.OpaqueMenuPresenterStyle(),
+            };
             var ini = model.Configuration.Current?.Php.FirstOrDefault(version => version.Version == row.Minor)?.Ini;
             if (ini is { Length: > 0 })
             {
@@ -217,7 +223,12 @@ private void OpenFrankenPhpActions(object sender, RoutedEventArgs args)
     {
         if (sender is Button button && button.DataContext is FrankenPhpVersionViewModel row)
         {
-            var menu = new MenuFlyout();
+            var menu = new MenuFlyout
+            {
+                Placement = FlyoutPlacementMode.BottomEdgeAlignedRight,
+                ShouldConstrainToRootBounds = true,
+                MenuFlyoutPresenterStyle = Ui.OpaqueMenuPresenterStyle(),
+            };
             if (row.HasRunningJob)
             {
                 menu.Items.Add(Item("Show log", () => ShowFrankenLog(row)));
@@ -328,4 +339,4 @@ private void Changed(object? sender, PropertyChangedEventArgs args)
             OnPropertyChanged(args.PropertyName);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/windows/Flock.Tray/Settings/ServicesPane.xaml b/windows/Flock.Tray/Settings/ServicesPane.xaml
index 0985e8a..39b649b 100644
--- a/windows/Flock.Tray/Settings/ServicesPane.xaml
+++ b/windows/Flock.Tray/Settings/ServicesPane.xaml
@@ -7,59 +7,159 @@
         <settings:InverseBooleanVisibilityConverter x:Key="InverseBooleanVisibilityConverter" />
         <settings:StatusBrushConverter x:Key="StatusBrushConverter" />
         <settings:StringVisibilityConverter x:Key="StringVisibilityConverter" />
+        <Style x:Key="ServiceFilterSegmentStyle" TargetType="RadioButton">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" TextWrapping="Wrap" TextAlignment="Center" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="MinHeight" Value="32" />
+            <Setter Property="UseSystemFocusVisuals" Value="True" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Border x:Name="Segment" Background="Transparent" CornerRadius="4">
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualStateGroup.Transitions>
+                                        <VisualTransition From="Normal" To="PointerOver">
+                                            <Storyboard>
+                                                <DoubleAnimation Storyboard.TargetName="InteractionBackground" Storyboard.TargetProperty="Opacity"
+                                                                 To="1" Duration="0:0:0.1" />
+                                            </Storyboard>
+                                        </VisualTransition>
+                                        <VisualTransition To="Normal">
+                                            <Storyboard>
+                                                <DoubleAnimation Storyboard.TargetName="InteractionBackground" Storyboard.TargetProperty="Opacity"
+                                                                 To="0" Duration="0:0:0.1" />
+                                            </Storyboard>
+                                        </VisualTransition>
+                                    </VisualStateGroup.Transitions>
+                                    <VisualState x:Name="Normal" />
+                                    <VisualState x:Name="PointerOver">
+                                        <VisualState.Setters>
+                                            <Setter Target="InteractionBackground.Opacity" Value="1" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Pressed">
+                                        <VisualState.Setters>
+                                            <Setter Target="InteractionBackground.Opacity" Value="1" />
+                                            <Setter Target="InteractionBackground.Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled">
+                                        <VisualState.Setters>
+                                            <Setter Target="Segment.Opacity" Value="0.4" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="CheckStates">
+                                    <VisualStateGroup.Transitions>
+                                        <VisualTransition From="Unchecked" To="Checked">
+                                            <Storyboard>
+                                                <DoubleAnimation Storyboard.TargetName="SelectedBackground" Storyboard.TargetProperty="Opacity"
+                                                                 To="1" Duration="0:0:0.15" />
+                                            </Storyboard>
+                                        </VisualTransition>
+                                        <VisualTransition From="Checked" To="Unchecked">
+                                            <Storyboard>
+                                                <DoubleAnimation Storyboard.TargetName="SelectedBackground" Storyboard.TargetProperty="Opacity"
+                                                                 To="0" Duration="0:0:0.15" />
+                                            </Storyboard>
+                                        </VisualTransition>
+                                    </VisualStateGroup.Transitions>
+                                    <VisualState x:Name="Unchecked" />
+                                    <VisualState x:Name="Checked">
+                                        <VisualState.Setters>
+                                            <Setter Target="SelectedBackground.Opacity" Value="1" />
+                                            <Setter Target="SegmentContent.Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <Grid>
+                                <Border x:Name="SelectedBackground" Background="{ThemeResource AccentFillColorDefaultBrush}" CornerRadius="4" Opacity="0" />
+                                <Border x:Name="InteractionBackground" Background="{ThemeResource SubtleFillColorSecondaryBrush}" CornerRadius="4" Opacity="0" />
+                                <ContentPresenter x:Name="SegmentContent" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="8,6"
+                                                  Foreground="{TemplateBinding Foreground}"
+                                                  FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center" />
+                            </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </UserControl.Resources>
-    <Grid ColumnSpacing="16">
+    <Grid ColumnSpacing="16" RowSpacing="8">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" /><RowDefinition Height="*" />
+        </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="240" /><ColumnDefinition Width="*" MinWidth="360" />
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0" RowSpacing="4">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /><RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <SelectorBar x:Name="Filter" SelectionChanged="FilterChanged" ToolTipService.ToolTip="Show only installed services, or every service Flock offers"
-                         Margin="-4,-8,0,4">
-                <SelectorBarItem Text="Installed" />
-                <SelectorBarItem Text="All" />
-            </SelectorBar>
-            <ScrollViewer Grid.Row="1" x:Name="ListScroller" VerticalScrollBarVisibility="Auto">
-                <ItemsControl ItemsSource="{Binding VisibleServiceGroups}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Spacing="8" Margin="0,8,0,12">
-                                <TextBlock Text="{Binding Name}" Style="{StaticResource BodyStrongTextBlockStyle}" />
-                                <ItemsControl ItemsSource="{Binding Services}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Button Click="ServiceSelected" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Padding="12,10">
-                                                <Grid ColumnSpacing="8">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
-                                                    </Grid.ColumnDefinitions>
-                                                    <Ellipse Style="{StaticResource StatusDotStyle}"
-                                                             Fill="{Binding Running, Converter={StaticResource StatusBrushConverter}}" />
-                                                    <StackPanel Grid.Column="1" Spacing="2">
-                                                        <TextBlock Text="{Binding Name}" Style="{StaticResource BodyStrongTextBlockStyle}" />
-                                                        <TextBlock Text="{Binding ListDetail}"
-                                                                   Visibility="{Binding ListDetail, Converter={StaticResource StringVisibilityConverter}}"
-                                                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                                    </StackPanel>
-                                                    <TextBlock Grid.Column="2" Text="Install…" VerticalAlignment="Center"
-                                                               Visibility="{Binding Installed, Converter={StaticResource InverseBooleanVisibilityConverter}}"
-                                                               Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
-                                                </Grid>
-                                            </Button>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </ScrollViewer>
-        </Grid>
-        <ScrollViewer Grid.Column="1" x:Name="DetailScroller" VerticalScrollBarVisibility="Auto" HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Disabled">
+        <Border Grid.Column="0" Margin="0,0,14,0" Padding="2" CornerRadius="6"
+                Background="{ThemeResource SubtleFillColorSecondaryBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1">
+            <Grid ColumnSpacing="2" ToolTipService.ToolTip="Show only installed services, or every service Flock offers">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" /><ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <RadioButton x:Name="AllFilter" Content="All" GroupName="ServiceFilter" Checked="FilterChanged"
+                             Style="{StaticResource ServiceFilterSegmentStyle}" />
+                <RadioButton x:Name="InstalledFilter" Grid.Column="1" Content="Installed" GroupName="ServiceFilter" Checked="FilterChanged"
+                             Style="{StaticResource ServiceFilterSegmentStyle}" />
+            </Grid>
+        </Border>
+        <ScrollViewer Grid.Row="1" x:Name="ListScroller" VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Disabled">
+            <ItemsControl ItemsSource="{Binding VisibleServiceGroups}" Margin="0,0,14,0">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Spacing="8" Margin="0,8,0,12">
+                            <TextBlock Text="{Binding Name}" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                            <ItemsControl ItemsSource="{Binding Services}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Spacing="4" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Button Click="ServiceSelected" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Padding="12,10">
+                                            <Grid ColumnSpacing="8">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+                                                <Ellipse Style="{StaticResource StatusDotStyle}"
+                                                         Fill="{Binding Running, Converter={StaticResource StatusBrushConverter}}" />
+                                                <StackPanel Grid.Column="1" Spacing="2">
+                                                    <TextBlock Text="{Binding Name}" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                                    <TextBlock Text="{Binding ListDetail}"
+                                                               Visibility="{Binding ListDetail, Converter={StaticResource StringVisibilityConverter}}"
+                                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                </StackPanel>
+                                                <TextBlock Grid.Column="2" Text="Install…" VerticalAlignment="Center"
+                                                           Visibility="{Binding Installed, Converter={StaticResource InverseBooleanVisibilityConverter}}"
+                                                           Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                                            </Grid>
+                                        </Button>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <ScrollViewer Grid.RowSpan="2" Grid.Column="1" x:Name="DetailScroller" VerticalScrollBarVisibility="Auto" HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Disabled">
             <ContentControl x:Name="DetailHost" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
         </ScrollViewer>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/windows/Flock.Tray/Settings/ServicesPane.xaml.cs b/windows/Flock.Tray/Settings/ServicesPane.xaml.cs
index 2f7b67e..211e80f 100644
--- a/windows/Flock.Tray/Settings/ServicesPane.xaml.cs
+++ b/windows/Flock.Tray/Settings/ServicesPane.xaml.cs
@@ -80,9 +80,9 @@ public void Select(string id)
         rows.SelectedId = id;
     }
 
-    private void FilterChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
+    private void FilterChanged(object sender, RoutedEventArgs args)
     {
-        rows.ShowAll = sender.SelectedItem == Filter.Items[1];
+        rows.ShowAll = ReferenceEquals(sender, AllFilter);
     }
 
     private void ModelChanged()
@@ -103,7 +103,8 @@ private void ServiceSelected(object sender, RoutedEventArgs args)
 
     private void SelectedServiceChanged(ServiceViewModel? service)
     {
-        Filter.SelectedItem = Filter.Items[rows.ShowAll ? 1 : 0];
+        AllFilter.IsChecked = rows.ShowAll;
+        InstalledFilter.IsChecked = !rows.ShowAll;
         if (service is null)
         {
             DetailHost.Content = Ui.EmptyState(Ui.GlyphServer, "No services");
@@ -351,4 +352,4 @@ private async Task EditPort(Service service)
             else await Model.Services.SetPortAsync(service.Id, port);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/windows/Flock.Tray/Settings/SettingsWindow.xaml b/windows/Flock.Tray/Settings/SettingsWindow.xaml
index 08a4cce..b729983 100644
--- a/windows/Flock.Tray/Settings/SettingsWindow.xaml
+++ b/windows/Flock.Tray/Settings/SettingsWindow.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Flock.Tray">
-    <Grid x:Name="WindowRoot" Padding="0,8,0,0">
+    <Grid x:Name="WindowRoot">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -82,7 +82,7 @@
                         <RowDefinition Height="*" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <StackPanel x:Name="PaneHeading" Grid.Row="0" Margin="36,0,36,20" Spacing="2">
+                    <StackPanel x:Name="PaneHeading" Grid.Row="0" Margin="36,16,36,20" Spacing="2">
                         <TextBlock x:Name="PaneTitle" Style="{StaticResource TitleTextBlockStyle}" />
                         <TextBlock x:Name="Subtitle" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                    TextWrapping="Wrap" />
@@ -103,4 +103,4 @@
             </NavigationView.Content>
         </NavigationView>
     </Grid>
-</local:FlockWindow>
\ No newline at end of file
+</local:FlockWindow>
diff --git a/windows/Flock.Tray/Settings/SettingsWindow.xaml.cs b/windows/Flock.Tray/Settings/SettingsWindow.xaml.cs
index 59674ea..2c20b4a 100644
--- a/windows/Flock.Tray/Settings/SettingsWindow.xaml.cs
+++ b/windows/Flock.Tray/Settings/SettingsWindow.xaml.cs
@@ -290,4 +290,4 @@ public override async Task ReleaseAsync()
         }
         await base.ReleaseAsync();
     }
-}
\ No newline at end of file
+}
diff --git a/windows/Flock.Tray/Ui.cs b/windows/Flock.Tray/Ui.cs
index ef5d238..b64c5f7 100644
--- a/windows/Flock.Tray/Ui.cs
+++ b/windows/Flock.Tray/Ui.cs
@@ -55,6 +55,20 @@ internal static class Ui
 
     public static Brush Brush(string key) => Resource<Brush>(key);
 
+    /// <summary>Uses the flyout palette without depending on an acrylic backdrop behind a constrained popup.</summary>
+    public static Style OpaqueMenuPresenterStyle()
+    {
+        var background = Brush("AcrylicBackgroundFillColorDefaultBrush");
+        return new Style(typeof(MenuFlyoutPresenter))
+        {
+            Setters =
+            {
+                new Setter(Control.BackgroundProperty,
+                    background is AcrylicBrush acrylic ? new SolidColorBrush(acrylic.FallbackColor) : background),
+            },
+        };
+    }
+
     public static Brush SecondaryText => Brush("TextFillColorSecondaryBrush");
     public static Brush TertiaryText => Brush("TextFillColorTertiaryBrush");
     public static Brush Success => Brush("SystemFillColorSuccessBrush");
@@ -384,20 +398,41 @@ public static async Task<bool> Confirm(XamlRoot root, string question, string de
         };
         if (destructive)
         {
-            // The accent button style, recolored through the resources its template looks up (the
-            // same red in both themes, so white text stays readable).
-            dialog.PrimaryButtonStyle = Resource<Style>("AccentButtonStyle");
-            var white = new SolidColorBrush(Colors.White);
-            foreach (var (state, red) in new[] { ("", Rgb(196, 43, 28)), ("PointerOver", Rgb(178, 38, 25)), ("Pressed", Rgb(160, 34, 22)) })
+            // A default button gets WinUI's accent fill. Focus Cancel explicitly instead.
+            dialog.DefaultButton = ContentDialogButton.None;
+            dialog.Loaded += (_, _) =>
             {
-                dialog.Resources["AccentButtonBackground" + state] = new SolidColorBrush(red);
-                dialog.Resources["AccentButtonBorderBrush" + state] = new SolidColorBrush(red);
-                dialog.Resources["AccentButtonForeground" + state] = white;
-            }
+                // Keep Cancel neutral and give it the initial keyboard focus.
+                if (FindDialogButton(dialog, "CloseButton") is { } cancel)
+                {
+                    cancel.Style = Resource<Style>("DefaultButtonStyle");
+                    cancel.Focus(FocusState.Programmatic);
+                }
+                // Keep the destructive palette on the action button only.
+                if (FindDialogButton(dialog, "PrimaryButton") is not { } button) return;
+                var white = new SolidColorBrush(Colors.White);
+                foreach (var (state, red) in new[] { ("", Rgb(196, 43, 28)), ("PointerOver", Rgb(178, 38, 25)), ("Pressed", Rgb(160, 34, 22)) })
+                {
+                    button.Resources["AccentButtonBackground" + state] = new SolidColorBrush(red);
+                    button.Resources["AccentButtonBorderBrush" + state] = new SolidColorBrush(red);
+                    button.Resources["AccentButtonForeground" + state] = white;
+                }
+                button.Style = Resource<Style>("AccentButtonStyle");
+            };
         }
         return await dialog.ShowAsync() == ContentDialogResult.Primary;
     }
 
+    private static Button? FindDialogButton(DependencyObject root, string name)
+    {
+        if (root is Button button && button.Name == name) return button;
+        for (var i = 0; i < VisualTreeHelper.GetChildrenCount(root); i++)
+        {
+            if (FindDialogButton(VisualTreeHelper.GetChild(root, i), name) is { } found) return found;
+        }
+        return null;
+    }
+
     /// <summary>Tells the user something that needs no decision: a title, a sentence and OK.</summary>
     public static async Task Inform(XamlRoot root, string title, string details)
     {