From 1bffcfb6fa29f240d8ac59e4e10397ff7cd6ef45 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 22 Jan 2026 09:08:51 -0600
Subject: [PATCH] this settings layout makes more sense

---
 .../Settings/DockSettings.cs                  |   1 -
 .../Dock/DockSettingsToViews.cs               |   2 -
 .../Settings/DockAppearancePage.xaml          | 181 ------------------
 .../Settings/DockAppearancePage.xaml.cs       |  89 ---------
 .../Settings/DockSettingsPage.xaml            | 170 ++++++++++++++--
 .../Settings/DockSettingsPage.xaml.cs         |  88 +++++++--
 .../Settings/SettingsWindow.xaml              |   5 -
 .../Settings/SettingsWindow.xaml.cs           |   1 -
 8 files changed, 226 insertions(+), 311 deletions(-)
 delete mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml
 delete mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml.cs

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/DockSettings.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/DockSettings.cs
index cad04ced7a..173faf40cd 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/DockSettings.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/DockSettings.cs
@@ -101,7 +101,6 @@ public enum DockSize
 
 public enum DockBackdrop
 {
-    Mica,
     Transparent,
     Acrylic,
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockSettingsToViews.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockSettingsToViews.cs
index d7826551aa..bbcf14d3c5 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockSettingsToViews.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockSettingsToViews.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CmdPal.UI.ViewModels.Settings;
-using Microsoft.UI.Xaml.Media;
 using Windows.Win32;
 using WinUIEx;
 
@@ -64,7 +63,6 @@ internal static class DockSettingsToViews
     {
         return backdrop switch
         {
-            DockBackdrop.Mica => new MicaBackdrop(),
             DockBackdrop.Transparent => new TransparentTintBackdrop(),
             DockBackdrop.Acrylic => null, // new DesktopAcrylicBackdrop(),
             _ => throw new NotImplementedException(),
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml
deleted file mode 100644
index a8e136ee94..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Page
-    x:Class="Microsoft.CmdPal.UI.Settings.DockAppearancePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Microsoft.CmdPal.UI.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ptControls="using:Microsoft.CmdPal.UI.Controls"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <ScrollViewer Grid.Row="1">
-            <Grid Padding="16">
-                <StackPanel
-                    MaxWidth="1000"
-                    HorizontalAlignment="Stretch"
-                    Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <!--  Theme Section  -->
-                    <TextBlock x:Uid="DockAppearance_ThemeSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="DockAppearance_AppTheme_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE793;}">
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.DockAppearance.ThemeIndex, Mode=TwoWay}">
-
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_System_Automation" Tag="Default">
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <FontIcon FontSize="16" Glyph="&#xE770;" />
-                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_System" />
-                                </StackPanel>
-                            </ComboBoxItem>
-
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_Light_Automation" Tag="Light">
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <FontIcon FontSize="16" Glyph="&#xE706;" />
-                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_Light" />
-                                </StackPanel>
-                            </ComboBoxItem>
-
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_Dark_Automation" Tag="Dark">
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <FontIcon FontSize="16" Glyph="&#xE708;" />
-                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_Dark" />
-                                </StackPanel>
-                            </ComboBoxItem>
-
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  Backdrop Style  -->
-                    <controls:SettingsCard x:Uid="DockAppearance_Backdrop_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE81E;}">
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.DockAppearance.BackdropIndex, Mode=TwoWay}">
-                            <ComboBoxItem x:Uid="DockAppearance_Backdrop_Mica" />
-                            <ComboBoxItem x:Uid="DockAppearance_Backdrop_Transparent" />
-                            <ComboBoxItem x:Uid="DockAppearance_Backdrop_Acrylic" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  Background / Colorization Section  -->
-                    <controls:SettingsExpander
-                        x:Uid="DockAppearance_Background_SettingsExpander"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
-                        IsExpanded="{x:Bind ViewModel.DockAppearance.IsColorizationDetailsExpanded, Mode=TwoWay}">
-                        <ComboBox
-                            x:Uid="DockAppearance_ColorizationMode"
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            SelectedIndex="{x:Bind ViewModel.DockAppearance.ColorizationModeIndex, Mode=TwoWay}">
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_None" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_WindowsAccent" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_CustomColor" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_Image" />
-                        </ComboBox>
-                        <controls:SettingsExpander.Items>
-                            <!--  none  -->
-                            <controls:SettingsCard
-                                x:Uid="DockAppearance_NoBackground_SettingsCard"
-                                HorizontalContentAlignment="Stretch"
-                                ContentAlignment="Vertical"
-                                Visibility="{x:Bind ViewModel.DockAppearance.IsNoBackgroundVisible, Mode=OneWay}">
-                                <TextBlock
-                                    x:Uid="DockAppearance_NoBackground_DescriptionTextBlock"
-                                    Margin="24"
-                                    HorizontalAlignment="Stretch"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    HorizontalTextAlignment="Center"
-                                    TextAlignment="Center"
-                                    TextWrapping="WrapWholeWords" />
-                            </controls:SettingsCard>
-
-                            <!--  system accent color  -->
-                            <controls:SettingsCard x:Uid="DockAppearance_WindowsAccentColor_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsAccentColorControlsVisible, Mode=OneWay}">
-                                <controls:SettingsCard.Description>
-                                    <TextBlock>
-                                        <Run x:Uid="Settings_GeneralPage_WindowsAccentColor_SettingsCard_Description1" />
-                                        <Hyperlink
-                                            Click="OpenWindowsColorsSettings_Click"
-                                            TextDecorations="None"
-                                            UnderlineStyle="None">
-                                            <Run x:Uid="Settings_GeneralPage_WindowsAccentColor_OpenWindowsColorsLinkText" />
-                                        </Hyperlink>
-                                    </TextBlock>
-                                </controls:SettingsCard.Description>
-                                <controls:SettingsCard.Content>
-                                    <Border
-                                        MinWidth="32"
-                                        MinHeight="32"
-                                        CornerRadius="{ThemeResource ControlCornerRadius}">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{x:Bind ViewModel.DockAppearance.EffectiveThemeColor, Mode=OneWay}" />
-                                        </Border.Background>
-                                    </Border>
-                                </controls:SettingsCard.Content>
-                            </controls:SettingsCard>
-
-                            <!--  background image  -->
-                            <controls:SettingsCard
-                                x:Uid="DockAppearance_BackgroundImage_SettingsCard"
-                                Description="{x:Bind ViewModel.DockAppearance.BackgroundImagePath, Mode=OneWay}"
-                                Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
-                                <Button x:Uid="Settings_GeneralPage_BackgroundImage_ChooseImageButton" Click="PickBackgroundImage_Click" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageBrightness_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
-                                <Slider
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Maximum="100"
-                                    Minimum="-100"
-                                    StepFrequency="1"
-                                    Value="{x:Bind ViewModel.DockAppearance.BackgroundImageBrightness, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageBlur_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
-                                <Slider
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Maximum="50"
-                                    Minimum="0"
-                                    StepFrequency="1"
-                                    Value="{x:Bind ViewModel.DockAppearance.BackgroundImageBlurAmount, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageFit_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.DockAppearance.BackgroundImageFitIndex, Mode=TwoWay}">
-                                    <ComboBoxItem x:Uid="BackgroundImageFit_ComboBoxItem_Fill" />
-                                    <ComboBoxItem x:Uid="BackgroundImageFit_ComboBoxItem_Stretch" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                            <!--  Background tint color and intensity  -->
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundTint_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsCustomTintVisible, Mode=OneWay}">
-                                <ptControls:ColorPickerButton
-                                    HasSelectedColor="True"
-                                    IsAlphaEnabled="False"
-                                    PaletteColors="{x:Bind ViewModel.DockAppearance.Swatches}"
-                                    SelectedColor="{x:Bind ViewModel.DockAppearance.ThemeColor, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundTintIntensity_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsCustomTintIntensityVisible, Mode=OneWay}">
-                                <Slider
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Maximum="100"
-                                    Minimum="1"
-                                    StepFrequency="1"
-                                    Value="{x:Bind ViewModel.DockAppearance.ColorIntensity, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <!--  Reset background image properties  -->
-                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImage_ResetProperties_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button x:Uid="Settings_GeneralPage_Background_ResetImagePropertiesButton" Command="{x:Bind ViewModel.DockAppearance.ResetBackgroundImagePropertiesCommand}" />
-                                </StackPanel>
-                            </controls:SettingsCard>
-
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml.cs
deleted file mode 100644
index b2f83412c9..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockAppearancePage.xaml.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using ManagedCommon;
-using Microsoft.CmdPal.UI.ViewModels;
-using Microsoft.CmdPal.UI.ViewModels.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.Windows.Storage.Pickers;
-
-namespace Microsoft.CmdPal.UI.Settings;
-
-/// <summary>
-/// Settings page for configuring the appearance of the dock.
-/// </summary>
-public sealed partial class DockAppearancePage : Page
-{
-    private readonly TaskScheduler _mainTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-
-    internal SettingsViewModel ViewModel { get; }
-
-    public DockAppearancePage()
-    {
-        InitializeComponent();
-
-        var settings = App.Current.Services.GetService<SettingsModel>()!;
-        var themeService = App.Current.Services.GetRequiredService<IThemeService>();
-        var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
-        ViewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
-    }
-
-    private async void PickBackgroundImage_Click(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            if (XamlRoot?.ContentIslandEnvironment is null)
-            {
-                return;
-            }
-
-            var windowId = XamlRoot?.ContentIslandEnvironment?.AppWindowId ?? new WindowId(0);
-
-            var picker = new FileOpenPicker(windowId)
-            {
-                CommitButtonText = ViewModels.Properties.Resources.builtin_settings_appearance_pick_background_image_title!,
-                SuggestedStartLocation = PickerLocationId.PicturesLibrary,
-                ViewMode = PickerViewMode.Thumbnail,
-            };
-
-            string[] extensions = [".png", ".bmp", ".jpg", ".jpeg", ".jfif", ".gif", ".tiff", ".tif", ".webp", ".jxr"];
-            foreach (var ext in extensions)
-            {
-                picker.FileTypeFilter!.Add(ext);
-            }
-
-            var file = await picker.PickSingleFileAsync()!;
-            if (file != null)
-            {
-                ViewModel.DockAppearance.BackgroundImagePath = file.Path ?? string.Empty;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Failed to pick background image file for dock", ex);
-        }
-    }
-
-    private void OpenWindowsColorsSettings_Click(Hyperlink sender, HyperlinkClickEventArgs args)
-    {
-        // LOAD BEARING (or BEAR LOADING?): Process.Start with UseShellExecute inside a XAML input event can trigger WinUI reentrancy
-        // and cause FailFast crashes. Task.Run moves the call off the UI thread to prevent hard process termination.
-        Task.Run(() =>
-        {
-            try
-            {
-                _ = Process.Start(new ProcessStartInfo("ms-settings:colors") { UseShellExecute = true });
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to open Windows Settings", ex);
-            }
-        });
-    }
-}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
index d0a278e1cf..2a2059bdc7 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
@@ -73,21 +73,6 @@
                         </ComboBox>
                     </controls:SettingsCard>
 
