From 2293b76f7b9c60443673480b801589b50b7cc4a9 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 19 Jan 2026 11:26:51 +0100
Subject: [PATCH 1/9] Dragging works

---
 .../Dock/DockViewModel.cs                     |  66 ++++++
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml |  85 ++++++--
 .../Dock/DockControl.xaml.cs                  | 198 ++++++++++++++++--
 3 files changed, 307 insertions(+), 42 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
index 45f969fd57..222b664a64 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
@@ -19,6 +19,7 @@ public sealed partial class DockViewModel : IDisposable,
     IPageContext
 {
     private readonly TopLevelCommandManager _topLevelCommandManager;
+    private readonly SettingsModel _settingsModel;
 
     private DockSettings _settings;
 
@@ -38,6 +39,7 @@ public sealed partial class DockViewModel : IDisposable,
         TaskScheduler scheduler)
     {
         _topLevelCommandManager = tlcManager;
+        _settingsModel = settings;
         _settings = settings.DockSettings;
         Scheduler = scheduler;
         WeakReferenceMessenger.Default.Register<CommandsReloadedMessage>(this);
@@ -137,6 +139,70 @@ public sealed partial class DockViewModel : IDisposable,
         return null;
     }
 
+    /// <summary>
+    /// Moves a dock band to a new position, either within the same side or to the other side.
+    /// This method updates both the UI collections and persists the change to settings.
+    /// </summary>
+    /// <param name="band">The band to move.</param>
+    /// <param name="targetSide">The target side (Start or End) for the band.</param>
+    /// <param name="targetIndex">The index within the target side to insert the band.</param>
+    public void MoveBand(DockBandViewModel band, DockPinSide targetSide, int targetIndex)
+    {
+        var bandId = band.Id;
+        var dockSettings = _settingsModel.DockSettings;
+
+        // Find and remove the band settings from both lists
+        var bandSettings = dockSettings.StartBands.FirstOrDefault(b => b.Id == bandId)
+                        ?? dockSettings.EndBands.FirstOrDefault(b => b.Id == bandId);
+
+        if (bandSettings == null)
+        {
+            Logger.LogWarning($"Could not find band settings for band {bandId}");
+            return;
+        }
+
+        // Remove from both sides
+        dockSettings.StartBands.RemoveAll(b => b.Id == bandId);
+        dockSettings.EndBands.RemoveAll(b => b.Id == bandId);
+
+        // Also update the UI collections
+        StartItems.Remove(band);
+        EndItems.Remove(band);
+
+        // Add to the target side at the specified index
+        switch (targetSide)
+        {
+            case DockPinSide.Start:
+                {
+                    var insertIndex = Math.Min(targetIndex, dockSettings.StartBands.Count);
+                    dockSettings.StartBands.Insert(insertIndex, bandSettings);
+
+                    var uiInsertIndex = Math.Min(targetIndex, StartItems.Count);
+                    StartItems.Insert(uiInsertIndex, band);
+                    break;
+                }
+
+            case DockPinSide.End:
+                {
+                    var insertIndex = Math.Min(targetIndex, dockSettings.EndBands.Count);
+                    dockSettings.EndBands.Insert(insertIndex, bandSettings);
+
+                    var uiInsertIndex = Math.Min(targetIndex, EndItems.Count);
+                    EndItems.Insert(uiInsertIndex, band);
+                    break;
+                }
+
+            case DockPinSide.None:
+            default:
+                // Band is being unpinned - no UI update needed as it won't be visible
+                break;
+        }
+
+        // Persist the change
+        SettingsModel.SaveSettings(_settingsModel);
+        Logger.LogDebug($"Moved band {bandId} to {targetSide} at index {targetIndex}");
+    }
+
     public void ShowException(Exception ex, string? extensionHint = null)
     {
         var extensionText = extensionHint ?? "<unknown>";
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index fce5ea5fd5..f30e23e86d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -38,12 +38,15 @@
                 Control="{x:Bind}" />
 
             <DataTemplate x:Key="DeskbandTemplate" x:DataType="dockVm:DockItemViewModel">
-                <Button
+                <Border
+                    Padding="4,2,4,2"
                     VerticalAlignment="Stretch"
-                    DataContext="{x:Bind}"
-                    RightTapped="BandItem_RightTapped"
-                    Style="{StaticResource TaskBarButtonStyle}"
-                    Tapped="BandItem_Tapped"
+                    Background="Transparent"
+                    CornerRadius="{ThemeResource ControlCornerRadius}"
+                    PointerEntered="BandItem_PointerEntered"
+                    PointerExited="BandItem_PointerExited"
+                    PointerPressed="BandItem_PointerPressed"
+                    PointerReleased="BandItem_PointerReleased"
                     ToolTipService.ToolTip="{x:Bind Tooltip, Mode=OneWay}">
 
                     <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}" Background="Transparent">
@@ -60,6 +63,7 @@
                             Visibility="{x:Bind Icon, Converter={StaticResource IconInfoVisibilityConverter}, Mode=OneWay}">
                             <cpcontrols:IconBox
                                 x:Name="IconBorder"
+                                Width="16"
                                 VerticalAlignment="Center"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -98,7 +102,7 @@
                                 Visibility="{x:Bind Subtitle, Mode=OneWay, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
                         </StackPanel>
                     </Grid>
-                </Button>
+                </Border>
             </DataTemplate>
 
             <DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel">
@@ -114,6 +118,25 @@
                 </ItemsRepeater>
             </DataTemplate>
 
+            <Style x:Key="DockBandListViewStyle" TargetType="ListView">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="IsItemClickEnabled" Value="False" />
+                <Setter Property="SelectionMode" Value="None" />
+                <Setter Property="CanDragItems" Value="True" />
+                <Setter Property="CanReorderItems" Value="True" />
+                <Setter Property="AllowDrop" Value="True" />
+            </Style>
+
+            <Style x:Key="DockBandListViewItemStyle" TargetType="ListViewItem">
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="Margin" Value="0,0,4,0" />
+                <Setter Property="MinHeight" Value="0" />
+                <Setter Property="MinWidth" Value="0" />
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="VerticalContentAlignment" Value="Stretch" />
+            </Style>
+
             <Style
                 x:Name="ContextMenuFlyoutStyle"
                 BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
@@ -159,16 +182,27 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <cpcontrols:ScrollContainer.Source>
-                    <ItemsRepeater
-                        x:Name="StartItemsRepeater"
+                    <ListView
+                        x:Name="StartItemsListView"
                         HorizontalAlignment="Stretch"
+                        AllowDrop="True"
+                        CanDragItems="True"
+                        CanReorderItems="True"
+                        DragItemsCompleted="BandListView_DragItemsCompleted"
+                        DragItemsStarting="BandListView_DragItemsStarting"
+                        DragOver="BandListView_DragOver"
+                        Drop="StartItemsListView_Drop"
+                        ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
                         ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}"
-                        Layout="{StaticResource ItemsOrientation}">
-                        <ItemsRepeater.Transitions>
-                            <TransitionCollection />
-                        </ItemsRepeater.Transitions>
-                    </ItemsRepeater>
+                        SelectionMode="None"
+                        Style="{StaticResource DockBandListViewStyle}">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                    </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
 
@@ -177,15 +211,26 @@
                 Grid.Column="1"
                 ContentAlignment="End">
                 <cpcontrols:ScrollContainer.Source>
-                    <ItemsRepeater
-                        x:Name="EndItemsRepeater"
+                    <ListView
+                        x:Name="EndItemsListView"
+                        AllowDrop="True"
+                        CanDragItems="True"
+                        CanReorderItems="True"
+                        DragItemsCompleted="BandListView_DragItemsCompleted"
+                        DragItemsStarting="BandListView_DragItemsStarting"
+                        DragOver="BandListView_DragOver"
+                        Drop="EndItemsListView_Drop"
+                        ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
                         ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}"
-                        Layout="{StaticResource ItemsOrientation}">
-                        <ItemsRepeater.Transitions>
-                            <TransitionCollection />
-                        </ItemsRepeater.Transitions>
-                    </ItemsRepeater>
+                        SelectionMode="None"
+                        Style="{StaticResource DockBandListViewStyle}">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                    </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
         </Grid>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index b2b2058b6f..855f9b3c58 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -16,6 +16,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Media;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.UI.Dock;
@@ -129,39 +130,46 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
-    private void BandItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+    private void BandItem_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
     {
-        var pos = e.GetPosition(null);
-        var button = sender as Button;
-        var item = button?.DataContext as DockItemViewModel;
-
-        if (item is not null)
+        if (sender is Border border)
         {
-            // Use the center of the button as the point to open at. This is
-            // more reliable than using the tap position. This allows multiple
-            // clicks anywhere in the button to open the palette in a consistent
-            // location.
-            var buttonPos = button!.TransformToVisual(null).TransformPoint(new Point(0, 0));
-            var buttonCenter = new Point(
-                buttonPos.X + (button.ActualWidth / 2),
-                buttonPos.Y + (button.ActualHeight / 2));
-
-            InvokeItem(item, buttonCenter);
+            border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPointerOver"];
         }
     }
 
