[Build]Use XamlStyler to check XAML formatting (#28643)

* Use XamlStyler to check XAML formatting * fix spellcheck * fix * format XAML FLS, Hosts, ImageResizer, MeasureTool, PowerRename * format XAML Peek * exclude settings XAML and make CI pass * doc
2026-04-03 17:56:44 +02:00 · 2023-10-09 16:58:13 +02:00
parent b41dd81177
commit 6482e9b0de
21 changed files with 594 additions and 411 deletions
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
@@ -20,29 +20,30 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <Grid x:Name="AppTitleBar"
-              Height="32"
-              ColumnSpacing="16">
+        <Grid
+            x:Name="AppTitleBar"
+            Height="32"
+            ColumnSpacing="16">
            <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
-                <ColumnDefinition x:Name="IconColumn" Width="Auto"/>
-                <ColumnDefinition x:Name="TitleColumn" Width="Auto"/>
-                <ColumnDefinition x:Name="RightDragColumn" Width="*"/>
-                <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightDragColumn" Width="*" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
            </Grid.ColumnDefinitions>
            <Image
                Grid.Column="1"
-                Source="../Assets/FileLocksmith/Icon.ico"
-                VerticalAlignment="Center"
                Width="16"
-                Height="16"/>
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/FileLocksmith/Icon.ico" />
            <TextBlock
                x:Name="AppTitleTextBlock"
                Grid.Column="2"
                VerticalAlignment="Center"
                Style="{StaticResource CaptionTextBlockStyle}" />
        </Grid>
-        
+
        <views:MainPage x:Name="mainPage" Grid.Row="1" />
    </Grid>
 </winuiex:WindowEx>
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
@@ -1,4 +1,4 @@
-<winuiex:WindowEx
+<winuiex:WindowEx
    x:Class="Hosts.MainWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -20,26 +20,29 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <Grid x:Name="titleBar" Height="32" ColumnSpacing="16">
+        <Grid
+            x:Name="titleBar"
+            Height="32"
+            ColumnSpacing="16">
            <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
-                <ColumnDefinition x:Name="IconColumn" Width="Auto"/>
-                <ColumnDefinition x:Name="TitleColumn" Width="Auto"/>
-                <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
            </Grid.ColumnDefinitions>
            <Image
                Grid.Column="1"
-                Source="../Assets/Hosts/Hosts.ico"
-                VerticalAlignment="Center"
                Width="16"
-                Height="16"/>
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/Hosts/Hosts.ico" />
            <TextBlock
                x:Name="AppTitleTextBlock"
                Grid.Column="2"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                VerticalAlignment="Center" />
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
        </Grid>
-        
+
        <views:MainPage Grid.Row="1" />
    </Grid>
 </winuiex:WindowEx>
--- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
    x:Class="Hosts.Views.MainPage"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -169,8 +169,8 @@
                GotFocus="Entries_GotFocus"
                IsItemClickEnabled="True"
                ItemClick="Entries_ItemClick"
-                RightTapped="Entries_RightTapped"
                ItemsSource="{x:Bind ViewModel.Entries, Mode=TwoWay}"
+                RightTapped="Entries_RightTapped"
                SelectedItem="{x:Bind ViewModel.Selected, Mode=TwoWay}">
                <ListView.ContextFlyout>
                    <MenuFlyout>
@@ -180,8 +180,8 @@
                            Icon="Edit">
                            <MenuFlyoutItem.KeyboardAccelerators>
                                <KeyboardAccelerator
-                                    Modifiers="Control"
                                    Key="E"
+                                    Modifiers="Control"
                                    ScopeOwner="{x:Bind Entries}" />
                            </MenuFlyoutItem.KeyboardAccelerators>
                        </MenuFlyoutItem>
@@ -191,8 +191,8 @@
                            Icon="TwoBars">
                            <MenuFlyoutItem.KeyboardAccelerators>
                                <KeyboardAccelerator
-                                    Modifiers="Control"
                                    Key="P"
+                                    Modifiers="Control"
                                    ScopeOwner="{x:Bind Entries}" />
                            </MenuFlyoutItem.KeyboardAccelerators>
                        </MenuFlyoutItem>
@@ -218,9 +218,7 @@
                            Click="Delete_Click"
                            Icon="Delete">
                            <MenuFlyoutItem.KeyboardAccelerators>
-                                <KeyboardAccelerator
-                                    Key="Delete"
-                                    ScopeOwner="{x:Bind Entries}" />
+                                <KeyboardAccelerator Key="Delete" ScopeOwner="{x:Bind Entries}" />
                            </MenuFlyoutItem.KeyboardAccelerators>
                        </MenuFlyoutItem>
                    </MenuFlyout>
@@ -232,11 +230,16 @@
                            Background="Transparent"
                            ColumnSpacing="8">
                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="256"/> <!-- Address -->
-                                <ColumnDefinition Width="*"/> <!-- Comment -->
-                                <ColumnDefinition Width="Auto"/> <!-- Status -->
-                                <ColumnDefinition Width="Auto"/> <!-- Duplicate -->
-                                <ColumnDefinition Width="Auto"/> <!-- ToggleSwitch -->
+                                <ColumnDefinition Width="256" />
+                                <!--  Address  -->
+                                <ColumnDefinition Width="*" />
+                                <!--  Comment  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  Status  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  Duplicate  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  ToggleSwitch  -->
                            </Grid.ColumnDefinitions>
                            <TextBlock
                                Grid.Column="0"
@@ -371,9 +374,9 @@
                <InfoBar
                    x:Uid="FileSaveError"
                    Margin="0,8,0,0"
-                    Severity="Error"
-                    Message="{x:Bind ViewModel.ErrorMessage, Mode=TwoWay}"
                    IsOpen="{x:Bind ViewModel.Error, Mode=TwoWay}"
+                    Message="{x:Bind ViewModel.ErrorMessage, Mode=TwoWay}"
+                    Severity="Error"
                    Visibility="{x:Bind ViewModel.Error, Mode=TwoWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                <InfoBar
                    x:Uid="FileChanged"
@@ -397,8 +400,8 @@
        <ContentDialog
            x:Name="EntryDialog"
            x:Uid="EntryDialog"
-            Loaded="ContentDialog_Loaded_ApplyMargin"
            IsPrimaryButtonEnabled="{Binding Valid, Mode=OneWay}"
+            Loaded="ContentDialog_Loaded_ApplyMargin"
            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
            <ContentDialog.DataContext>
                <models:Entry />
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml
@@ -7,9 +7,9 @@
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
+                <!--  Other merged dictionaries here  -->
            </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
+            <!--  Other app resources here  -->
        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/src/modules/imageresizer/ui/App.xaml
+++ b/src/modules/imageresizer/ui/App.xaml
@@ -1,10 +1,11 @@
-<Application x:Class="ImageResizer.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:m="clr-namespace:ImageResizer.Models"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-             xmlns:v="clr-namespace:ImageResizer.Views"
-             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+<Application
+    x:Class="ImageResizer.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:m="clr-namespace:ImageResizer.Models"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:v="clr-namespace:ImageResizer.Views">
    <Application.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
@@ -12,27 +13,29 @@
                <ui:ControlsDictionary />
            </ResourceDictionary.MergedDictionaries>

-            <ObjectDataProvider x:Key="ResizeFitValues"
-                            MethodName="GetValues"
-                            ObjectType="sys:Enum">
+            <ObjectDataProvider
+                x:Key="ResizeFitValues"
+                MethodName="GetValues"
+                ObjectType="sys:Enum">
                <ObjectDataProvider.MethodParameters>
-                    <x:Type Type="{x:Type m:ResizeFit}"/>
-                </ObjectDataProvider.MethodParameters>
-            </ObjectDataProvider>
-            
-            <ObjectDataProvider x:Key="ResizeUnitValues"
-                            MethodName="GetValues"
-                            ObjectType="sys:Enum">
-                <ObjectDataProvider.MethodParameters>
-                    <x:Type Type="{x:Type m:ResizeUnit}"/>
+                    <x:Type Type="{x:Type m:ResizeFit}" />
                </ObjectDataProvider.MethodParameters>
            </ObjectDataProvider>

-            <v:SizeTypeToVisibilityConverter x:Key="SizeTypeToVisibilityConverter"/>
-            <v:EnumValueConverter x:Key="EnumValueConverter"/>
-            <v:AutoDoubleConverter x:Key="AutoDoubleConverter"/>
-            <v:BoolValueConverter x:Key="BoolValueConverter"/>
-            <v:VisibilityBoolConverter x:Key="VisibilityBoolConverter"/>
+            <ObjectDataProvider
+                x:Key="ResizeUnitValues"
+                MethodName="GetValues"
+                ObjectType="sys:Enum">
+                <ObjectDataProvider.MethodParameters>
+                    <x:Type Type="{x:Type m:ResizeUnit}" />
+                </ObjectDataProvider.MethodParameters>
+            </ObjectDataProvider>
+
+            <v:SizeTypeToVisibilityConverter x:Key="SizeTypeToVisibilityConverter" />
+            <v:EnumValueConverter x:Key="EnumValueConverter" />
+            <v:AutoDoubleConverter x:Key="AutoDoubleConverter" />
+            <v:BoolValueConverter x:Key="BoolValueConverter" />
+            <v:VisibilityBoolConverter x:Key="VisibilityBoolConverter" />
        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -25,7 +25,10 @@
            SelectedIndex="{Binding Settings.SelectedSizeIndex}">
            <ComboBox.Resources>
                <DataTemplate DataType="{x:Type m:ResizeSize}">
-                    <Grid Margin="2,0,0,0" VerticalAlignment="Center" AutomationProperties.Name="{Binding Name}">
+                    <Grid
+                        Margin="2,0,0,0"
+                        VerticalAlignment="Center"
+                        AutomationProperties.Name="{Binding Name}">
                        <Grid.RowDefinitions>
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
@@ -67,9 +70,7 @@

                <DataTemplate DataType="{x:Type m:CustomSize}">
                    <Grid VerticalAlignment="Center" AutomationProperties.Name="{Binding Name}">
-                        <TextBlock
-                            FontWeight="SemiBold"
-                            Text="{Binding Name}" />
+                        <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
                    </Grid>
                </DataTemplate>
            </ComboBox.Resources>
--- a/src/modules/peek/Peek.FilePreviewer/Controls/ArchiveControl.xaml
+++ b/src/modules/peek/Peek.FilePreviewer/Controls/ArchiveControl.xaml
@@ -1,72 +1,63 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
-<!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
-    
+<!--  Copyright (c) Microsoft Corporation. All rights reserved.  -->
+<!--  Licensed under the MIT License. See LICENSE in the project root for license information.  -->
+
 <UserControl
    x:Class="Peek.FilePreviewer.Controls.ArchiveControl"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Peek.FilePreviewer.Controls"
+    xmlns:converters="using:Peek.Common.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Peek.FilePreviewer.Controls"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:models="using:Peek.FilePreviewer.Previewers.Archives.Models"
-    xmlns:converters="using:Peek.Common.Converters"
    mc:Ignorable="d">
    <UserControl.Resources>
-        <DataTemplate
-            x:Key="DirectoryTemplate"
-            x:DataType="models:ArchiveItem">
+        <DataTemplate x:Key="DirectoryTemplate" x:DataType="models:ArchiveItem">
            <TreeViewItem
                AutomationProperties.Name="{x:Bind Name}"
-                ItemsSource="{x:Bind Children}"
-                IsExpanded="{x:Bind IsExpanded}">
+                IsExpanded="{x:Bind IsExpanded}"
+                ItemsSource="{x:Bind Children}">
                <Grid ColumnSpacing="10">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="auto" />
                        <ColumnDefinition Width="auto" />
                    </Grid.ColumnDefinitions>
                    <Image
+                        Grid.Column="0"
                        Width="16"
                        Height="16"
-                        Grid.Column="0"
                        Source="{x:Bind Icon}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        Text="{x:Bind Name}" />
+                    <TextBlock Grid.Column="1" Text="{x:Bind Name}" />
                </Grid>
            </TreeViewItem>
        </DataTemplate>
-        
-        <DataTemplate
-                x:Key="FileTemplate"
-                x:DataType="models:ArchiveItem">
-                <TreeViewItem
-                    AutomationProperties.Name="{x:Bind Name}">
-                    <Grid ColumnSpacing="10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
-                        </Grid.ColumnDefinitions>
-                        <Image
-                            Width="16"
-                            Height="16"
-                            Grid.Column="0"
-                            Source="{x:Bind Icon}" />
-                        <TextBlock
-                            Grid.Column="1"
-                            Text="{x:Bind Name}" />
-                        <TextBlock
-                            Grid.Column="2"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                            Text="{Binding Size, Converter={StaticResource BytesToStringConverter}}" />
-                    </Grid>
-                </TreeViewItem>
-            </DataTemplate>
-        
-         <models:ArchiveItemTemplateSelector
-                x:Key="ArchiveItemTemplateSelector"
-                DirectoryTemplate="{StaticResource DirectoryTemplate}"
-                FileTemplate="{StaticResource FileTemplate}" />
+
+        <DataTemplate x:Key="FileTemplate" x:DataType="models:ArchiveItem">
+            <TreeViewItem AutomationProperties.Name="{x:Bind Name}">
+                <Grid ColumnSpacing="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                    </Grid.ColumnDefinitions>
+                    <Image
+                        Grid.Column="0"
+                        Width="16"
+                        Height="16"
+                        Source="{x:Bind Icon}" />
+                    <TextBlock Grid.Column="1" Text="{x:Bind Name}" />
+                    <TextBlock
+                        Grid.Column="2"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="{Binding Size, Converter={StaticResource BytesToStringConverter}}" />
+                </Grid>
+            </TreeViewItem>
+        </DataTemplate>
+
+        <models:ArchiveItemTemplateSelector
+            x:Key="ArchiveItemTemplateSelector"
+            DirectoryTemplate="{StaticResource DirectoryTemplate}"
+            FileTemplate="{StaticResource FileTemplate}" />

        <converters:BytesToStringConverter x:Key="BytesToStringConverter" />
    </UserControl.Resources>
@@ -75,29 +66,25 @@
            <RowDefinition Height="*" />
            <RowDefinition Height="auto" />
        </Grid.RowDefinitions>
-        <ScrollViewer
-            Grid.Row="0"
-            HorizontalScrollBarVisibility="Auto">
+        <ScrollViewer Grid.Row="0" HorizontalScrollBarVisibility="Auto">
            <TreeView
                x:Name="ArchivePreview"
-                ItemsSource="{x:Bind Source, Mode=OneWay}"
-                ItemTemplateSelector="{StaticResource ArchiveItemTemplateSelector}"
-                SelectionMode="None"
+                CanDragItems="False"
                CanReorderItems="False"
-                CanDragItems="False" />
+                ItemTemplateSelector="{StaticResource ArchiveItemTemplateSelector}"
+                ItemsSource="{x:Bind Source, Mode=OneWay}"
+                SelectionMode="None" />
        </ScrollViewer>
        <Border
            Grid.Row="1"
            MinWidth="300"
+            Margin="16"
+            HorizontalAlignment="Center"
            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
            BorderThickness="1"
-            CornerRadius="8"
-            Margin="16"
-            HorizontalAlignment="Center">
-            <Grid
-                ColumnSpacing="16"
-                Padding="16">
+            CornerRadius="8">
+            <Grid Padding="16" ColumnSpacing="16">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="*" />
                    <ColumnDefinition Width="auto" />
@@ -107,29 +94,29 @@
                </Grid.ColumnDefinitions>
                <TextBlock
                    Grid.Column="0"
-                    Text="{x:Bind DirectoryCount, Mode=OneWay}"
-                    IsTextSelectionEnabled="True"
                    VerticalAlignment="Center"
+                    IsTextSelectionEnabled="True"
+                    Text="{x:Bind DirectoryCount, Mode=OneWay}"
                    TextWrapping="Wrap" />
                <Border
                    Grid.Column="1"
                    BorderBrush="{ThemeResource TextFillColorPrimaryBrush}"
-                    BorderThickness="0 0 1 0" />
+                    BorderThickness="0,0,1,0" />
                <TextBlock
                    Grid.Column="2"
-                    Text="{x:Bind FileCount, Mode=OneWay}"
-                    IsTextSelectionEnabled="True"
                    VerticalAlignment="Center"
+                    IsTextSelectionEnabled="True"
+                    Text="{x:Bind FileCount, Mode=OneWay}"
                    TextWrapping="Wrap" />
                <Border
                    Grid.Column="3"
                    BorderBrush="{ThemeResource TextFillColorPrimaryBrush}"
-                    BorderThickness="0 0 1 0" />
+                    BorderThickness="0,0,1,0" />
                <TextBlock
                    Grid.Column="4"
-                    Text="{x:Bind Size, Mode=OneWay}"
-                    IsTextSelectionEnabled="True"
                    VerticalAlignment="Center"
+                    IsTextSelectionEnabled="True"
+                    Text="{x:Bind Size, Mode=OneWay}"
                    TextWrapping="Wrap" />
            </Grid>
        </Border>
--- a/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml
+++ b/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml
@@ -1,22 +1,22 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
-<!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!--  Copyright (c) Microsoft Corporation. All rights reserved.  -->
+<!--  Licensed under the MIT License. See LICENSE in the project root for license information.  -->

 <UserControl
    x:Class="Peek.FilePreviewer.Controls.BrowserControl"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Peek.FilePreviewer.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Peek.FilePreviewer.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    mc:Ignorable="d">

    <Grid>
        <controls:WebView2
            x:Name="PreviewBrowser"
            Loaded="PreviewWV2_Loaded"
-            NavigationStarting="PreviewBrowser_NavigationStarting"
-            NavigationCompleted="PreviewWV2_NavigationCompleted" />
+            NavigationCompleted="PreviewWV2_NavigationCompleted"
+            NavigationStarting="PreviewBrowser_NavigationStarting" />
        <ContentDialog
            x:Name="OpenUriDialog"
            x:Uid="OpenUriDialog"
--- a/src/modules/peek/Peek.FilePreviewer/Controls/UnsupportedFilePreview/InformationalPreviewControl.xaml
+++ b/src/modules/peek/Peek.FilePreviewer/Controls/UnsupportedFilePreview/InformationalPreviewControl.xaml
@@ -1,4 +1,4 @@
-<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
+<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
 <!--  Licensed under the MIT License.  -->

 <UserControl
@@ -34,18 +34,18 @@
                Text="{x:Bind Source.FileName, Mode=OneWay}"
                TextTrimming="CharacterEllipsis">
                <ToolTipService.ToolTip>
-                    <ToolTip Content="{x:Bind Source.FileName, Mode=OneWay}"/>
+                    <ToolTip Content="{x:Bind Source.FileName, Mode=OneWay}" />
                </ToolTipService.ToolTip>
            </TextBlock>
            <TextBlock Text="{x:Bind FormatFileType(Source.FileType), Mode=OneWay}">
                <ToolTipService.ToolTip>
-                    <ToolTip Content="{x:Bind FormatFileType(Source.FileType), Mode=OneWay}"/>
+                    <ToolTip Content="{x:Bind FormatFileType(Source.FileType), Mode=OneWay}" />
                </ToolTipService.ToolTip>
            </TextBlock>
-            <TextBlock Text="{x:Bind FormatFileSize(Source.FileSize), Mode=OneWay}"/>
+            <TextBlock Text="{x:Bind FormatFileSize(Source.FileSize), Mode=OneWay}" />
            <TextBlock Text="{x:Bind FormatFileDateModified(Source.DateModified), Mode=OneWay}">
                <ToolTipService.ToolTip>
-                    <ToolTip Content="{x:Bind FormatFileDateModified(Source.DateModified), Mode=OneWay}"/>
+                    <ToolTip Content="{x:Bind FormatFileDateModified(Source.DateModified), Mode=OneWay}" />
                </ToolTipService.ToolTip>
            </TextBlock>
        </StackPanel>
--- a/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml
+++ b/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml
@@ -53,13 +53,13 @@

        <controls:ArchiveControl
            x:Name="ArchivePreview"
-            LoadingState="{x:Bind ArchivePreviewer.State, Mode=OneWay}"
-            Source="{x:Bind ArchivePreviewer.Tree, Mode=OneWay}"
-            FileCount="{x:Bind ArchivePreviewer.FileCountText, Mode=OneWay}"
            DirectoryCount="{x:Bind ArchivePreviewer.DirectoryCountText, Mode=OneWay}"
+            FileCount="{x:Bind ArchivePreviewer.FileCountText, Mode=OneWay}"
+            LoadingState="{x:Bind ArchivePreviewer.State, Mode=OneWay}"
            Size="{x:Bind ArchivePreviewer.SizeText, Mode=OneWay}"
+            Source="{x:Bind ArchivePreviewer.Tree, Mode=OneWay}"
            Visibility="{x:Bind IsPreviewVisible(ArchivePreviewer, Previewer.State), Mode=OneWay}" />
-        
+
        <controls:UnsupportedFilePreview
            x:Name="UnsupportedFilePreview"
            LoadingState="{x:Bind UnsupportedFilePreviewer.State, Mode=OneWay}"
--- a/src/modules/peek/Peek.UI/PeekXAML/App.xaml
+++ b/src/modules/peek/Peek.UI/PeekXAML/App.xaml
@@ -1,5 +1,5 @@
-<!-- Copyright (c) Microsoft Corporation and Contributors. -->
-<!-- Licensed under the MIT License. -->
+<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
+<!--  Licensed under the MIT License.  -->

 <Application
    x:Class="Peek.UI.App"
@@ -10,9 +10,9 @@
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
+                <!--  Other merged dictionaries here  -->
            </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
+            <!--  Other app resources here  -->
        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml
+++ b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml
@@ -1,4 +1,4 @@
-<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
+<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
 <!--  Licensed under the MIT License.  -->

 <UserControl
@@ -7,8 +7,8 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="using:Peek.UI.Views"
-    FlowDirection="{x:Bind TitleBarFlowDirection, Mode=OneWay}"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    FlowDirection="{x:Bind TitleBarFlowDirection, Mode=OneWay}"
    mc:Ignorable="d">

    <Grid x:Name="TitleBarRootContainer" Height="48">
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
@@ -34,7 +34,6 @@
                                x:Name="RootGrid"
                                Background="{ThemeResource AccentButtonBackground}"
                                CornerRadius="{TemplateBinding CornerRadius}">
-
                                <Grid.Resources>
                                    <!--  Override the style of the inner buttons so that they don't affect background/foreground/border colors  -->
                                    <Style TargetType="Button">
@@ -52,6 +51,18 @@
                                            <Setter.Value>
                                                <ControlTemplate TargetType="Button">
                                                    <Grid x:Name="RootGrid" Background="Transparent">
+                                                        <ContentPresenter
+                                                            x:Name="ContentPresenter"
+                                                            Padding="{TemplateBinding Padding}"
+                                                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                            AnimatedIcon.State="Normal"
+                                                            AutomationProperties.AccessibilityView="Raw"
+                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                            Content="{TemplateBinding Content}"
+                                                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                            ContentTransitions="{TemplateBinding ContentTransitions}" />
                                                        <VisualStateManager.VisualStateGroups>
                                                            <VisualStateGroup x:Name="CommonStates">
                                                                <VisualState x:Name="Normal" />
@@ -75,19 +86,6 @@
                                                                </VisualState>
                                                            </VisualStateGroup>
                                                        </VisualStateManager.VisualStateGroups>
-
-                                                        <ContentPresenter
-                                                            x:Name="ContentPresenter"
-                                                            Padding="{TemplateBinding Padding}"
-                                                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                            AnimatedIcon.State="Normal"
-                                                            AutomationProperties.AccessibilityView="Raw"
-                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                            Content="{TemplateBinding Content}"
-                                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                            ContentTransitions="{TemplateBinding ContentTransitions}" />
                                                    </Grid>
                                                </ControlTemplate>
                                            </Setter.Value>
@@ -104,6 +102,85 @@
                                    <ColumnDefinition x:Name="SecondaryButtonColumn" Width="{ThemeResource SplitButtonSecondaryButtonSize}" />
                                </Grid.ColumnDefinitions>

+                                <Grid
+                                    x:Name="PrimaryBackgroundGrid"
+                                    Grid.ColumnSpan="2"
+                                    Background="{TemplateBinding Background}" />
+
+                                <Grid
+                                    x:Name="DividerBackgroundGrid"
+                                    Grid.Column="1"
+                                    Width="1"
+                                    Background="{ThemeResource AccentButtonBorderBrush}" />
+
+                                <Grid
+                                    x:Name="SecondaryBackgroundGrid"
+                                    Grid.Column="2"
+                                    Background="{TemplateBinding Background}" />
+
+                                <Grid
+                                    x:Name="Border"
+                                    Grid.ColumnSpan="3"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding CornerRadius}" />
+
+                                <Button
+                                    x:Name="PrimaryButton"
+                                    Grid.Column="0"
+                                    Padding="{TemplateBinding Padding}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="Transparent"
+                                    BorderThickness="0"
+                                    Command="{TemplateBinding Command}"
+                                    CommandParameter="{TemplateBinding CommandParameter}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    ContentTransitions="{TemplateBinding ContentTransitions}"
+                                    FontFamily="{TemplateBinding FontFamily}"
+                                    FontSize="{TemplateBinding FontSize}"
+                                    FontWeight="{TemplateBinding FontWeight}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False" />
+
+                                <Button
+                                    x:Name="SecondaryButton"
+                                    Grid.Column="2"
+                                    Padding="0,0,12,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    HorizontalContentAlignment="Stretch"
+                                    VerticalContentAlignment="Stretch"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="Transparent"
+                                    BorderThickness="0"
+                                    Foreground="{ThemeResource AccentButtonForeground}"
+                                    IsTabStop="False">
+                                    <Button.Content>
+                                        <AnimatedIcon
+                                            Width="12"
+                                            Height="12"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Center"
+                                            AutomationProperties.AccessibilityView="Raw">
+                                            <animatedVisuals:AnimatedChevronDownSmallVisualSource />
+                                            <AnimatedIcon.FallbackIconSource>
+                                                <FontIconSource
+                                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                    FontSize="8"
+                                                    Glyph="&#xE96E;"
+                                                    IsTextScaleFactorEnabled="False" />
+                                            </AnimatedIcon.FallbackIconSource>
+                                        </AnimatedIcon>
+                                    </Button.Content>
+                                </Button>
+
                                <VisualStateManager.VisualStateGroups>
                                    <VisualStateGroup x:Name="CommonStates">
                                        <VisualState x:Name="Normal" />