-                    <!--  Backdrop Style  -->
-                    <controls:SettingsCard Header="Background Style">
-                        <controls:SettingsCard.Description>
-                            Choose the background effect for your dock
-                        </controls:SettingsCard.Description>
-                        <ComboBox
-                            x:Name="BackdropComboBox"
-                            MinWidth="120"
-                            SelectedIndex="{x:Bind SelectedBackdropIndex, Mode=TwoWay}">
-                            <ComboBoxItem Content="Mica" />
-                            <ComboBoxItem Content="Transparent" />
-                            <ComboBoxItem Content="Acrylic" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
                     <!--  Show Labels  -->
                     <controls:SettingsCard Header="Show Labels">
                         <controls:SettingsCard.Description>
@@ -98,9 +83,162 @@
                             IsOn="{x:Bind ShowLabels, Mode=TwoWay}"
                             OffContent="Hide labels"
                             OnContent="Show Labels" />
-
                     </controls:SettingsCard>
 
+                    <!--  Theme Section  -->
+                    <TextBlock x:Uid="DockAppearance_ThemeSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="DockAppearance_AppTheme_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE793;}">
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.DockAppearance.ThemeIndex, Mode=TwoWay}">
+
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_System_Automation" Tag="Default">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="16" Glyph="&#xE770;" />
+                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_System" />
+                                </StackPanel>
+                            </ComboBoxItem>
+
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_Light_Automation" Tag="Light">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="16" Glyph="&#xE706;" />
+                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_Light" />
+                                </StackPanel>
+                            </ComboBoxItem>
+
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_AppTheme_Mode_Dark_Automation" Tag="Dark">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="16" Glyph="&#xE708;" />
+                                    <TextBlock x:Uid="Settings_GeneralPage_AppTheme_Mode_Dark" />
+                                </StackPanel>
+                            </ComboBoxItem>
+
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <!--  Backdrop Style  -->
+                    <controls:SettingsCard x:Uid="DockAppearance_Backdrop_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE81E;}">
+                        <ComboBox
+                            x:Name="BackdropComboBox"
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind ViewModel.DockAppearance.BackdropIndex, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="DockAppearance_Backdrop_Transparent" />
+                            <ComboBoxItem x:Uid="DockAppearance_Backdrop_Acrylic" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <!--  Background / Colorization Section  -->
+                    <controls:SettingsExpander
+                        x:Uid="DockAppearance_Background_SettingsExpander"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
+                        IsExpanded="{x:Bind ViewModel.DockAppearance.IsColorizationDetailsExpanded, Mode=TwoWay}">
+                        <ComboBox
+                            x:Uid="DockAppearance_ColorizationMode"
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind ViewModel.DockAppearance.ColorizationModeIndex, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_None" />
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_WindowsAccent" />
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_CustomColor" />
+                            <ComboBoxItem x:Uid="Settings_GeneralPage_ColorizationMode_Image" />
+                        </ComboBox>
+                        <controls:SettingsExpander.Items>
+                            <!--  none  -->
+                            <controls:SettingsCard
+                                x:Uid="DockAppearance_NoBackground_SettingsCard"
+                                HorizontalContentAlignment="Stretch"
+                                ContentAlignment="Vertical"
+                                Visibility="{x:Bind ViewModel.DockAppearance.IsNoBackgroundVisible, Mode=OneWay}">
+                                <TextBlock
+                                    x:Uid="DockAppearance_NoBackground_DescriptionTextBlock"
+                                    Margin="24"
+                                    HorizontalAlignment="Stretch"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    HorizontalTextAlignment="Center"
+                                    TextAlignment="Center"
+                                    TextWrapping="WrapWholeWords" />
+                            </controls:SettingsCard>
+
+                            <!--  system accent color  -->
+                            <controls:SettingsCard x:Uid="DockAppearance_WindowsAccentColor_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsAccentColorControlsVisible, Mode=OneWay}">
+                                <controls:SettingsCard.Description>
+                                    <TextBlock>
+                                        <Run x:Uid="Settings_GeneralPage_WindowsAccentColor_SettingsCard_Description1" />
+                                        <Hyperlink
+                                            Click="OpenWindowsColorsSettings_Click"
+                                            TextDecorations="None"
+                                            UnderlineStyle="None">
+                                            <Run x:Uid="Settings_GeneralPage_WindowsAccentColor_OpenWindowsColorsLinkText" />
+                                        </Hyperlink>
+                                    </TextBlock>
+                                </controls:SettingsCard.Description>
+                                <controls:SettingsCard.Content>
+                                    <Border
+                                        MinWidth="32"
+                                        MinHeight="32"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}">
+                                        <Border.Background>
+                                            <SolidColorBrush Color="{x:Bind ViewModel.DockAppearance.EffectiveThemeColor, Mode=OneWay}" />
+                                        </Border.Background>
+                                    </Border>
+                                </controls:SettingsCard.Content>
+                            </controls:SettingsCard>
+
+                            <!--  background image  -->
+                            <controls:SettingsCard
+                                x:Uid="DockAppearance_BackgroundImage_SettingsCard"
+                                Description="{x:Bind ViewModel.DockAppearance.BackgroundImagePath, Mode=OneWay}"
+                                Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
+                                <Button x:Uid="Settings_GeneralPage_BackgroundImage_ChooseImageButton" Click="PickBackgroundImage_Click" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageBrightness_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="-100"
+                                    StepFrequency="1"
+                                    Value="{x:Bind ViewModel.DockAppearance.BackgroundImageBrightness, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageBlur_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="50"
+                                    Minimum="0"
+                                    StepFrequency="1"
+                                    Value="{x:Bind ViewModel.DockAppearance.BackgroundImageBlurAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImageFit_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind ViewModel.DockAppearance.BackgroundImageFitIndex, Mode=TwoWay}">
+                                    <ComboBoxItem x:Uid="BackgroundImageFit_ComboBoxItem_Fill" />
+                                    <ComboBoxItem x:Uid="BackgroundImageFit_ComboBoxItem_Stretch" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+
+                            <!--  Background tint color and intensity  -->
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundTint_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsCustomTintVisible, Mode=OneWay}">
+                                <cpControls:ColorPickerButton
+                                    HasSelectedColor="True"
+                                    IsAlphaEnabled="False"
+                                    PaletteColors="{x:Bind ViewModel.DockAppearance.Swatches}"
+                                    SelectedColor="{x:Bind ViewModel.DockAppearance.ThemeColor, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundTintIntensity_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsCustomTintIntensityVisible, Mode=OneWay}">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="1"
+                                    StepFrequency="1"
+                                    Value="{x:Bind ViewModel.DockAppearance.ColorIntensity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <!--  Reset background image properties  -->
+                            <controls:SettingsCard x:Uid="DockAppearance_BackgroundImage_ResetProperties_SettingsCard" Visibility="{x:Bind ViewModel.DockAppearance.IsBackgroundControlsVisible, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <Button x:Uid="Settings_GeneralPage_Background_ResetImagePropertiesButton" Command="{x:Bind ViewModel.DockAppearance.ResetBackgroundImagePropertiesCommand}" />
+                                </StackPanel>
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
                     <!--  Bands Section  -->
                     <TextBlock x:Uid="DockBandsSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