-    private void BandItem_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
+    private void BandItem_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
     {
-        var pos = e.GetPosition(null);
-        var button = sender as Button;
-        var item = button?.DataContext as DockItemViewModel;
-        if (item is not null)
+        if (sender is Border border)
+        {
+            border.Background = new SolidColorBrush(Colors.Transparent);
+        }
+    }
+
+    private void BandItem_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        var border = sender as Border;
+        var item = border?.DataContext as DockItemViewModel;
+
+        if (item is null || border is null)
+        {
+            return;
+        }
+
+        var pointerPoint = e.GetCurrentPoint(border);
+        var properties = pointerPoint.Properties;
+
+        if (properties.IsLeftButtonPressed)
+        {
+            border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPressed"];
+        }
+        else if (properties.IsRightButtonPressed)
         {
             if (item.HasMoreCommands)
             {
                 ContextControl.ViewModel.SelectedItem = item;
                 ContextMenuFlyout.ShowAt(
-                button,
+                border,
                 new FlyoutShowOptions()
                 {
                     ShowMode = FlyoutShowMode.Standard,
@@ -172,6 +180,39 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
+    private void BandItem_PointerReleased(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        var border = sender as Border;
+        var item = border?.DataContext as DockItemViewModel;
+
+        if (item is null || border is null)
+        {
+            return;
+        }
+
+        var pointerPoint = e.GetCurrentPoint(border);
+
+        // Reset background to hover state since pointer is still over
+        border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPointerOver"];
+
+        // Only invoke on left button release
+        if (!pointerPoint.Properties.IsLeftButtonPressed && !pointerPoint.Properties.IsRightButtonPressed)
+        {
+            // Check if pointer is still within bounds (wasn't a drag)
+            var pos = pointerPoint.Position;
+            if (pos.X >= 0 && pos.X <= border.ActualWidth && pos.Y >= 0 && pos.Y <= border.ActualHeight)
+            {
+                // Use the center of the border as the point to open at
+                var borderPos = border.TransformToVisual(null).TransformPoint(new Point(0, 0));
+                var borderCenter = new Point(
+                    borderPos.X + (border.ActualWidth / 2),
+                    borderPos.Y + (border.ActualHeight / 2));
+
+                InvokeItem(item, borderCenter);
+            }
+        }
+    }
+
     private void InvokeItem(DockItemViewModel item, global::Windows.Foundation.Point pos)
     {
         var command = item.Command;
@@ -256,6 +297,119 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
         return HorizontalAlignment.Center;
     }
+
+    private DockBandViewModel? _draggedBand;
+
+    private void BandListView_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
+    {
+        if (e.Items.Count > 0 && e.Items[0] is DockBandViewModel band)
+        {
+            _draggedBand = band;
+            e.Data.RequestedOperation = DataPackageOperation.Move;
+        }
+    }
+
+    private void BandListView_DragOver(object sender, DragEventArgs e)
+    {
+        if (_draggedBand != null)
+        {
+            e.AcceptedOperation = DataPackageOperation.Move;
+        }
+    }
+
+    private void BandListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+    {
+        // This handles reordering within the same list
+        if (args.DropResult == DataPackageOperation.Move && _draggedBand != null)
+        {
+            var isStartList = sender == StartItemsListView;
+            var targetSide = isStartList ? DockPinSide.Start : DockPinSide.End;
+            var targetCollection = isStartList ? ViewModel.StartItems : ViewModel.EndItems;
+
+            // Find the new index of the dragged band
+            var newIndex = targetCollection.IndexOf(_draggedBand);
+            if (newIndex >= 0)
+            {
+                ViewModel.MoveBand(_draggedBand, targetSide, newIndex);
+            }
+        }
+
+        _draggedBand = null;
+    }
+
+    private void StartItemsListView_Drop(object sender, DragEventArgs e)
+    {
+        HandleCrossListDrop(DockPinSide.Start, e);
+    }
+
+    private void EndItemsListView_Drop(object sender, DragEventArgs e)
+    {
+        HandleCrossListDrop(DockPinSide.End, e);
+    }
+
+    private void HandleCrossListDrop(DockPinSide targetSide, DragEventArgs e)
+    {
+        if (_draggedBand == null)
+        {
+            return;
+        }
+
+        // Check if this is a cross-list drop (dragging from the other list)
+        var isInStart = ViewModel.StartItems.Contains(_draggedBand);
+        var isInEnd = ViewModel.EndItems.Contains(_draggedBand);
+
+        var sourceIsStart = isInStart;
+        var targetIsStart = targetSide == DockPinSide.Start;
+
+        // Only handle cross-list drops here; same-list reorders are handled in DragItemsCompleted
+        if (sourceIsStart != targetIsStart)
+        {
+            // Calculate drop index based on drop position
+            var targetListView = targetIsStart ? StartItemsListView : EndItemsListView;
+            var targetCollection = targetIsStart ? ViewModel.StartItems : ViewModel.EndItems;
+
+            var dropIndex = GetDropIndex(targetListView, e, targetCollection.Count);
+
+            // Move the band to the new side
+            ViewModel.MoveBand(_draggedBand, targetSide, dropIndex);
+            e.Handled = true;
+        }
+    }
+
+    private int GetDropIndex(ListView listView, DragEventArgs e, int itemCount)
+    {
+        var position = e.GetPosition(listView);
+
+        // Find the item at the drop position
+        for (var i = 0; i < itemCount; i++)
+        {
+            if (listView.ContainerFromIndex(i) is ListViewItem container)
+            {
+                var itemBounds = container.TransformToVisual(listView).TransformBounds(
+                    new Rect(0, 0, container.ActualWidth, container.ActualHeight));
+
+                if (ItemsOrientation == Orientation.Horizontal)
+                {
+                    // For horizontal layout, check X position
+                    if (position.X < itemBounds.X + (itemBounds.Width / 2))
+                    {
+                        return i;
+                    }
+                }
+                else
+                {
+                    // For vertical layout, check Y position
+                    if (position.Y < itemBounds.Y + (itemBounds.Height / 2))
+                    {
+                        return i;
+                    }
+                }
+            }
+        }
+
+        // If we're past all items, insert at the end
+        return itemCount;
+    }
 }
 
 internal sealed partial class BandAlignmentConverter : Microsoft.UI.Xaml.Data.IValueConverter

From e02d384051335ff00b57f8d5b2c69e5068e76731 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 19 Jan 2026 12:56:24 +0100
Subject: [PATCH 2/9] Edit mode

---
 .../Dock/DockViewModel.cs                     |  13 +-
 .../Microsoft.CmdPal.UI.ViewModels/Icons.cs   |   2 +
 .../Messages/EnterDockEditModeMessage.cs      |   7 +
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml |  50 +++++--
 .../Dock/DockControl.xaml.cs                  | 127 +++++++++++-------
 5 files changed, 140 insertions(+), 59 deletions(-)
 create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/EnterDockEditModeMessage.cs

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
index 222b664a64..a6f33258c4 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
@@ -230,18 +230,29 @@ public sealed partial class DockViewModel : IDisposable,
     {
         public DockContextMenuItem()
         {
+            var editDockCommand = new AnonymousCommand(
+                action: () =>
+                {
+                    WeakReferenceMessenger.Default.Send(new EnterDockEditModeMessage());
+                })
+            {
+                Name = "Edit dock", // TODO!Loc
+                Icon = Icons.EditIcon,
+            };
+
             var openSettingsCommand = new AnonymousCommand(
                 action: () =>
                 {
                     WeakReferenceMessenger.Default.Send(new OpenSettingsMessage("Dock"));
                 })
             {
-                Name = "Customize", // TODO!Loc
+                Name = "Dock settings", // TODO!Loc
                 Icon = Icons.SettingsIcon,
             };
 
             MoreCommands = new CommandContextItem[]
             {
+                new CommandContextItem(editDockCommand),
                 new CommandContextItem(openSettingsCommand),
             };
         }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Icons.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Icons.cs
index 3cc1cd2564..5474fdb470 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Icons.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Icons.cs
@@ -13,4 +13,6 @@ internal sealed class Icons
     internal static IconInfo UnpinIcon => new("\uE77A"); // Unpin icon
 
     internal static IconInfo SettingsIcon => new("\uE713"); // Settings icon
+
+    internal static IconInfo EditIcon => new("\uE70F"); // Edit icon
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/EnterDockEditModeMessage.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/EnterDockEditModeMessage.cs
new file mode 100644
index 0000000000..b9329ba77e
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/EnterDockEditModeMessage.cs
@@ -0,0 +1,7 @@
+// 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.
+
+namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+
+public record EnterDockEditModeMessage();
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index f30e23e86d..dde280f64c 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -45,8 +45,8 @@
                     CornerRadius="{ThemeResource ControlCornerRadius}"
                     PointerEntered="BandItem_PointerEntered"
                     PointerExited="BandItem_PointerExited"
-                    PointerPressed="BandItem_PointerPressed"
-                    PointerReleased="BandItem_PointerReleased"
+                    Tapped="BandItem_Tapped"
+                    RightTapped="BandItem_RightTapped"
                     ToolTipService.ToolTip="{x:Bind Tooltip, Mode=OneWay}">
 
                     <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}" Background="Transparent">
@@ -99,7 +99,7 @@
                                 TextAlignment="Center"
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap"
-                                Visibility="{x:Bind Subtitle, Mode=OneWay, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
+                                Visibility="{x:Bind HasSubtitle, Mode=OneWay}" />
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -123,9 +123,10 @@
                 <Setter Property="Padding" Value="0" />
                 <Setter Property="IsItemClickEnabled" Value="False" />
                 <Setter Property="SelectionMode" Value="None" />
-                <Setter Property="CanDragItems" Value="True" />
-                <Setter Property="CanReorderItems" Value="True" />
-                <Setter Property="AllowDrop" Value="True" />
+                <!--  Drag properties controlled by code-behind based on IsEditMode  -->
+                <Setter Property="CanDragItems" Value="False" />
+                <Setter Property="CanReorderItems" Value="False" />
+                <Setter Property="AllowDrop" Value="False" />
             </Style>
 
             <Style x:Key="DockBandListViewItemStyle" TargetType="ListViewItem">
@@ -166,10 +167,19 @@
         BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
         BorderThickness="0,0,0,1"
         RightTapped="RootGrid_RightTapped">
+
+        <!--  Edit Mode Overlay - shown when in edit mode  -->
+        <Border
+            x:Name="EditModeOverlay"
+            Background="{ThemeResource SystemAccentColorDark2}"
+            IsHitTestVisible="False"
+            Opacity="0" />
+
         <Grid x:Name="ContentGrid" Padding="0,0,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*" />
                 <ColumnDefinition x:Name="EndColumn" Width="Auto" />
+                <ColumnDefinition x:Name="DoneButtonColumn" Width="Auto" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="2*" />
@@ -185,9 +195,6 @@
                     <ListView
                         x:Name="StartItemsListView"
                         HorizontalAlignment="Stretch"
-                        AllowDrop="True"
-                        CanDragItems="True"
-                        CanReorderItems="True"
                         DragItemsCompleted="BandListView_DragItemsCompleted"
                         DragItemsStarting="BandListView_DragItemsStarting"
                         DragOver="BandListView_DragOver"
@@ -213,9 +220,6 @@
                 <cpcontrols:ScrollContainer.Source>
                     <ListView
                         x:Name="EndItemsListView"
-                        AllowDrop="True"
-                        CanDragItems="True"
-                        CanReorderItems="True"
                         DragItemsCompleted="BandListView_DragItemsCompleted"
                         DragItemsStarting="BandListView_DragItemsStarting"
                         DragOver="BandListView_DragOver"
@@ -233,6 +237,17 @@
                     </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
+
+            <!--  Done button - appears when in edit mode  -->
+            <Button
+                x:Name="DoneEditingButton"
+                Grid.Column="2"
+                Margin="8,0,8,0"
+                Padding="12,4"
+                VerticalAlignment="Center"
+                Click="DoneEditingButton_Click"
+                Content="Done"
+                Visibility="Collapsed" />
         </Grid>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="DockOrientation">
@@ -313,6 +328,17 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
+
+            <!--  Edit Mode Visual States  -->
+            <VisualStateGroup x:Name="EditModeStates">
+                <VisualState x:Name="EditModeOff" />
+                <VisualState x:Name="EditModeOn">
+                    <VisualState.Setters>
+                        <Setter Target="DoneEditingButton.Visibility" Value="Visible" />
+                        <Setter Target="EditModeOverlay.Opacity" Value="0.1" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index 855f9b3c58..1b1b79d6f3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -9,6 +9,7 @@ using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Dock;
+using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.UI;
@@ -23,7 +24,7 @@ namespace Microsoft.CmdPal.UI.Dock;
 
 #pragma warning disable SA1402 // File may only contain a single type
 
-public sealed partial class DockControl : UserControl, INotifyPropertyChanged, IRecipient<CloseContextMenuMessage>
+public sealed partial class DockControl : UserControl, INotifyPropertyChanged, IRecipient<CloseContextMenuMessage>, IRecipient<EnterDockEditModeMessage>
 {
     private DockViewModel _viewModel;
 
@@ -57,6 +58,20 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
+    public bool IsEditMode
+    {
+        get => field;
+        set
+        {
+            if (field != value)
+            {
+                field = value;
+                PropertyChanged?.Invoke(this, new(nameof(IsEditMode)));
+                UpdateEditMode(value);
+            }
+        }
+    }
+
     public double IconSize
     {
         get => field;
@@ -110,6 +125,49 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         _viewModel = viewModel;
         InitializeComponent();
         WeakReferenceMessenger.Default.Register<CloseContextMenuMessage>(this);
+        WeakReferenceMessenger.Default.Register<EnterDockEditModeMessage>(this);
+
+        // Start with edit mode disabled - normal click behavior
+        UpdateEditMode(false);
+    }
+
+    public void Receive(EnterDockEditModeMessage message)
+    {
+        // Message may arrive from a background thread, dispatch to UI thread
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            EnterEditMode();
+        });
+    }
+
+    private void UpdateEditMode(bool isEditMode)
+    {
+        // Enable/disable drag-and-drop based on edit mode
+        StartItemsListView.CanDragItems = isEditMode;
+        StartItemsListView.CanReorderItems = isEditMode;
+        StartItemsListView.AllowDrop = isEditMode;
+
+        EndItemsListView.CanDragItems = isEditMode;
+        EndItemsListView.CanReorderItems = isEditMode;
+        EndItemsListView.AllowDrop = isEditMode;
+
+        // Update visual state
+        VisualStateManager.GoToState(this, isEditMode ? "EditModeOn" : "EditModeOff", true);
+    }
+
+    internal void EnterEditMode()
+    {
+        IsEditMode = true;
+    }
+
+    internal void ExitEditMode()
+    {
+        IsEditMode = false;
+    }
+
+    private void DoneEditingButton_Click(object sender, RoutedEventArgs e)
+    {
+        ExitEditMode();
     }
 
     internal void UpdateSettings(DockSettings settings)
@@ -146,7 +204,7 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
-    private void BandItem_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    private void BandItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
     {
         var border = sender as Border;
         var item = border?.DataContext as DockItemViewModel;
@@ -156,60 +214,37 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
             return;
         }
 
-        var pointerPoint = e.GetCurrentPoint(border);
-        var properties = pointerPoint.Properties;
+        // Use the center of the border as the point to open at
+        var borderPos = border.TransformToVisual(null).TransformPoint(new Point(0, 0));
+        var borderCenter = new Point(
+            borderPos.X + (border.ActualWidth / 2),
+            borderPos.Y + (border.ActualHeight / 2));
 
-        if (properties.IsLeftButtonPressed)
+        InvokeItem(item, borderCenter);
+        e.Handled = true;
+    }
+
+    private void BandItem_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
+    {
+        var border = sender as Border;
+        var item = border?.DataContext as DockItemViewModel;
+
+        if (item is null || border is null)
         {
-            border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPressed"];
+            return;
         }
-        else if (properties.IsRightButtonPressed)
+
+        if (item.HasMoreCommands)
         {
-            if (item.HasMoreCommands)
-            {
-                ContextControl.ViewModel.SelectedItem = item;
-                ContextMenuFlyout.ShowAt(
+            ContextControl.ViewModel.SelectedItem = item;
+            ContextMenuFlyout.ShowAt(
                 border,
                 new FlyoutShowOptions()
                 {
                     ShowMode = FlyoutShowMode.Standard,
                     Placement = FlyoutPlacementMode.TopEdgeAlignedRight,
                 });
-                e.Handled = true;
-            }
-        }
-    }
-
-    private void BandItem_PointerReleased(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        var border = sender as Border;
-        var item = border?.DataContext as DockItemViewModel;
-
-        if (item is null || border is null)
-        {
-            return;
-        }
-
-        var pointerPoint = e.GetCurrentPoint(border);
-
-        // Reset background to hover state since pointer is still over
-        border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPointerOver"];
-
-        // Only invoke on left button release
-        if (!pointerPoint.Properties.IsLeftButtonPressed && !pointerPoint.Properties.IsRightButtonPressed)
-        {
-            // Check if pointer is still within bounds (wasn't a drag)
-            var pos = pointerPoint.Position;
-            if (pos.X >= 0 && pos.X <= border.ActualWidth && pos.Y >= 0 && pos.Y <= border.ActualHeight)
-            {
-                // Use the center of the border as the point to open at
-                var borderPos = border.TransformToVisual(null).TransformPoint(new Point(0, 0));
-                var borderCenter = new Point(
-                    borderPos.X + (border.ActualWidth / 2),
-                    borderPos.Y + (border.ActualHeight / 2));
-
-                InvokeItem(item, borderCenter);
-            }
+            e.Handled = true;
         }
     }
 

From d55bad14575dad18e1ccfe7b4a2bafe6175d9700 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 19 Jan 2026 15:04:33 +0100
Subject: [PATCH 3/9] ITS WORKING

---
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml   | 17 +++++++++--------
 .../Dock/DockControl.xaml.cs                    | 12 ++++++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index dde280f64c..9b5f5ecb4f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -106,16 +106,17 @@
             </DataTemplate>
 
             <DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel">
-                <ItemsRepeater
-                    x:Name="BandItemsRepeater"
+                <!--  Use ItemsControl instead of ItemsRepeater - it doesn't intercept pointer events  -->
+                <ItemsControl
                     HorizontalAlignment="{x:Bind Items, Converter={StaticResource BandAlignmentConverter}, Mode=OneWay}"
                     ItemTemplate="{StaticResource DeskbandTemplate}"
-                    ItemsSource="{x:Bind Items, Mode=OneWay}"
-                    Layout="{StaticResource ItemsOrientation}">
-                    <ItemsRepeater.Transitions>
-                        <TransitionCollection />
-                    </ItemsRepeater.Transitions>
-                </ItemsRepeater>
+                    ItemsSource="{x:Bind Items, Mode=OneWay}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" Spacing="4" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                </ItemsControl>
             </DataTemplate>
 
             <Style x:Key="DockBandListViewStyle" TargetType="ListView">
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index 1b1b79d6f3..838d26b8e3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -206,6 +206,12 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
     private void BandItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
     {
+        // Ignore clicks when in edit mode - allow drag behavior instead
+        if (IsEditMode)
+        {
+            return;
+        }
+
         var border = sender as Border;
         var item = border?.DataContext as DockItemViewModel;
 
@@ -226,6 +232,12 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
     private void BandItem_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
     {
+        // Ignore right-clicks when in edit mode
+        if (IsEditMode)
+        {
+            return;
+        }
+
         var border = sender as Border;
         var item = border?.DataContext as DockItemViewModel;
 

From 6e7add6feb159e07522fc3c8de68fe85ff05e33c Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 19 Jan 2026 20:45:48 +0100
Subject: [PATCH 4/9] Adding discard button and moving content to a control

---
 .../Dock/DockViewModel.cs                     | 156 +++++++++++++++---
 .../cmdpal/Microsoft.CmdPal.UI/App.xaml       |   1 +
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml |  58 +++----
 .../Dock/DockControl.xaml.cs                  |  29 +++-
 .../Dock/DockItemControl.xaml                 |  86 ++++++++++
 .../Dock/DockItemControl.xaml.cs              | 120 ++++++++++++++
 .../Microsoft.CmdPal.UI.csproj                |   7 +
 7 files changed, 398 insertions(+), 59 deletions(-)
 create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
 create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
index a6f33258c4..643eab57f0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs
@@ -140,18 +140,41 @@ public sealed partial class DockViewModel : IDisposable,
     }
 
     /// <summary>
-    /// Moves a dock band to a new position, either within the same side or to the other side.
-    /// This method updates both the UI collections and persists the change to settings.
+    /// Syncs the band position in settings after a same-list reorder.
+    /// Does not save to disk - call SaveBandOrder() when done editing.
     /// </summary>
-    /// <param name="band">The band to move.</param>
-    /// <param name="targetSide">The target side (Start or End) for the band.</param>
-    /// <param name="targetIndex">The index within the target side to insert the band.</param>
-    public void MoveBand(DockBandViewModel band, DockPinSide targetSide, int targetIndex)
+    public void SyncBandPosition(DockBandViewModel band, DockPinSide targetSide, int targetIndex)
+    {
+        var bandId = band.Id;
+        var dockSettings = _settingsModel.DockSettings;
+
+        var bandSettings = dockSettings.StartBands.FirstOrDefault(b => b.Id == bandId)
+                        ?? dockSettings.EndBands.FirstOrDefault(b => b.Id == bandId);
+
+        if (bandSettings == null)
+        {
+            return;
+        }
+
+        // Remove from both settings lists
+        dockSettings.StartBands.RemoveAll(b => b.Id == bandId);
+        dockSettings.EndBands.RemoveAll(b => b.Id == bandId);
+
+        // Add to target settings list at the correct index
+        var targetSettings = targetSide == DockPinSide.Start ? dockSettings.StartBands : dockSettings.EndBands;
+        var insertIndex = Math.Min(targetIndex, targetSettings.Count);
+        targetSettings.Insert(insertIndex, bandSettings);
+    }
+
+    /// <summary>
+    /// Moves a dock band to a new position (cross-list drop).
+    /// Does not save to disk - call SaveBandOrder() when done editing.
+    /// </summary>
+    public void MoveBandWithoutSaving(DockBandViewModel band, DockPinSide targetSide, int targetIndex)
     {
         var bandId = band.Id;
         var dockSettings = _settingsModel.DockSettings;
 
-        // Find and remove the band settings from both lists
         var bandSettings = dockSettings.StartBands.FirstOrDefault(b => b.Id == bandId)
                         ?? dockSettings.EndBands.FirstOrDefault(b => b.Id == bandId);
 
@@ -161,11 +184,9 @@ public sealed partial class DockViewModel : IDisposable,
             return;
         }
 
-        // Remove from both sides
+        // Remove from both sides (settings and UI)
         dockSettings.StartBands.RemoveAll(b => b.Id == bandId);
         dockSettings.EndBands.RemoveAll(b => b.Id == bandId);
-
-        // Also update the UI collections
         StartItems.Remove(band);
         EndItems.Remove(band);
 
@@ -174,33 +195,118 @@ public sealed partial class DockViewModel : IDisposable,
         {
             case DockPinSide.Start:
                 {
-                    var insertIndex = Math.Min(targetIndex, dockSettings.StartBands.Count);
-                    dockSettings.StartBands.Insert(insertIndex, bandSettings);
+                    var settingsIndex = Math.Min(targetIndex, dockSettings.StartBands.Count);
+                    dockSettings.StartBands.Insert(settingsIndex, bandSettings);
 
-                    var uiInsertIndex = Math.Min(targetIndex, StartItems.Count);
-                    StartItems.Insert(uiInsertIndex, band);
+                    var uiIndex = Math.Min(targetIndex, StartItems.Count);
+                    StartItems.Insert(uiIndex, band);
                     break;
                 }
 
             case DockPinSide.End:
                 {
-                    var insertIndex = Math.Min(targetIndex, dockSettings.EndBands.Count);
-                    dockSettings.EndBands.Insert(insertIndex, bandSettings);
+                    var settingsIndex = Math.Min(targetIndex, dockSettings.EndBands.Count);
+                    dockSettings.EndBands.Insert(settingsIndex, bandSettings);
 
-                    var uiInsertIndex = Math.Min(targetIndex, EndItems.Count);
-                    EndItems.Insert(uiInsertIndex, band);
+                    var uiIndex = Math.Min(targetIndex, EndItems.Count);
+                    EndItems.Insert(uiIndex, band);
                     break;
                 }
-
-            case DockPinSide.None:
-            default:
-                // Band is being unpinned - no UI update needed as it won't be visible
-                break;
         }
 
-        // Persist the change
+        Logger.LogDebug($"Moved band {bandId} to {targetSide} at index {targetIndex} (not saved yet)");
+    }
+
+    /// <summary>
+    /// Saves the current band order to settings.
+    /// Call this when exiting edit mode.
+    /// </summary>
+    public void SaveBandOrder()
+    {
+        _snapshotStartBands = null;
+        _snapshotEndBands = null;
         SettingsModel.SaveSettings(_settingsModel);
-        Logger.LogDebug($"Moved band {bandId} to {targetSide} at index {targetIndex}");
+        Logger.LogDebug("Saved band order to settings");
+    }
+
+    private List<DockBandSettings>? _snapshotStartBands;
+    private List<DockBandSettings>? _snapshotEndBands;
+
+    /// <summary>
+    /// Takes a snapshot of the current band order before editing.
+    /// Call this when entering edit mode.
+    /// </summary>
+    public void SnapshotBandOrder()
+    {
+        var dockSettings = _settingsModel.DockSettings;
+        _snapshotStartBands = dockSettings.StartBands.Select(b => new DockBandSettings { Id = b.Id }).ToList();
+        _snapshotEndBands = dockSettings.EndBands.Select(b => new DockBandSettings { Id = b.Id }).ToList();
+        Logger.LogDebug($"Snapshot taken: {_snapshotStartBands.Count} start bands, {_snapshotEndBands.Count} end bands");
+    }
+
+    /// <summary>
+    /// Restores the band order from the snapshot taken when entering edit mode.
+    /// Call this when discarding edit mode changes.
+    /// </summary>
+    public void RestoreBandOrder()
+    {
+        if (_snapshotStartBands == null || _snapshotEndBands == null)
+        {
+            Logger.LogWarning("No snapshot to restore from");
+            return;
+        }
+
+        var dockSettings = _settingsModel.DockSettings;
+
+        // Restore settings from snapshot
+        dockSettings.StartBands.Clear();
+        dockSettings.EndBands.Clear();
+
+        foreach (var bandSnapshot in _snapshotStartBands)
+        {
+            var bandSettings = new DockBandSettings { Id = bandSnapshot.Id };
+            dockSettings.StartBands.Add(bandSettings);
+        }
+
+        foreach (var bandSnapshot in _snapshotEndBands)
+        {
+            var bandSettings = new DockBandSettings { Id = bandSnapshot.Id };
+            dockSettings.EndBands.Add(bandSettings);
+        }
+
+        // Rebuild UI collections from restored settings
+        RebuildUICollections();
+
+        _snapshotStartBands = null;
+        _snapshotEndBands = null;
+        Logger.LogDebug("Restored band order from snapshot");
+    }
+
+    private void RebuildUICollections()
+    {
+        var dockSettings = _settingsModel.DockSettings;
+
+        // Create a lookup of all current band ViewModels
+        var allBands = StartItems.Concat(EndItems).ToDictionary(b => b.Id);
+
+        StartItems.Clear();
+        EndItems.Clear();
+
+        foreach (var bandSettings in dockSettings.StartBands)
+        {
+            if (allBands.TryGetValue(bandSettings.Id, out var bandVM))
+            {
+                StartItems.Add(bandVM);
+            }
+        }
+
+        foreach (var bandSettings in dockSettings.EndBands)
+        {
+            if (allBands.TryGetValue(bandSettings.Id, out var bandVM))
+            {
+                EndItems.Add(bandVM);
+            }
+        }
     }
 
     public void ShowException(Exception ex, string? extensionHint = null)
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
index c702cb49f4..b826870df8 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
@@ -20,6 +20,7 @@
                 <ResourceDictionary Source="ms-appx:///Controls/Tag.xaml" />
                 <ResourceDictionary Source="ms-appx:///Controls/KeyVisual/KeyVisual.xaml" />
                 <ResourceDictionary Source="ms-appx:///Controls/IsEnabledTextBlock.xaml" />
+                <ResourceDictionary Source="ms-appx:///Dock/DockItemControl.xaml" />
                 <!--  Default theme dictionary  -->
                 <ResourceDictionary Source="ms-appx:///Styles/Theme.Normal.xaml" />
                 <services:MutableOverridesDictionary />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index 9b5f5ecb4f..225864f5cd 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -16,10 +16,9 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <StackLayout
-                x:Key="ItemsOrientation"
-                Orientation="{x:Bind ItemsOrientation, Mode=OneWay}"
-                Spacing="4" />
+            <ItemsPanelTemplate x:Key="ItemsOrientation">
+                <StackPanel Orientation="Horizontal" Spacing="4" />
+            </ItemsPanelTemplate>
 
             <Style x:Key="ResizingIconStyle" TargetType="cpcontrols:IconBox">
                 <Setter Property="Height" Value="{x:Bind IconSize, Mode=OneWay}" />
@@ -45,15 +44,14 @@
                     CornerRadius="{ThemeResource ControlCornerRadius}"
                     PointerEntered="BandItem_PointerEntered"
                     PointerExited="BandItem_PointerExited"
-                    Tapped="BandItem_Tapped"
                     RightTapped="BandItem_RightTapped"
+                    Tapped="BandItem_Tapped"
                     ToolTipService.ToolTip="{x:Bind Tooltip, Mode=OneWay}">
 
                     <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}" Background="Transparent">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
                         <StackPanel
@@ -168,7 +166,6 @@
         BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
         BorderThickness="0,0,0,1"
         RightTapped="RootGrid_RightTapped">
-
         <!--  Edit Mode Overlay - shown when in edit mode  -->
         <Border
             x:Name="EditModeOverlay"
@@ -202,15 +199,10 @@
                         Drop="StartItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
+                        ItemsPanel="{StaticResource ItemsOrientation}"
                         ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}"
                         SelectionMode="None"