@@ -251,85 +328,6 @@
                                        </VisualState>
                                    </VisualStateGroup>
                                </VisualStateManager.VisualStateGroups>
-
-                                <Grid
-                                    x:Name="PrimaryBackgroundGrid"
-                                    Grid.ColumnSpan="2"
-                                    Background="{TemplateBinding Background}" />
-
-                                <Grid
-                                    x:Name="DividerBackgroundGrid"
-                                    Grid.Column="1"
-                                    Width="1"
-                                    Background="{ThemeResource AccentButtonBorderBrush}" />
-
-                                <Grid
-                                    x:Name="SecondaryBackgroundGrid"
-                                    Grid.Column="2"
-                                    Background="{TemplateBinding Background}" />
-
-                                <Grid
-                                    x:Name="Border"
-                                    Grid.ColumnSpan="3"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding CornerRadius}" />
-
-                                <Button
-                                    x:Name="PrimaryButton"
-                                    Grid.Column="0"
-                                    Padding="{TemplateBinding Padding}"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="Transparent"
-                                    BorderThickness="0"
-                                    Command="{TemplateBinding Command}"
-                                    CommandParameter="{TemplateBinding CommandParameter}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTransitions="{TemplateBinding ContentTransitions}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    IsTabStop="False" />
-
-                                <Button
-                                    x:Name="SecondaryButton"
-                                    Grid.Column="2"
-                                    Padding="0,0,12,0"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="Transparent"
-                                    BorderThickness="0"
-                                    Foreground="{ThemeResource AccentButtonForeground}"
-                                    IsTabStop="False">
-                                    <Button.Content>
-                                        <AnimatedIcon
-                                            Width="12"
-                                            Height="12"
-                                            HorizontalAlignment="Right"
-                                            VerticalAlignment="Center"
-                                            AutomationProperties.AccessibilityView="Raw">
-                                            <animatedVisuals:AnimatedChevronDownSmallVisualSource />
-                                            <AnimatedIcon.FallbackIconSource>
-                                                <FontIconSource
-                                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                    FontSize="8"
-                                                    Glyph="&#xE96E;"
-                                                    IsTextScaleFactorEnabled="False" />
-                                            </AnimatedIcon.FallbackIconSource>
-                                        </AnimatedIcon>
-                                    </Button.Content>
-                                </Button>
                            </Grid>
                        </ControlTemplate>
                    </Setter.Value>