index f981581570..18bf976836 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
@@ -2,12 +2,17 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics;
+using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Dock;
 using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.Windows.Storage.Pickers;
 
 namespace Microsoft.CmdPal.UI.Settings;
 
@@ -15,7 +20,7 @@ public sealed partial class DockSettingsPage : Page
 {
     private readonly TaskScheduler _mainTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
-    private readonly SettingsViewModel viewModel;
+    internal SettingsViewModel ViewModel { get; }
 
     public List<DockBandSettingsViewModel> AllDockBandItems => GetAllBandSettings();
 
@@ -27,7 +32,7 @@ public sealed partial class DockSettingsPage : Page
         var themeService = App.Current.Services.GetService<IThemeService>()!;
         var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
 
-        viewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
+        ViewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
 
         // Initialize UI state
         InitializeSettings();
@@ -41,29 +46,82 @@ public sealed partial class DockSettingsPage : Page
         BackdropComboBox.SelectedIndex = SelectedBackdropIndex;
     }
 
+    private async void PickBackgroundImage_Click(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            if (XamlRoot?.ContentIslandEnvironment is null)
+            {
+                return;
+            }
+
+            var windowId = XamlRoot?.ContentIslandEnvironment?.AppWindowId ?? new Microsoft.UI.WindowId(0);
+
+            var picker = new FileOpenPicker(windowId)
+            {
+                CommitButtonText = ViewModels.Properties.Resources.builtin_settings_appearance_pick_background_image_title!,
+                SuggestedStartLocation = PickerLocationId.PicturesLibrary,
+                ViewMode = PickerViewMode.Thumbnail,
+            };
+
+            string[] extensions = [".png", ".bmp", ".jpg", ".jpeg", ".jfif", ".gif", ".tiff", ".tif", ".webp", ".jxr"];
+            foreach (var ext in extensions)
+            {
+                picker.FileTypeFilter!.Add(ext);
+            }
+
+            var file = await picker.PickSingleFileAsync()!;
+            if (file != null)
+            {
+                ViewModel.DockAppearance.BackgroundImagePath = file.Path ?? string.Empty;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to pick background image file for dock", ex);
+        }
+    }
+
+    private void OpenWindowsColorsSettings_Click(Hyperlink sender, HyperlinkClickEventArgs args)
+    {
+        // LOAD BEARING (or BEAR LOADING?): Process.Start with UseShellExecute inside a XAML input event can trigger WinUI reentrancy
+        // and cause FailFast crashes. Task.Run moves the call off the UI thread to prevent hard process termination.
+        Task.Run(() =>
+        {
+            try
+            {
+                _ = Process.Start(new ProcessStartInfo("ms-settings:colors") { UseShellExecute = true });
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to open Windows Settings", ex);
+            }
+        });
+    }
+
     // Property bindings for ComboBoxes
     public int SelectedDockSizeIndex
     {
-        get => DockSizeToSelectedIndex(viewModel.Dock_DockSize);
-        set => viewModel.Dock_DockSize = SelectedIndexToDockSize(value);
+        get => DockSizeToSelectedIndex(ViewModel.Dock_DockSize);
+        set => ViewModel.Dock_DockSize = SelectedIndexToDockSize(value);
     }
 
     public int SelectedSideIndex
     {
-        get => SideToSelectedIndex(viewModel.Dock_Side);
-        set => viewModel.Dock_Side = SelectedIndexToSide(value);
+        get => SideToSelectedIndex(ViewModel.Dock_Side);
+        set => ViewModel.Dock_Side = SelectedIndexToSide(value);
     }
 
     public int SelectedBackdropIndex
     {
-        get => BackdropToSelectedIndex(viewModel.Dock_Backdrop);
-        set => viewModel.Dock_Backdrop = SelectedIndexToBackdrop(value);
+        get => BackdropToSelectedIndex(ViewModel.Dock_Backdrop);
+        set => ViewModel.Dock_Backdrop = SelectedIndexToBackdrop(value);
     }
 
     public bool ShowLabels
     {
-        get => viewModel.Dock_ShowLabels;
-        set => viewModel.Dock_ShowLabels = value;
+        get => ViewModel.Dock_ShowLabels;
+        set => ViewModel.Dock_ShowLabels = value;
     }
 
     // Conversion methods for ComboBox bindings