-                        Style="{StaticResource DockBandListViewStyle}">
-                        <ListView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ListView.ItemsPanel>
-                    </ListView>
+                        Style="{StaticResource DockBandListViewStyle}" />
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
 
@@ -227,28 +219,35 @@
                         Drop="EndItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
+                        ItemsPanel="{StaticResource ItemsOrientation}"
                         ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}"
                         SelectionMode="None"
-                        Style="{StaticResource DockBandListViewStyle}">
-                        <ListView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ListView.ItemsPanel>
-                    </ListView>
+                        Style="{StaticResource DockBandListViewStyle}" />
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
 
-            <!--  Done button - appears when in edit mode  -->
-            <Button
-                x:Name="DoneEditingButton"
+            <!--  Edit mode buttons - appear when in edit mode  -->
+            <StackPanel
                 Grid.Column="2"
-                Margin="8,0,8,0"
-                Padding="12,4"
                 VerticalAlignment="Center"
-                Click="DoneEditingButton_Click"
-                Content="Done"
-                Visibility="Collapsed" />
+                Orientation="Horizontal"
+                Spacing="4">
+                <Button
+                    x:Name="DiscardEditingButton"
+                    Margin="8,0,0,0"
+                    Padding="12,4"
+                    Click="DiscardEditingButton_Click"
+                    Content="Discard"
+                    Visibility="Collapsed" />
+                <Button
+                    x:Name="DoneEditingButton"
+                    Margin="0,0,8,0"
+                    Padding="12,4"
+                    Click="DoneEditingButton_Click"
+                    Content="Done"
+                    Style="{StaticResource AccentButtonStyle}"
+                    Visibility="Collapsed" />
+            </StackPanel>
         </Grid>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="DockOrientation">