@@ -371,6 +369,16 @@
                                                        BorderBrush="{ThemeResource TextControlButtonBorderBrush}"
                                                        BorderThickness="{TemplateBinding BorderThickness}"
                                                        CornerRadius="{ThemeResource ControlCornerRadius}">
+                                                        <TextBlock
+                                                            x:Name="GlyphElement"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            AutomationProperties.AccessibilityView="Raw"
+                                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                            FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
+                                                            FontStyle="Normal"
+                                                            Foreground="{ThemeResource TextControlButtonForeground}"
+                                                            Text="&#xe894;" />
                                                        <VisualStateManager.VisualStateGroups>
                                                            <VisualStateGroup x:Name="CommonStates">
                                                                <VisualState x:Name="Normal" />
@@ -414,16 +422,6 @@
                                                                </VisualState>
                                                            </VisualStateGroup>
                                                        </VisualStateManager.VisualStateGroups>
-                                                        <TextBlock
-                                                            x:Name="GlyphElement"
-                                                            HorizontalAlignment="Center"
-                                                            VerticalAlignment="Center"
-                                                            AutomationProperties.AccessibilityView="Raw"
-                                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                            FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
-                                                            FontStyle="Normal"
-                                                            Foreground="{ThemeResource TextControlButtonForeground}"
-                                                            Text="&#xe894;" />
                                                    </Grid>
                                                </ControlTemplate>
                                            </Setter.Value>