@@ -103,17 +161,15 @@ public sealed partial class DockSettingsPage : Page
 
     private static int BackdropToSelectedIndex(DockBackdrop backdrop) => backdrop switch
     {
-        DockBackdrop.Mica => 0,
-        DockBackdrop.Transparent => 1,
-        DockBackdrop.Acrylic => 2,
+        DockBackdrop.Transparent => 0,
+        DockBackdrop.Acrylic => 1,
         _ => 2,
     };
 
     private static DockBackdrop SelectedIndexToBackdrop(int index) => index switch
     {
-        0 => DockBackdrop.Mica,
-        1 => DockBackdrop.Transparent,
-        2 => DockBackdrop.Acrylic,
+        0 => DockBackdrop.Transparent,
+        1 => DockBackdrop.Acrylic,
         _ => DockBackdrop.Acrylic,
     };
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
index 5bec51652b..641f975d79 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
@@ -78,11 +78,6 @@
                     x:Uid="Settings_GeneralPage_NavigationViewItem_Dock"
                     Icon="{ui:FontIcon Glyph=&#xF596;}"
                     Tag="Dock" />
-                <NavigationViewItem
-                    x:Name="DockAppearancePageNavItem"
-                    x:Uid="Settings_NavigationViewItem_DockAppearance"
-                    Icon="{ui:FontIcon Glyph=&#xE790;}"
-                    Tag="DockAppearance" />
             </NavigationView.MenuItems>
             <Grid>
                 <Grid.RowDefinitions>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
index 14a963d0fd..1b78fce161 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
@@ -109,7 +109,6 @@ public sealed partial class SettingsWindow : WindowEx,
             "Appearance" => typeof(AppearancePage),
             "Extensions" => typeof(ExtensionsPage),
             "Dock" => typeof(DockSettingsPage),
-            "DockAppearance" => typeof(DockAppearancePage),
             _ => null,
         };