@@ -336,6 +335,7 @@
                 <VisualState x:Name="EditModeOn">
                     <VisualState.Setters>
                         <Setter Target="DoneEditingButton.Visibility" Value="Visible" />
+                        <Setter Target="DiscardEditingButton.Visibility" Value="Visible" />
                         <Setter Target="EditModeOverlay.Opacity" Value="0.1" />
                     </VisualState.Setters>
                 </VisualState>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index 838d26b8e3..7fc3798b37 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -157,12 +157,25 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
     internal void EnterEditMode()
     {
+        // Snapshot current state so we can restore on discard
+        ViewModel.SnapshotBandOrder();
         IsEditMode = true;
     }
 
     internal void ExitEditMode()
     {
         IsEditMode = false;
+
+        // Save all changes when exiting edit mode
+        ViewModel.SaveBandOrder();
+    }
+
+    internal void DiscardEditMode()
+    {
+        IsEditMode = false;
+
+        // Restore the original band order from snapshot
+        ViewModel.RestoreBandOrder();
     }
 
     private void DoneEditingButton_Click(object sender, RoutedEventArgs e)
@@ -170,6 +183,11 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         ExitEditMode();
     }
 
+    private void DiscardEditingButton_Click(object sender, RoutedEventArgs e)
+    {
+        DiscardEditMode();
+    }
+
     internal void UpdateSettings(DockSettings settings)
     {
         DockSide = settings.Side;
@@ -366,18 +384,19 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
     private void BandListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
     {
-        // This handles reordering within the same list
+        // Reordering within the same list is handled automatically by ListView
+        // We just need to sync the ViewModel order without saving
         if (args.DropResult == DataPackageOperation.Move && _draggedBand != null)
         {
             var isStartList = sender == StartItemsListView;
             var targetSide = isStartList ? DockPinSide.Start : DockPinSide.End;
             var targetCollection = isStartList ? ViewModel.StartItems : ViewModel.EndItems;
 
-            // Find the new index of the dragged band
+            // Find the new index and sync ViewModel (without saving)
             var newIndex = targetCollection.IndexOf(_draggedBand);
             if (newIndex >= 0)
             {
-                ViewModel.MoveBand(_draggedBand, targetSide, newIndex);
+                ViewModel.SyncBandPosition(_draggedBand, targetSide, newIndex);
             }
         }
 
@@ -417,8 +436,8 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
 
             var dropIndex = GetDropIndex(targetListView, e, targetCollection.Count);
 
-            // Move the band to the new side
-            ViewModel.MoveBand(_draggedBand, targetSide, dropIndex);
+            // Move the band to the new side (without saving - save happens on Done)
+            ViewModel.MoveBandWithoutSaving(_draggedBand, targetSide, dropIndex);
             e.Handled = true;
         }
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
new file mode 100644
index 0000000000..82a512e4e4
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:local="using:Microsoft.CmdPal.UI.Dock">
+
+    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
+    <Style BasedOn="{StaticResource DefaultDockItemControlStyle}" TargetType="local:DockItemControl" />
+
+    <Style x:Key="DefaultDockItemControlStyle" TargetType="local:DockItemControl">
+        <Style.Setters>
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="local:DockItemControl">
+                        <Border
+                            x:Name="PART_RootGrid"
+                            Padding="4,2,4,2"
+                            VerticalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ToolTipService.ToolTip="{TemplateBinding ToolTip}">
+                            <Grid AutomationProperties.Name="{TemplateBinding Title}" Background="Transparent">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <!--  Icon  -->
+                                <ContentPresenter
+                                    Grid.Column="0"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding Icon}"
+                                    Visibility="{Binding HasIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+
+                                <!--  Text (Title + Subtitle)  -->
+                                <StackPanel
+                                    Grid.Column="1"
+                                    Margin="8,0,8,0"
+                                    VerticalAlignment="Center"
+                                    Visibility="{Binding HasText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <TextBlock
+                                        x:Name="TitleTextBlock"
+                                        Margin="0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        FontSize="12"
+                                        Text="{TemplateBinding Title}"
+                                        TextAlignment="Left"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap" />
+                                    <TextBlock
+                                        x:Name="SubTitleTextBlock"
+                                        MaxWidth="100"
+                                        Margin="0,-4,0,0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        FontSize="10"
+                                        Foreground="{ThemeResource TextFillColorTertiary}"
+                                        Text="{TemplateBinding Subtitle}"
+                                        TextAlignment="Center"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap"
+                                        Visibility="{Binding HasSubtitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                </StackPanel>
+                            </Grid>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Normal" />
+                                    <VisualState x:Name="PointerOver">
+                                        <VisualState.Setters>
+                                            <Setter Target="PART_RootGrid.Background" Value="{ThemeResource TaskBarButtonBackgroundPointerOver}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+</ResourceDictionary>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
new file mode 100644
index 0000000000..103f03dc2e
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
@@ -0,0 +1,120 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Markup;
+
+namespace Microsoft.CmdPal.UI.Dock;
+
+[ContentProperty(Name = nameof(Icon))]
+public sealed partial class DockItemControl : Control
+{
+    public DockItemControl()
+    {
+        DefaultStyleKey = typeof(DockItemControl);
+    }
+
+    public static readonly DependencyProperty ToolTipProperty =
+        DependencyProperty.Register(nameof(ToolTip), typeof(string), typeof(DockItemControl), new PropertyMetadata(null));
+
+    public string ToolTip
+    {
+        get => (string)GetValue(ToolTipProperty);
+        set => SetValue(ToolTipProperty, value);
+    }
+
+    public static readonly DependencyProperty TitleProperty =
+        DependencyProperty.Register(nameof(Title), typeof(string), typeof(DockItemControl), new PropertyMetadata(null));
+
+    public string Title
+    {
+        get => (string)GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    public static readonly DependencyProperty HasTextProperty =
+        DependencyProperty.Register(nameof(HasText), typeof(bool), typeof(DockItemControl), new PropertyMetadata(true));
+
+    public bool HasText
+    {
+        get => (bool)GetValue(HasTextProperty);
+        set => SetValue(HasTextProperty, value);
+    }
+
+    public static readonly DependencyProperty SubtitleProperty =
+        DependencyProperty.Register(nameof(Subtitle), typeof(string), typeof(DockItemControl), new PropertyMetadata(null));
+
+    public string Subtitle
+    {
+        get => (string)GetValue(SubtitleProperty);
+        set => SetValue(SubtitleProperty, value);
+    }
+
+    public static readonly DependencyProperty HasSubtitleProperty =
+        DependencyProperty.Register(nameof(HasSubtitle), typeof(bool), typeof(DockItemControl), new PropertyMetadata(false));
+
+    public bool HasSubtitle
+    {
+        get => (bool)GetValue(HasSubtitleProperty);
+        set => SetValue(HasSubtitleProperty, value);
+    }
+
+    public static readonly DependencyProperty IconProperty =
+        DependencyProperty.Register(nameof(Icon), typeof(object), typeof(DockItemControl), new PropertyMetadata(null));
+
+    public object Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public static readonly DependencyProperty HasIconProperty =
+        DependencyProperty.Register(nameof(HasIcon), typeof(bool), typeof(DockItemControl), new PropertyMetadata(true));
+
+    public bool HasIcon
+    {
+        get => (bool)GetValue(HasIconProperty);
+        set => SetValue(HasIconProperty, value);
+    }
+
+    public event TappedEventHandler? ItemTapped;
+
+    public event RightTappedEventHandler? ItemRightTapped;
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        // Wire up pointer events from the root border
+        if (GetTemplateChild("PART_RootGrid") is Border rootBorder)
+        {
+            rootBorder.Tapped += RootBorder_Tapped;
+            rootBorder.RightTapped += RootBorder_RightTapped;
+            rootBorder.PointerEntered += RootBorder_PointerEntered;
+            rootBorder.PointerExited += RootBorder_PointerExited;
+        }
+    }
+
+    private void RootBorder_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        ItemTapped?.Invoke(this, e);
+    }
+
+    private void RootBorder_RightTapped(object sender, RightTappedRoutedEventArgs e)
+    {
+        ItemRightTapped?.Invoke(this, e);
+    }
+
+    private void RootBorder_PointerEntered(object sender, PointerRoutedEventArgs e)
+    {
+        VisualStateManager.GoToState(this, "PointerOver", true);
+    }
+
+    private void RootBorder_PointerExited(object sender, PointerRoutedEventArgs e)
+    {
+        VisualStateManager.GoToState(this, "Normal", true);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
index 99609e8dc1..2dc5f6e03b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -79,6 +79,7 @@
     <None Remove="Controls\ScreenPreview.xaml" />
     <None Remove="Controls\ScrollContainer.xaml" />
     <None Remove="Controls\SearchBar.xaml" />
+    <None Remove="Dock\DockItemControl.xaml" />
     <None Remove="IsEnabledTextBlock.xaml" />
     <None Remove="ListDetailPage.xaml" />
     <None Remove="LoadingPage.xaml" />
@@ -220,6 +221,12 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Dock\DockItemControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="Controls\ScrollContainer.xaml">
       <Generator>MSBuild:Compile</Generator>

From 17aa472af568ee26e4f91e6fd31371d235b5561a Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 21 Jan 2026 17:16:42 +0100
Subject: [PATCH 5/9] Moving the content to its own control

---
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml | 145 ++++++------------
 .../Dock/DockControl.xaml.cs                  |  86 +++++------
 .../Dock/DockItemControl.xaml                 |  87 ++++++++---
 .../Dock/DockItemControl.xaml.cs              | 127 +++++++++------
 4 files changed, 236 insertions(+), 209 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index 225864f5cd..dc7706a756 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -16,10 +16,6 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <ItemsPanelTemplate x:Key="ItemsOrientation">
-                <StackPanel Orientation="Horizontal" Spacing="4" />
-            </ItemsPanelTemplate>
-
             <Style x:Key="ResizingIconStyle" TargetType="cpcontrols:IconBox">
                 <Setter Property="Height" Value="{x:Bind IconSize, Mode=OneWay}" />
                 <Setter Property="MaxWidth" Value="{x:Bind IconSize, Mode=OneWay}" />
@@ -31,34 +27,18 @@
             </Style>
 
             <local:IconInfoVisibilityConverter x:Key="IconInfoVisibilityConverter" />
-            <local:BandAlignmentConverter
-                x:Key="BandAlignmentConverter"
-                x:Name="BandAlignmentConverter"
-                Control="{x:Bind}" />
+            <local:BandAlignmentConverter x:Key="BandAlignmentConverter" Control="{x:Bind}" />
 
             <DataTemplate x:Key="DeskbandTemplate" x:DataType="dockVm:DockItemViewModel">
-                <Border
-                    Padding="4,2,4,2"
-                    VerticalAlignment="Stretch"
-                    Background="Transparent"
-                    CornerRadius="{ThemeResource ControlCornerRadius}"
-                    PointerEntered="BandItem_PointerEntered"
-                    PointerExited="BandItem_PointerExited"
-                    RightTapped="BandItem_RightTapped"
-                    Tapped="BandItem_Tapped"
-                    ToolTipService.ToolTip="{x:Bind Tooltip, Mode=OneWay}">
-
-                    <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}" Background="Transparent">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <StackPanel
-                            Grid.Column="0"
-                            VerticalAlignment="Center"
-                            Orientation="Vertical"
-                            Visibility="{x:Bind Icon, Converter={StaticResource IconInfoVisibilityConverter}, Mode=OneWay}">
+                <Grid>
+                    <TextBlock Opacity="0" Style="{StaticResource ResizingTitleTextBlock}" />
+                    <local:DockItemControl
+                        Title="{x:Bind Title, Mode=OneWay}"
+                        RightTapped="BandItem_RightTapped"
+                        Subtitle="{x:Bind Subtitle, Mode=OneWay}"
+                        Tapped="BandItem_Tapped"
+                        ToolTip="{x:Bind Tooltip, Mode=OneWay}">
+                        <local:DockItemControl.Icon>
                             <cpcontrols:IconBox
                                 x:Name="IconBorder"
                                 Width="16"