@@ -518,92 +516,6 @@
                                    <RowDefinition Height="*" />
                                    <RowDefinition Height="Auto" />
                                </Grid.RowDefinitions>
-
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-
-                                        <VisualState x:Name="Disabled">
-
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="Normal" />
-
-                                        <VisualState x:Name="PointerOver">
-
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="Focused">
-
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderThickness">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="QueryButton" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonForeground}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-
-                                    </VisualStateGroup>
-                                    <VisualStateGroup x:Name="ButtonStates">
-                                        <VisualState x:Name="ButtonVisible">
-
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton" Storyboard.TargetProperty="Visibility">
-                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                        <DiscreteObjectKeyFrame.Value>
-                                                            <Visibility>Visible</Visibility>
-                                                        </DiscreteObjectKeyFrame.Value>
-                                                    </DiscreteObjectKeyFrame>
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="ButtonCollapsed" />
-
-                                    </VisualStateGroup>
-
-                                </VisualStateManager.VisualStateGroups>
                                <Border
                                    x:Name="BorderElement"
                                    Grid.Row="1"
@@ -692,6 +604,91 @@
                                    Content="{TemplateBinding Description}"
                                    Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />

+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+
+                                        <VisualState x:Name="Disabled">
+
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="Normal" />
+
+                                        <VisualState x:Name="PointerOver">
+
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="Focused">
+
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundFocused}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundFocused}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderBrushFocused}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderThickness">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="QueryButton" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonForeground}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+
+                                    </VisualStateGroup>
+                                    <VisualStateGroup x:Name="ButtonStates">
+                                        <VisualState x:Name="ButtonVisible">
+
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton" Storyboard.TargetProperty="Visibility">
+                                                    <DiscreteObjectKeyFrame KeyTime="0">
+                                                        <DiscreteObjectKeyFrame.Value>
+                                                            <Visibility>Visible</Visibility>
+                                                        </DiscreteObjectKeyFrame.Value>
+                                                    </DiscreteObjectKeyFrame>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState>
+                                        <VisualState x:Name="ButtonCollapsed" />
+
+                                    </VisualStateGroup>
+
+                                </VisualStateManager.VisualStateGroups>
                            </Grid>

                        </ControlTemplate>