@@ -68,39 +48,9 @@
                                 SourceKey="{x:Bind Icon, Mode=OneWay}"
                                 SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}"
                                 Style="{StaticResource ResizingIconStyle}" />
-                        </StackPanel>
-                        <StackPanel
-                            Grid.Column="1"
-                            Margin="8,0,8,0"
-                            VerticalAlignment="Center"
-                            Visibility="{x:Bind HasText, Mode=OneWay}">
-                            <TextBlock
-                                x:Name="TitleTextBlock"
-                                Margin="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="12"
-                                Style="{StaticResource ResizingTitleTextBlock}"
-                                Text="{x:Bind Title, Mode=OneWay}"
-                                TextAlignment="Left"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
-                            <TextBlock
-                                x:Name="SubTitleTextBlock"
-                                MaxWidth="100"
-                                Margin="0,-4,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorTertiary}"
-                                Text="{x:Bind Subtitle, Mode=OneWay}"
-                                TextAlignment="Center"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap"
-                                Visibility="{x:Bind HasSubtitle, Mode=OneWay}" />
-                        </StackPanel>
-                    </Grid>
-                </Border>
+                        </local:DockItemControl.Icon>
+                    </local:DockItemControl>
+                </Grid>
             </DataTemplate>
 
             <DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel">
@@ -169,7 +119,7 @@
         <!--  Edit Mode Overlay - shown when in edit mode  -->
         <Border
             x:Name="EditModeOverlay"
-            Background="{ThemeResource SystemAccentColorDark2}"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
             IsHitTestVisible="False"
             Opacity="0" />
 
@@ -199,10 +149,15 @@
                         Drop="StartItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
-                        ItemsPanel="{StaticResource ItemsOrientation}"
                         ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}"
                         SelectionMode="None"
-                        Style="{StaticResource DockBandListViewStyle}" />
+                        Style="{StaticResource DockBandListViewStyle}">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                    </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
 
@@ -219,35 +174,39 @@
                         Drop="EndItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
                         ItemTemplate="{StaticResource DockBandTemplate}"
-                        ItemsPanel="{StaticResource ItemsOrientation}"
                         ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}"
                         SelectionMode="None"
-                        Style="{StaticResource DockBandListViewStyle}" />
+                        Style="{StaticResource DockBandListViewStyle}">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="{x:Bind ItemsOrientation, Mode=OneWay}" Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                        <ListView.ItemContainerTransitions>
+                            <TransitionCollection />
+                        </ListView.ItemContainerTransitions>
+                    </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
-
-            <!--  Edit mode buttons - appear when in edit mode  -->
-            <StackPanel
-                Grid.Column="2"
-                VerticalAlignment="Center"
-                Orientation="Horizontal"
-                Spacing="4">
-                <Button
-                    x:Name="DiscardEditingButton"
-                    Margin="8,0,0,0"
-                    Padding="12,4"
-                    Click="DiscardEditingButton_Click"
-                    Content="Discard"
-                    Visibility="Collapsed" />
-                <Button
-                    x:Name="DoneEditingButton"
-                    Margin="0,0,8,0"
-                    Padding="12,4"
-                    Click="DoneEditingButton_Click"
-                    Content="Done"
-                    Style="{StaticResource AccentButtonStyle}"
-                    Visibility="Collapsed" />
-            </StackPanel>
+            <TeachingTip
+                x:Name="EditButtonsTeachingTip"
+                MinWidth="0"
+                PreferredPlacement="Bottom"
+                ShouldConstrainToRootBounds="False"
+                Target="{x:Bind ContentGrid}">
+                <TeachingTip.Content>
+                    <StackPanel
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="4">
+                        <Button Click="DiscardEditingButton_Click" Content="Discard" />
+                        <Button
+                            Click="DoneEditingButton_Click"
+                            Content="Save"
+                            Style="{StaticResource AccentButtonStyle}" />
+                    </StackPanel>
+                </TeachingTip.Content>
+            </TeachingTip>
         </Grid>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="DockOrientation">
@@ -334,9 +293,7 @@
                 <VisualState x:Name="EditModeOff" />
                 <VisualState x:Name="EditModeOn">
                     <VisualState.Setters>
-                        <Setter Target="DoneEditingButton.Visibility" Value="Visible" />
-                        <Setter Target="DiscardEditingButton.Visibility" Value="Visible" />
-                        <Setter Target="EditModeOverlay.Opacity" Value="0.1" />
+                        <Setter Target="EditModeOverlay.Opacity" Value="0.4" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index 7fc3798b37..614661b341 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -151,6 +151,20 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         EndItemsListView.CanReorderItems = isEditMode;
         EndItemsListView.AllowDrop = isEditMode;
 
+        if (isEditMode)
+        {
+            EditButtonsTeachingTip.PreferredPlacement = DockSide switch
+            {
+                DockSide.Left => TeachingTipPlacementMode.Right,
+                DockSide.Right => TeachingTipPlacementMode.Left,
+                DockSide.Top => TeachingTipPlacementMode.Bottom,
+                DockSide.Bottom => TeachingTipPlacementMode.Top,
+                _ => TeachingTipPlacementMode.Auto,
+            };
+        }
+
+        EditButtonsTeachingTip.IsOpen = isEditMode;
+
         // Update visual state
         VisualStateManager.GoToState(this, isEditMode ? "EditModeOn" : "EditModeOff", true);
     }
@@ -206,22 +220,6 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
-    private void BandItem_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        if (sender is Border border)
-        {
-            border.Background = (Brush)Application.Current.Resources["TaskBarButtonBackgroundPointerOver"];
-        }
-    }
-
-    private void BandItem_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        if (sender is Border border)
-        {
-            border.Background = new SolidColorBrush(Colors.Transparent);
-        }
-    }
-
     private void BandItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
     {
         // Ignore clicks when in edit mode - allow drag behavior instead
@@ -230,22 +228,17 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
             return;
         }
 
-        var border = sender as Border;
-        var item = border?.DataContext as DockItemViewModel;
-
-        if (item is null || border is null)
+        if (sender is DockItemControl dockItem && dockItem.DataContext is DockItemViewModel item)
         {
-            return;
+            // Use the center of the border as the point to open at
+            var borderPos = dockItem.TransformToVisual(null).TransformPoint(new Point(0, 0));
+            var borderCenter = new Point(
+                borderPos.X + (dockItem.ActualWidth / 2),
+                borderPos.Y + (dockItem.ActualHeight / 2));
+
+            InvokeItem(item, borderCenter);
+            e.Handled = true;
         }
-
-        // Use the center of the border as the point to open at
-        var borderPos = border.TransformToVisual(null).TransformPoint(new Point(0, 0));
-        var borderCenter = new Point(
-            borderPos.X + (border.ActualWidth / 2),
-            borderPos.Y + (border.ActualHeight / 2));
-
-        InvokeItem(item, borderCenter);
-        e.Handled = true;
     }
 
     private void BandItem_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
@@ -256,25 +249,20 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
             return;
         }
 
-        var border = sender as Border;
-        var item = border?.DataContext as DockItemViewModel;
-
-        if (item is null || border is null)
+        if (sender is DockItemControl dockItem && dockItem.DataContext is DockItemViewModel item)
         {
-            return;
-        }
-
-        if (item.HasMoreCommands)
-        {
-            ContextControl.ViewModel.SelectedItem = item;
-            ContextMenuFlyout.ShowAt(
-                border,
-                new FlyoutShowOptions()
-                {
-                    ShowMode = FlyoutShowMode.Standard,
-                    Placement = FlyoutPlacementMode.TopEdgeAlignedRight,
-                });
-            e.Handled = true;
+            if (item.HasMoreCommands)
+            {
+                ContextControl.ViewModel.SelectedItem = item;
+                ContextMenuFlyout.ShowAt(
+                    dockItem,
+                    new FlyoutShowOptions()
+                    {
+                        ShowMode = FlyoutShowMode.Standard,
+                        Placement = FlyoutPlacementMode.TopEdgeAlignedRight,
+                    });
+                e.Handled = true;
+            }
         }
     }
 
@@ -342,7 +330,7 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
 
         var requestedTheme = ActualTheme;
-        var isLight = requestedTheme == Microsoft.UI.Xaml.ElementTheme.Light;
+        var isLight = requestedTheme == ElementTheme.Light;
 
         // Check if any of the items have both an icon and a label.
         //
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
index 82a512e4e4..7e66d5c070 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
@@ -2,25 +2,64 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:local="using:Microsoft.CmdPal.UI.Dock">
 
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <SolidColorBrush x:Key="DockItemBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBackgroundPointerOver" Color="#0FFFFFFF" />
+            <SolidColorBrush x:Key="DockItemBackgroundPressed" Color="#0BFFFFFF" />
+            <LinearGradientBrush x:Key="DockItemBorderBrushPointerOver" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0.33" Color="#0FFFFFFF" />
+                    <GradientStop Offset="1.0" Color="#19FFFFFF" />
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="DockItemBorderBrushPressed" Color="#0BFFFFFF" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <SolidColorBrush x:Key="DockItemBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBackgroundPointerOver" Color="#80FFFFFF" />
+            <SolidColorBrush x:Key="DockItemBackgroundPressed" Color="#4DFFFFFF" />
+            <LinearGradientBrush x:Key="DockItemBorderBrushPointerOver" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0.33" Color="#08000000" />
+                    <GradientStop Offset="1.0" Color="#17000000" />
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="DockItemBorderBrushPressed" Color="#05000000" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <SolidColorBrush x:Key="DockItemBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="DockItemBackgroundPointerOver" Color="{StaticResource SystemColorHighlightTextColor}" />
+            <SolidColorBrush x:Key="DockItemBackgroundPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
+            <SolidColorBrush x:Key="DockItemBorderBrushPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="DockItemBorderBrushPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
 
     <Style BasedOn="{StaticResource DefaultDockItemControlStyle}" TargetType="local:DockItemControl" />
 
     <Style x:Key="DefaultDockItemControlStyle" TargetType="local:DockItemControl">
         <Style.Setters>
-            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Background" Value="{ThemeResource DockItemBackground}" />
+            <Setter Property="BorderBrush" Value="{ThemeResource DockItemBorderBrush}" />
+            <Setter Property="Padding" Value="4,2,4,2" />
+            <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
             <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="local:DockItemControl">
-                        <Border
+                        <Grid
                             x:Name="PART_RootGrid"
-                            Padding="4,2,4,2"
+                            Padding="{TemplateBinding Padding}"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
                             ToolTipService.ToolTip="{TemplateBinding ToolTip}">
                             <Grid AutomationProperties.Name="{TemplateBinding Title}" Background="Transparent">
@@ -31,20 +70,17 @@
 
                                 <!--  Icon  -->
                                 <ContentPresenter
-                                    Grid.Column="0"
+                                    x:Name="IconPresenter"
                                     VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}"
-                                    Visibility="{Binding HasIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    Content="{TemplateBinding Icon}" />
 
                                 <!--  Text (Title + Subtitle)  -->
                                 <StackPanel
                                     Grid.Column="1"
                                     Margin="8,0,8,0"
-                                    VerticalAlignment="Center"
-                                    Visibility="{Binding HasText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    VerticalAlignment="Center">
                                     <TextBlock
-                                        x:Name="TitleTextBlock"
-                                        Margin="0"
+                                        x:Name="TitleText"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         FontSize="12"
@@ -53,7 +89,7 @@
                                         TextTrimming="CharacterEllipsis"
                                         TextWrapping="NoWrap" />
                                     <TextBlock