@@ -719,7 +716,6 @@
                    <Setter.Value>
                        <ControlTemplate TargetType="AutoSuggestBox">
                            <Grid x:Name="LayoutRoot">
-
                                <Grid.ColumnDefinitions>
                                    <ColumnDefinition Width="*" />
                                </Grid.ColumnDefinitions>
@@ -728,14 +724,6 @@
                                    <RowDefinition Height="*" />
                                </Grid.RowDefinitions>

-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="Orientation">
-                                        <VisualState x:Name="Landscape" />
-                                        <VisualState x:Name="Portrait" />
-                                    </VisualStateGroup>
-
-                                </VisualStateManager.VisualStateGroups>
-
                                <TextBox
                                    x:Name="TextBox"
                                    Width="{TemplateBinding Width}"
@@ -781,6 +769,13 @@
                                    </Border>
                                </Popup>

+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="Orientation">
+                                        <VisualState x:Name="Landscape" />
+                                        <VisualState x:Name="Portrait" />
+                                    </VisualStateGroup>
+
+                                </VisualStateManager.VisualStateGroups>
                            </Grid>

                        </ControlTemplate>
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.xaml
@@ -17,27 +17,6 @@
            <!--  Error tooltip  -->
        </Grid.ColumnDefinitions>

-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="Highlight">
-                    <VisualState.Setters>
-                        <Setter Target="HighlightBorder.Opacity" Value="0.1" />
-                        <Setter Target="HighlightBorder.BorderBrush" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
-                        <Setter Target="HighlightBorder.Background" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Error">
-                    <VisualState.Setters>
-                        <Setter Target="HighlightBorder.Opacity" Value="1" />
-                        <Setter Target="HighlightBorder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
-                        <Setter Target="HighlightBorder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
-                        <Setter Target="ErrorIcon.Visibility" Value="Visible" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-
        <Border
            Name="HighlightBorder"
            Grid.ColumnSpan="4"