-                                        x:Name="SubTitleTextBlock"
+                                        x:Name="SubtitleText"
                                         MaxWidth="100"
                                         Margin="0,-4,0,0"
                                         HorizontalAlignment="Left"
@@ -63,8 +99,7 @@
                                         Text="{TemplateBinding Subtitle}"
                                         TextAlignment="Center"
                                         TextTrimming="CharacterEllipsis"
-                                        TextWrapping="NoWrap"
-                                        Visibility="{Binding HasSubtitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                        TextWrapping="NoWrap" />
                                 </StackPanel>
                             </Grid>
                             <VisualStateManager.VisualStateGroups>
@@ -72,15 +107,31 @@
                                     <VisualState x:Name="Normal" />
                                     <VisualState x:Name="PointerOver">
                                         <VisualState.Setters>
-                                            <Setter Target="PART_RootGrid.Background" Value="{ThemeResource TaskBarButtonBackgroundPointerOver}" />
+                                            <Setter Target="PART_RootGrid.Background" Value="{ThemeResource DockItemBackgroundPointerOver}" />
+                                            <Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource DockItemBorderBrushPointerOver}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Pressed">
+                                        <VisualState.Setters>
+                                            <Setter Target="PART_RootGrid.Background" Value="{ThemeResource DockItemBackgroundPointerOver}" />
+                                            <Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource DockItemBorderBrushPressed}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled">
+                                        <VisualState.Setters>
+                                            <Setter Target="PART_RootGrid.Background" Value="Transparent" />
+                                            <Setter Target="PART_RootGrid.BorderBrush" Value="Transparent" />
+                                            <Setter Target="IconPresenter.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
+                                            <Setter Target="TitleText.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
+                                            <Setter Target="SubtitleText.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
                                         </VisualState.Setters>
                                     </VisualState>
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                        </Border>
+                        </Grid>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style.Setters>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
index 103f03dc2e..8bc76d57d2 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
@@ -27,7 +27,7 @@ public sealed partial class DockItemControl : Control
     }
 
     public static readonly DependencyProperty TitleProperty =
-        DependencyProperty.Register(nameof(Title), typeof(string), typeof(DockItemControl), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(Title), typeof(string), typeof(DockItemControl), new PropertyMetadata(null, OnTextPropertyChanged));
 
     public string Title
     {
@@ -35,17 +35,8 @@ public sealed partial class DockItemControl : Control
         set => SetValue(TitleProperty, value);
     }
 
-    public static readonly DependencyProperty HasTextProperty =
-        DependencyProperty.Register(nameof(HasText), typeof(bool), typeof(DockItemControl), new PropertyMetadata(true));
-
-    public bool HasText
-    {
-        get => (bool)GetValue(HasTextProperty);
-        set => SetValue(HasTextProperty, value);
-    }
-
     public static readonly DependencyProperty SubtitleProperty =
-        DependencyProperty.Register(nameof(Subtitle), typeof(string), typeof(DockItemControl), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(Subtitle), typeof(string), typeof(DockItemControl), new PropertyMetadata(null, OnTextPropertyChanged));
 
     public string Subtitle
     {
@@ -53,17 +44,8 @@ public sealed partial class DockItemControl : Control
         set => SetValue(SubtitleProperty, value);
     }
 
-    public static readonly DependencyProperty HasSubtitleProperty =
-        DependencyProperty.Register(nameof(HasSubtitle), typeof(bool), typeof(DockItemControl), new PropertyMetadata(false));
-
-    public bool HasSubtitle
-    {
-        get => (bool)GetValue(HasSubtitleProperty);
-        set => SetValue(HasSubtitleProperty, value);
-    }
-
     public static readonly DependencyProperty IconProperty =
-        DependencyProperty.Register(nameof(Icon), typeof(object), typeof(DockItemControl), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(Icon), typeof(object), typeof(DockItemControl), new PropertyMetadata(null, OnIconPropertyChanged));
 
     public object Icon
     {
@@ -71,50 +53,99 @@ public sealed partial class DockItemControl : Control
         set => SetValue(IconProperty, value);
     }
 
-    public static readonly DependencyProperty HasIconProperty =
-        DependencyProperty.Register(nameof(HasIcon), typeof(bool), typeof(DockItemControl), new PropertyMetadata(true));
+    private const string IconPresenterName = "IconPresenter";
+    private const string TitleTextName = "TitleText";
+    private const string SubtitleTextName = "SubtitleText";
 
-    public bool HasIcon
+    private FrameworkElement? _iconPresenter;
+    private FrameworkElement? _titleText;
+    private FrameworkElement? _subtitleText;
+
+    private static void OnTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        get => (bool)GetValue(HasIconProperty);
-        set => SetValue(HasIconProperty, value);
+        if (d is DockItemControl control)
+        {
+            control.UpdateTextVisibility();
+        }
     }
 
-    public event TappedEventHandler? ItemTapped;
+    private static void OnIconPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DockItemControl control)
+        {
+            control.UpdateIconVisibility();
+        }
+    }
 
-    public event RightTappedEventHandler? ItemRightTapped;
+    private static bool IsNullOrEmpty(string? value) => string.IsNullOrEmpty(value);
+
+    private void UpdateTextVisibility()
+    {
+        if (_titleText is not null)
+        {
+            _titleText.Visibility = IsNullOrEmpty(Title) ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        if (_subtitleText is not null)
+        {
+            _subtitleText.Visibility = IsNullOrEmpty(Subtitle) ? Visibility.Collapsed : Visibility.Visible;
+        }
+    }
+
+    private void UpdateIconVisibility()
+    {
+        if (_iconPresenter is not null)
+        {
+            _iconPresenter.Visibility = Icon is null ? Visibility.Collapsed : Visibility.Visible;
+        }
+    }
+
+    private void UpdateAllVisibility()
+    {
+        UpdateTextVisibility();
+        UpdateIconVisibility();
+    }
 
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
+        IsEnabledChanged -= OnIsEnabledChanged;
 
-        // Wire up pointer events from the root border
-        if (GetTemplateChild("PART_RootGrid") is Border rootBorder)
-        {
-            rootBorder.Tapped += RootBorder_Tapped;
-            rootBorder.RightTapped += RootBorder_RightTapped;
-            rootBorder.PointerEntered += RootBorder_PointerEntered;
-            rootBorder.PointerExited += RootBorder_PointerExited;
-        }
+        PointerEntered += Control_PointerEntered;
+        PointerExited += Control_PointerExited;
+
+        IsEnabledChanged += OnIsEnabledChanged;
+
+        // Get template children for visibility updates
+        _iconPresenter = GetTemplateChild(IconPresenterName) as FrameworkElement;
+        _titleText = GetTemplateChild(TitleTextName) as FrameworkElement;
+        _subtitleText = GetTemplateChild(SubtitleTextName) as FrameworkElement;
+
+        // Set initial visibility
+        UpdateAllVisibility();
     }
 
-    private void RootBorder_Tapped(object sender, TappedRoutedEventArgs e)
-    {
-        ItemTapped?.Invoke(this, e);
-    }
-
-    private void RootBorder_RightTapped(object sender, RightTappedRoutedEventArgs e)
-    {
-        ItemRightTapped?.Invoke(this, e);
-    }
-
-    private void RootBorder_PointerEntered(object sender, PointerRoutedEventArgs e)
+    private void Control_PointerEntered(object sender, PointerRoutedEventArgs e)
     {
         VisualStateManager.GoToState(this, "PointerOver", true);
     }
 
-    private void RootBorder_PointerExited(object sender, PointerRoutedEventArgs e)
+    private void Control_PointerExited(object sender, PointerRoutedEventArgs e)
     {
         VisualStateManager.GoToState(this, "Normal", true);
     }
+
+    protected override void OnPointerPressed(PointerRoutedEventArgs e)
+    {
+        if (IsEnabled)
+        {
+            base.OnPointerPressed(e);
+            VisualStateManager.GoToState(this, "Pressed", true);
+        }
+    }
+
+    private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
+    }
 }

From a5e93da8adb824856c61d9f2a01f85b0d14efa41 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 21 Jan 2026 17:16:54 +0100
Subject: [PATCH 6/9] Disabling AOT

---
 .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
index 2dc5f6e03b..a4ec8e0ade 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -31,7 +31,7 @@
 
   <!-- For debugging purposes, uncomment this block to enable AOT builds -->
   <PropertyGroup>
-    <EnableCmdPalAOT>true</EnableCmdPalAOT>
+    <EnableCmdPalAOT>false</EnableCmdPalAOT>
     <GeneratePackageLocally>true</GeneratePackageLocally>
   </PropertyGroup>
 

From 5d7211cf856519722dac95d64dedc69852f1503a Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 21 Jan 2026 17:18:56 +0100
Subject: [PATCH 7/9] Making it build again

---
 .../cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml        | 2 +-
 .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index dc7706a756..804bb68d97 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -179,7 +179,7 @@
                         Style="{StaticResource DockBandListViewStyle}">
                         <ListView.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Orientation="{x:Bind ItemsOrientation, Mode=OneWay}" Spacing="4" />
+                                <StackPanel Orientation="Horizontal" Spacing="4" />
                             </ItemsPanelTemplate>
                         </ListView.ItemsPanel>
                         <ListView.ItemContainerTransitions>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
index a4ec8e0ade..c6257d55aa 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -30,8 +30,8 @@
   </PropertyGroup>
 
   <!-- For debugging purposes, uncomment this block to enable AOT builds -->
-  <PropertyGroup>
-    <EnableCmdPalAOT>false</EnableCmdPalAOT>
+  <!-- <PropertyGroup>
+    <EnableCmdPalAOT>true</EnableCmdPalAOT>
     <GeneratePackageLocally>true</GeneratePackageLocally>
   </PropertyGroup>
 
@@ -40,7 +40,7 @@
     <PublishSingleFile>false</PublishSingleFile>
     <DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
     <PublishAot>true</PublishAot>
-  </PropertyGroup>
+  </PropertyGroup> -->
 
   <PropertyGroup Condition="'$(CIBuild)' == 'true' or '$(GeneratePackageLocally)' == 'true'">
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>

From 0b38be2c014783e99a2610647db0c40f1dc37d7d Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 21 Jan 2026 18:30:08 +0100
Subject: [PATCH 8/9] Moving Dock setting to Docks page

---
 .../Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml       | 5 +++++
 .../cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml     | 4 ----
 .../cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
index d0a278e1cf..d797a48ab3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
@@ -36,6 +36,11 @@
                   <RepositionThemeTransition IsStaggeringEnabled="False" />
               </StackPanel.ChildrenTransitions>-->
 
+                    <!--  Enable Dock  -->
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_EnableDock_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xF596;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.EnableDock, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                     <!--  Appearance Section  -->
                     <TextBlock x:Uid="DockAppearanceSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
index 83100377fe..53994b345f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
@@ -85,10 +85,6 @@
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
-                    <controls:SettingsCard x:Uid="Settings_GeneralPage_EnableDock_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xF596;}">
-                        <ToggleSwitch IsOn="{x:Bind viewModel.EnableDock, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
                     <!--  'For Developers' section  -->
 
                     <TextBlock x:Uid="ForDevelopersSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index a63415e28d..0225677f54 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -390,7 +390,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Extensions</value>
   </data>
   <data name="Settings_GeneralPage_NavigationViewItem_Dock.Content" xml:space="preserve">
-    <value>Dock</value>
+    <value>Dock (Preview)</value>
   </data>
   <data name="SettingsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Open Command Palette settings</value>

From 884d1ec6d6b124d213cfc120f62aad7479852c16 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 21 Jan 2026 18:30:23 +0100
Subject: [PATCH 9/9] Seperating converters and making it work on init

---
 .../Dock/BandAlignmentConverter.cs            | 30 ++++++++++
 .../Dock/DockBandTemplateSelector.cs          | 29 +++++++++
 .../Microsoft.CmdPal.UI/Dock/DockControl.xaml | 60 +++++++++++--------
 .../Dock/DockControl.xaml.cs                  | 50 ++++++++--------
 4 files changed, 119 insertions(+), 50 deletions(-)
 create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/BandAlignmentConverter.cs
 create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockBandTemplateSelector.cs

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/BandAlignmentConverter.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/BandAlignmentConverter.cs
new file mode 100644
index 0000000000..92c1670c24
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/BandAlignmentConverter.cs
@@ -0,0 +1,30 @@
+// 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;
+using System.Collections.ObjectModel;
+using Microsoft.CmdPal.UI.ViewModels.Dock;
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.CmdPal.UI.Dock;
+
+internal sealed partial class BandAlignmentConverter : Microsoft.UI.Xaml.Data.IValueConverter
+{
+    public DockControl? Control { get; set; }
+
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        if (value is ObservableCollection<DockItemViewModel> items && Control is not null)
+        {
+            return Control.GetBandAlignment(items);
+        }
+
+        return HorizontalAlignment.Center;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockBandTemplateSelector.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockBandTemplateSelector.cs
new file mode 100644
index 0000000000..6d86b7a67d
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockBandTemplateSelector.cs
@@ -0,0 +1,29 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Dock;
+
+internal sealed partial class DockBandTemplateSelector : DataTemplateSelector
+{
+    public DockControl? Control { get; set; }
+
+    public DataTemplate? HorizontalTemplate { get; set; }
+
+    public DataTemplate? VerticalTemplate { get; set; }
+
+    protected override DataTemplate? SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (Control is null)
+        {
+            return HorizontalTemplate;
+        }
+
+        return Control.ItemsOrientation == Orientation.Horizontal
+            ? HorizontalTemplate
+            : VerticalTemplate;
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index 804bb68d97..0e6552a456 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -16,6 +16,13 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
+            <ItemsPanelTemplate x:Key="HorizontalItemsPanel">
+                <StackPanel Orientation="Horizontal" Spacing="4" />
+            </ItemsPanelTemplate>
+            <ItemsPanelTemplate x:Key="VerticalItemsPanel">
+                <StackPanel Orientation="Vertical" Spacing="4" />
+            </ItemsPanelTemplate>
+
             <Style x:Key="ResizingIconStyle" TargetType="cpcontrols:IconBox">
                 <Setter Property="Height" Value="{x:Bind IconSize, Mode=OneWay}" />
                 <Setter Property="MaxWidth" Value="{x:Bind IconSize, Mode=OneWay}" />
@@ -32,6 +39,7 @@
             <DataTemplate x:Key="DeskbandTemplate" x:DataType="dockVm:DockItemViewModel">
                 <Grid>
                     <TextBlock Opacity="0" Style="{StaticResource ResizingTitleTextBlock}" />
+                    <!--  Removing this breaks the app.. and I have no idea why  -->
                     <local:DockItemControl
                         Title="{x:Bind Title, Mode=OneWay}"
                         RightTapped="BandItem_RightTapped"
@@ -53,20 +61,28 @@
                 </Grid>
             </DataTemplate>
 
-            <DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel">
-                <!--  Use ItemsControl instead of ItemsRepeater - it doesn't intercept pointer events  -->
+            <DataTemplate x:Key="HorizontalDockBandTemplate" x:DataType="dockVm:DockBandViewModel">
                 <ItemsControl
                     HorizontalAlignment="{x:Bind Items, Converter={StaticResource BandAlignmentConverter}, Mode=OneWay}"
                     ItemTemplate="{StaticResource DeskbandTemplate}"
-                    ItemsSource="{x:Bind Items, Mode=OneWay}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel Orientation="Horizontal" Spacing="4" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                </ItemsControl>
+                    ItemsPanel="{StaticResource HorizontalItemsPanel}"
+                    ItemsSource="{x:Bind Items, Mode=OneWay}" />
             </DataTemplate>
 
+            <DataTemplate x:Key="VerticalDockBandTemplate" x:DataType="dockVm:DockBandViewModel">
+                <ItemsControl
+                    HorizontalAlignment="{x:Bind Items, Converter={StaticResource BandAlignmentConverter}, Mode=OneWay}"
+                    ItemTemplate="{StaticResource DeskbandTemplate}"
+                    ItemsPanel="{StaticResource VerticalItemsPanel}"
+                    ItemsSource="{x:Bind Items, Mode=OneWay}" />
+            </DataTemplate>
+
+            <local:DockBandTemplateSelector
+                x:Key="DockBandTemplateSelector"
+                Control="{x:Bind}"
+                HorizontalTemplate="{StaticResource HorizontalDockBandTemplate}"
+                VerticalTemplate="{StaticResource VerticalDockBandTemplate}" />
+
             <Style x:Key="DockBandListViewStyle" TargetType="ListView">
                 <Setter Property="Background" Value="Transparent" />
                 <Setter Property="Padding" Value="0" />
@@ -148,16 +164,11 @@
                         DragOver="BandListView_DragOver"
                         Drop="StartItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
-                        ItemTemplate="{StaticResource DockBandTemplate}"
+                        ItemTemplateSelector="{StaticResource DockBandTemplateSelector}"
+                        ItemsPanel="{StaticResource HorizontalItemsPanel}"
                         ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}"
                         SelectionMode="None"
-                        Style="{StaticResource DockBandListViewStyle}">
-                        <ListView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ListView.ItemsPanel>
-                    </ListView>
+                        Style="{StaticResource DockBandListViewStyle}" />
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
 
@@ -173,21 +184,19 @@
                         DragOver="BandListView_DragOver"
                         Drop="EndItemsListView_Drop"
                         ItemContainerStyle="{StaticResource DockBandListViewItemStyle}"
-                        ItemTemplate="{StaticResource DockBandTemplate}"
+                        ItemTemplateSelector="{StaticResource DockBandTemplateSelector}"
+                        ItemsPanel="{StaticResource HorizontalItemsPanel}"
                         ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}"
                         SelectionMode="None"
                         Style="{StaticResource DockBandListViewStyle}">
-                        <ListView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ListView.ItemsPanel>
                         <ListView.ItemContainerTransitions>
                             <TransitionCollection />
                         </ListView.ItemContainerTransitions>
                     </ListView>
                 </cpcontrols:ScrollContainer.Source>
             </cpcontrols:ScrollContainer>
+
+            <!--  To do: remove the X button  -->
             <TeachingTip
                 x:Name="EditButtonsTeachingTip"
                 MinWidth="0"
@@ -196,14 +205,15 @@
                 Target="{x:Bind ContentGrid}">
                 <TeachingTip.Content>
                     <StackPanel
+                        x:Name="EditButtonsPanel"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal"
+                        Orientation="Vertical"
                         Spacing="4">
-                        <Button Click="DiscardEditingButton_Click" Content="Discard" />
                         <Button
                             Click="DoneEditingButton_Click"
                             Content="Save"
                             Style="{StaticResource AccentButtonStyle}" />
+                        <Button Click="DiscardEditingButton_Click" Content="Discard" />
                     </StackPanel>
                 </TeachingTip.Content>
             </TeachingTip>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
index 614661b341..9b8b29cb02 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs
@@ -22,8 +22,6 @@ using Windows.Foundation;
 
 namespace Microsoft.CmdPal.UI.Dock;
 
-#pragma warning disable SA1402 // File may only contain a single type
-
 public sealed partial class DockControl : UserControl, INotifyPropertyChanged, IRecipient<CloseContextMenuMessage>, IRecipient<EnterDockEditModeMessage>
 {
     private DockViewModel _viewModel;
@@ -41,10 +39,31 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
             {
                 field = value;
                 PropertyChanged?.Invoke(this, new(nameof(ItemsOrientation)));
+                UpdateBandTemplates();
             }
         }
     }
 
+    private void UpdateBandTemplates()
+    {
+        var panelKey = ItemsOrientation == Orientation.Horizontal
+            ? "HorizontalItemsPanel"
+            : "VerticalItemsPanel";
+
+        var panel = (ItemsPanelTemplate)Resources[panelKey];
+
+        StartItemsListView.ItemsPanel = panel;
+        EndItemsListView.ItemsPanel = panel;
+
+        // Force the selector to re-evaluate by refreshing ItemsSource
+        var startItems = StartItemsListView.ItemsSource;
+        var endItems = EndItemsListView.ItemsSource;
+        StartItemsListView.ItemsSource = null;
+        EndItemsListView.ItemsSource = null;
+        StartItemsListView.ItemsSource = startItems;
+        EndItemsListView.ItemsSource = endItems;
+    }
+
     public DockSide DockSide
     {
         get => field;
@@ -218,6 +237,9 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         {
             RootGrid.BorderBrush = new SolidColorBrush(Colors.Transparent);
         }
+
+        // Ensure templates are updated on initial load (setter only updates on change)
+        UpdateBandTemplates();
     }
 
     private void BandItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
@@ -266,7 +288,7 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         }
     }
 
-    private void InvokeItem(DockItemViewModel item, global::Windows.Foundation.Point pos)
+    private void InvokeItem(DockItemViewModel item, Point pos)
     {
         var command = item.Command;
         try
@@ -465,25 +487,3 @@ public sealed partial class DockControl : UserControl, INotifyPropertyChanged, I
         return itemCount;
     }
 }
-
-internal sealed partial class BandAlignmentConverter : Microsoft.UI.Xaml.Data.IValueConverter
-{
-    public DockControl? Control { get; set; }
-
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        if (value is ObservableCollection<DockItemViewModel> items && Control is not null)
-        {
-            return Control.GetBandAlignment(items);
-        }
-
-        return HorizontalAlignment.Center;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw new NotImplementedException();
-    }
-}
-
-#pragma warning restore SA1402 // File may only contain a single type