@@ -121,5 +100,26 @@
                    TextWrapping="Wrap" />
            </ToolTipService.ToolTip>
        </Border>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="Highlight">
+                    <VisualState.Setters>
+                        <Setter Target="HighlightBorder.Opacity" Value="0.1" />
+                        <Setter Target="HighlightBorder.BorderBrush" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                        <Setter Target="HighlightBorder.Background" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Error">
+                    <VisualState.Setters>
+                        <Setter Target="HighlightBorder.Opacity" Value="1" />
+                        <Setter Target="HighlightBorder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
+                        <Setter Target="HighlightBorder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
+                        <Setter Target="ErrorIcon.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
    </Grid>
 </UserControl>
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
@@ -366,41 +366,43 @@
                                            </DataTemplate>
                                        </ListView.ItemTemplate>
                                    </ListView>
-                                    <TextBlock x:Uid="CounterCheatSheet_Title"
-                                            Margin="0,10,0,0"
-                                            FontWeight="SemiBold" Grid.Row="2" />
-                                    <ListView Margin="-4,12,0,0"
-                                            IsItemClickEnabled="True"
-                                            ItemClick="DateTimeItemClick"
-                                            ItemsSource="{x:Bind CounterShortcuts}"
-                                            SelectionMode="None" Grid.Row="3">
+                                    <TextBlock
+                                        x:Uid="CounterCheatSheet_Title"
+                                        Grid.Row="2"
+                                        Margin="0,10,0,0"
+                                        FontWeight="SemiBold" />
+                                    <ListView
+                                        Grid.Row="3"
+                                        Margin="-4,12,0,0"
+                                        IsItemClickEnabled="True"
+                                        ItemClick="DateTimeItemClick"
+                                        ItemsSource="{x:Bind CounterShortcuts}"
+                                        SelectionMode="None">
                                        <ListView.ItemTemplate>
-                                            <DataTemplate
-                                                    x:DataType="local:PatternSnippet">
-                                                <Grid Margin="-10,0,0,0"
-                                                        ColumnSpacing="8">
+                                            <DataTemplate x:DataType="local:PatternSnippet">
+                                                <Grid Margin="-10,0,0,0" ColumnSpacing="8">
                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition
-                                                                Width="Auto" />
-                                                        <ColumnDefinition
-                                                                Width="*" />
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
                                                    </Grid.ColumnDefinitions>
-                                                    <Border Padding="8"
-                                                            HorizontalAlignment="Left"
-                                                            Background="{ThemeResource ButtonBackground}"
-                                                            BorderBrush="{ThemeResource ButtonBorderBrush}"
-                                                            BorderThickness="1"
-                                                            CornerRadius="4">
+                                                    <Border
+                                                        Padding="8"
+                                                        HorizontalAlignment="Left"
+                                                        Background="{ThemeResource ButtonBackground}"
+                                                        BorderBrush="{ThemeResource ButtonBorderBrush}"
+                                                        BorderThickness="1"
+                                                        CornerRadius="4">
                                                        <TextBlock
-                                                                FontFamily="Consolas"
-                                                                Foreground="{ThemeResource ButtonForeground}"
-                                                                Text="{x:Bind Code}" />
+                                                            FontFamily="Consolas"
+                                                            Foreground="{ThemeResource ButtonForeground}"
+                                                            Text="{x:Bind Code}" />
                                                    </Border>
-                                                    <TextBlock Grid.Column="1"
-                                                            VerticalAlignment="Center"
-                                                            FontSize="12"
-                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                            Text="{x:Bind Description}" />
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="12"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Text="{x:Bind Description}" />
                                                </Grid>
                                            </DataTemplate>
                                        </ListView.ItemTemplate>