From b2debf85d82c454eb1514858d4ef1454c0d61571 Mon Sep 17 00:00:00 2001
From: ProJend <55018532+ProJend@users.noreply.github.com>
Date: Sun, 20 Oct 2024 10:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=81=97?=
 =?UTF-8?q?=E7=95=99=E7=9A=84ui=E9=97=AE=E9=A2=98=20(#871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #552 #272 修复加载缩略图时遮挡状态栏的问题

* #96 全局mica半透明背景

* 去除多余的白色焦点边框
---
 .../Controls/Dynamic/DynamicTemplate.xaml     |   2 +-
 .../Controls/Dynamic/DynamicV2Template.xaml   |   2 +-
 .../Controls/ImageViewerControl.xaml          |  19 +-
 .../Settings/LiveSettingsControl.xaml         |   2 +-
 .../Settings/VideoDanmakuSettingsControl.xaml |   6 +-
 src/BiliLite.UWP/MainPage.xaml                |  73 ++-
 src/BiliLite.UWP/NoTabMainPage.xaml           |  72 ++-
 src/BiliLite.UWP/NoTabMainPage.xaml.cs        |  10 +-
 .../Pages/Bangumi/AnimeIndexPage.xaml         |   2 +-
 .../Pages/Bangumi/SeasonRankPage.xaml         |   2 +-
 .../Pages/Bangumi/TimelinePage.xaml           |   2 +-
 src/BiliLite.UWP/Pages/DownloadPage.xaml      |   2 +-
 .../Pages/Home/UserDynamicPage.xaml           |   3 +-
 src/BiliLite.UWP/Pages/HomePage.xaml          |   4 +-
 .../Pages/Live/LiveAreaDetailPage.xaml        |   2 +-
 src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml |   2 +-
 .../Pages/Live/LiveCenterPage.xaml            |   4 +-
 .../Pages/Live/LiveRecommendPage.xaml         |   2 +-
 .../Pages/Other/MarkdownViewerPage.xaml       |   2 +-
 src/BiliLite.UWP/Pages/Other/TopicPage.xaml   |   4 +-
 src/BiliLite.UWP/Pages/RankPage.xaml          |   2 +-
 src/BiliLite.UWP/Pages/RegionDetailPage.xaml  |   2 +-
 src/BiliLite.UWP/Pages/SearchPage.xaml        |   7 +-
 src/BiliLite.UWP/Pages/SearchPage.xaml.cs     |   9 +-
 src/BiliLite.UWP/Pages/SeasonDetailPage.xaml  |   8 +-
 src/BiliLite.UWP/Pages/SettingPage.xaml       |   2 +-
 .../Pages/User/CollectedPage.xaml             |   2 +-
 .../Pages/User/DynamicDetailPage.xaml         |   2 +-
 .../Pages/User/DynamicSpacePage.xaml          |   4 +-
 src/BiliLite.UWP/Pages/User/FavoritePage.xaml |   6 +-
 src/BiliLite.UWP/Pages/User/HistoryPage.xaml  |   4 +-
 .../Pages/User/WatchlaterPage.xaml            |   2 +-
 src/BiliLite.UWP/Pages/UserInfoPage.xaml      |   9 +-
 src/BiliLite.UWP/Pages/VideoDetailPage.xaml   |   8 +-
 src/BiliLite.UWP/Styles/TabViewStyle.xaml     | 451 ++++++++++--------
 src/BiliLite.UWP/Themes/Dark.xaml             |  16 +-
 src/BiliLite.UWP/Themes/Light.xaml            |  14 +-
 37 files changed, 431 insertions(+), 334 deletions(-)

diff --git a/src/BiliLite.UWP/Controls/Dynamic/DynamicTemplate.xaml b/src/BiliLite.UWP/Controls/Dynamic/DynamicTemplate.xaml
index 2a6e297d2..806f3aa8e 100644
--- a/src/BiliLite.UWP/Controls/Dynamic/DynamicTemplate.xaml
+++ b/src/BiliLite.UWP/Controls/Dynamic/DynamicTemplate.xaml
@@ -177,7 +177,7 @@
     <DataTemplate x:Key="Repost">
         <local:DynamicItemControl ViewModel="{Binding}">
             <local:DynamicItemControl.CardContent>
-                <Border BorderThickness="1"  BorderBrush="#C8E5E9EF"  CornerRadius="4" Background="{ThemeResource TopPaneBackground}">
+                <Border BorderThickness="1"  BorderBrush="#C8E5E9EF"  CornerRadius="4" Background="Transparent">
                     <ListView 
                         SelectionMode="None" 
                         IsItemClickEnabled="false" 
diff --git a/src/BiliLite.UWP/Controls/Dynamic/DynamicV2Template.xaml b/src/BiliLite.UWP/Controls/Dynamic/DynamicV2Template.xaml
index a182e9957..997049e8b 100644
--- a/src/BiliLite.UWP/Controls/Dynamic/DynamicV2Template.xaml
+++ b/src/BiliLite.UWP/Controls/Dynamic/DynamicV2Template.xaml
@@ -188,7 +188,7 @@
                 <Grid>
                     <Border BorderThickness="1"  
                             BorderBrush="#C8E5E9EF"  
-                            CornerRadius="4" Background="{ThemeResource TopPaneBackground}"
+                            CornerRadius="4" Background="Transparent"
                             Visibility="{Binding ForwardMissed,Converter={StaticResource display} }">
                         <ListView 
                             SelectionMode="None" 
diff --git a/src/BiliLite.UWP/Controls/ImageViewerControl.xaml b/src/BiliLite.UWP/Controls/ImageViewerControl.xaml
index 59dfa6d64..0d574b7d2 100644
--- a/src/BiliLite.UWP/Controls/ImageViewerControl.xaml
+++ b/src/BiliLite.UWP/Controls/ImageViewerControl.xaml
@@ -37,15 +37,6 @@
                                 <SymbolIcon Margin="0 -4 0 4" Symbol="Pictures"></SymbolIcon>
                             </AppBarButton.Icon>
                         </AppBarButton>
-                        <AppBarButton ToolTipService.ToolTip="放大" x:Name="btnZoomIn" Click="btnZoomIn_Click" Width="40" Height="40" Foreground="White">
-                            <AppBarButton.KeyboardAccelerators>
-                                <KeyboardAccelerator  Modifiers="None"  Key="Up" />
-                            </AppBarButton.KeyboardAccelerators>
-                            <AppBarButton.Icon>
-                                <SymbolIcon Margin="0 -4 0 4" Symbol="ZoomIn"></SymbolIcon>
-                            </AppBarButton.Icon>
-                        </AppBarButton>
-                        <TextBlock VerticalAlignment="Center" FontSize="16" Margin="8 0" Foreground="White" Text="{Binding ElementName=scrollViewer,Path=ZoomFactor,Mode=OneWay,Converter={StaticResource numberToStringConvert},ConverterParameter='p00'}"></TextBlock>
                         <AppBarButton ToolTipService.ToolTip="缩小" x:Name="btnZoomOut" Click="btnZoomOut_Click" Width="40" Height="40" Foreground="White">
                             <AppBarButton.Icon>
                                 <SymbolIcon Margin="0 -4 0 4" Symbol="ZoomOut"></SymbolIcon>
@@ -54,7 +45,15 @@
                                 <KeyboardAccelerator  Modifiers="None"  Key="Down" />
                             </AppBarButton.KeyboardAccelerators>
                         </AppBarButton>
-
+                        <TextBlock VerticalAlignment="Center" FontSize="16" Margin="8 0" Foreground="White" Text="{Binding ElementName=scrollViewer,Path=ZoomFactor,Mode=OneWay,Converter={StaticResource numberToStringConvert},ConverterParameter='p00'}"></TextBlock>
+                        <AppBarButton ToolTipService.ToolTip="放大" x:Name="btnZoomIn" Click="btnZoomIn_Click" Width="40" Height="40" Foreground="White">
+                            <AppBarButton.KeyboardAccelerators>
+                                <KeyboardAccelerator  Modifiers="None"  Key="Up" />
+                            </AppBarButton.KeyboardAccelerators>
+                            <AppBarButton.Icon>
+                                <SymbolIcon Margin="0 -4 0 4" Symbol="ZoomIn"></SymbolIcon>
+                            </AppBarButton.Icon>
+                        </AppBarButton>
                     </StackPanel>
                 </Border>
                 <Border Margin="12 0 0 0" CornerRadius="8"  Background="#7F000000" >
diff --git a/src/BiliLite.UWP/Controls/Settings/LiveSettingsControl.xaml b/src/BiliLite.UWP/Controls/Settings/LiveSettingsControl.xaml
index cc0f159bc..139463ccd 100644
--- a/src/BiliLite.UWP/Controls/Settings/LiveSettingsControl.xaml
+++ b/src/BiliLite.UWP/Controls/Settings/LiveSettingsControl.xaml
@@ -64,7 +64,7 @@
                                 <TextBox x:Name="LiveDanmuSettingTxtWord" PlaceholderText="请输入关键词" Width="200"></TextBox>
                                 <Button x:Name="LiveDanmuSettingAddWord" Click="LiveDanmuSettingAddWord_Click" Margin="4 0">添加</Button>
                             </StackPanel>
-                            <ListView x:Name="LiveDanmuSettingListWords" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="{ThemeResource TopPaneBackground}">
+                            <ListView x:Name="LiveDanmuSettingListWords" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="Transparent">
 
                                 <ListView.ItemTemplate>
                                     <DataTemplate>
diff --git a/src/BiliLite.UWP/Controls/Settings/VideoDanmakuSettingsControl.xaml b/src/BiliLite.UWP/Controls/Settings/VideoDanmakuSettingsControl.xaml
index c877f322c..c2a2b3187 100644
--- a/src/BiliLite.UWP/Controls/Settings/VideoDanmakuSettingsControl.xaml
+++ b/src/BiliLite.UWP/Controls/Settings/VideoDanmakuSettingsControl.xaml
@@ -84,7 +84,7 @@
                                 <TextBox x:Name="DanmuSettingTxtWord" PlaceholderText="请输入关键词" Width="200"></TextBox>
                                 <Button x:Name="DanmuSettingAddWord" Click="DanmuSettingAddWord_Click" Margin="4 0">添加</Button>
                             </StackPanel>
-                            <ListView x:Name="DanmuSettingListWords" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="{ThemeResource TopPaneBackground}">
+                            <ListView x:Name="DanmuSettingListWords" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="Transparent">
 
                                 <ListView.ItemTemplate>
                                     <DataTemplate>
@@ -111,7 +111,7 @@
                                 <TextBox x:Name="DanmuSettingTxtRegex" PlaceholderText="请输入正则表达式" Width="200"></TextBox>
                                 <Button x:Name="DanmuSettingAddRegex" Click="DanmuSettingAddRegex_Click" Margin="4 0">添加</Button>
                             </StackPanel>
-                            <ListView x:Name="DanmuSettingListRegulars" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="{ThemeResource TopPaneBackground}">
+                            <ListView x:Name="DanmuSettingListRegulars" ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8 0 0" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="Transparent">
                                 <ListView.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>
@@ -137,7 +137,7 @@
                                 <TextBox x:Name="DanmuSettingTxtUser" PlaceholderText="请输入用户ID" Width="200"></TextBox>
                                 <Button x:Name="DanmuSettingAddUser" Click="DanmuSettingAddUser_Click" Margin="4 0">添加</Button>
                             </StackPanel>
-                            <ListView x:Name="DanmuSettingListUsers"  ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="{ThemeResource TopPaneBackground}">
+                            <ListView x:Name="DanmuSettingListUsers"  ItemContainerStyle="{StaticResource DanmuFilterStyle}" Margin="0 8" SelectionMode="None" IsItemClickEnabled="False" Width="320" Height="160" HorizontalAlignment="Left" Background="Transparent">
                                 <ListView.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>
diff --git a/src/BiliLite.UWP/MainPage.xaml b/src/BiliLite.UWP/MainPage.xaml
index c963026fa..6246f0468 100644
--- a/src/BiliLite.UWP/MainPage.xaml
+++ b/src/BiliLite.UWP/MainPage.xaml
@@ -2,37 +2,48 @@
     x:Class="BiliLite.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:BiliLite"
+    xmlns:controls="using:BiliLite.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fa="using:FontAwesome5"
+    xmlns:local="using:BiliLite"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
+    xmlns:muxm="using:Microsoft.UI.Xaml.Media"
+    xmlns:pages="using:BiliLite.Pages"
     xmlns:winui="using:Microsoft.UI.Xaml.Controls"
     winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
-    xmlns:fa="using:FontAwesome5"
-    xmlns:pages="using:BiliLite.Pages"
-    xmlns:muxm="using:Microsoft.UI.Xaml.Media" 
-    xmlns:controls="using:BiliLite.Controls"
-    Background="Transparent">
+    mc:Ignorable="d">
+    <Page.Resources>
+        <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="Transparent" />
+    </Page.Resources>
 
     <Grid>
-        <Grid x:Name="CustomDragRegion" Width="{Binding ElementName=AvailableDragRegion, Path=Width}"/>
-        <winui:TabView 
-            TabWidthMode="SizeToContent" Style="{ThemeResource DefaultTabViewStyle}"
-            x:Name="tabView" 
-            TabItemsChanged="tabView_TabItemsChanged" 
-            VerticalAlignment="Stretch" 
-            VerticalContentAlignment="Stretch" 
-            Loaded="tabView_Loaded" 
-            IsAddTabButtonVisible="True" 
+        <Grid x:Name="CustomDragRegion" Width="{Binding ElementName=AvailableDragRegion, Path=Width}" />
+        <winui:TabView
+            x:Name="tabView"
+            VerticalAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            AddTabButtonClick="TabView_AddTabButtonClick"
+            IsAddTabButtonVisible="True"
+            Loaded="tabView_Loaded"
             PreviewKeyDown="TabView_OnPreviewKeyDown"
-            TabCloseRequested="TabView_TabCloseRequested" 
-            AddTabButtonClick="TabView_AddTabButtonClick">
+            TabCloseRequested="TabView_TabCloseRequested"
+            TabItemsChanged="tabView_TabItemsChanged"
+            TabWidthMode="SizeToContent">
             <winui:TabView.KeyboardAccelerators>
-                <KeyboardAccelerator Key="T" Modifiers="Control" Invoked="NewTabKeyboardAccelerator_Invoked" />
-                <KeyboardAccelerator Key="W" Modifiers="Control" Invoked="CloseSelectedTabKeyboardAccelerator_Invoked" />
+                <KeyboardAccelerator
+                    Key="T"
+                    Invoked="NewTabKeyboardAccelerator_Invoked"
+                    Modifiers="Control" />
+                <KeyboardAccelerator
+                    Key="W"
+                    Invoked="CloseSelectedTabKeyboardAccelerator_Invoked"
+                    Modifiers="Control" />
             </winui:TabView.KeyboardAccelerators>
             <winui:TabView.TabItems>
-                <winui:TabViewItem IsClosable="False" Header="首页">
+                <winui:TabViewItem
+                    Header="首页"
+                    IsClosable="False">
                     <winui:TabViewItem.IconSource>
                         <winui:SymbolIconSource Symbol="Home" />
                     </winui:TabViewItem.IconSource>
@@ -40,15 +51,25 @@
             </winui:TabView.TabItems>
 
             <winui:TabView.TabStripHeader>
-                <Grid x:Name="ShellTitlebarInset" Background="Transparent" />
+                <Grid x:Name="ShellTitlebarInset" />
             </winui:TabView.TabStripHeader>
             <winui:TabView.TabStripFooter>
-                <Grid x:Name="AvailableDragRegion" Background="Transparent" ></Grid>
+                <Grid x:Name="AvailableDragRegion" Background="Transparent" />
             </winui:TabView.TabStripFooter>
         </winui:TabView>
-        <Border x:Name="MiniWindowsTitleBar"  Visibility="Collapsed" Background="#00FFFFFF" Height="36" VerticalAlignment="Top"></Border>
-        <Grid x:Name="gridViewer" Opacity="0" Visibility="Collapsed" Background="{ThemeResource SystemControlChromeHighAcrylicElementMediumBrush}" >
-            <controls:ImageViewerControl x:Name="imgViewer" CloseEvent="imgViewer_CloseEvent"></controls:ImageViewerControl>
+        <Border
+            x:Name="MiniWindowsTitleBar"
+            Height="36"
+            VerticalAlignment="Top"
+            Background="#00FFFFFF"
+            Visibility="Collapsed" />
+        <Grid
+            x:Name="gridViewer"
+            Margin="0,48,0,0"
+            Background="{ThemeResource SystemControlChromeHighAcrylicElementMediumBrush}"
+            Opacity="0"
+            Visibility="Collapsed">
+            <controls:ImageViewerControl x:Name="imgViewer" CloseEvent="imgViewer_CloseEvent" />
         </Grid>
     </Grid>
 </Page>
diff --git a/src/BiliLite.UWP/NoTabMainPage.xaml b/src/BiliLite.UWP/NoTabMainPage.xaml
index b35cd6e3a..b7c7e4ec0 100644
--- a/src/BiliLite.UWP/NoTabMainPage.xaml
+++ b/src/BiliLite.UWP/NoTabMainPage.xaml
@@ -2,37 +2,67 @@
     x:Class="BiliLite.NoTabMainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:BiliLite"
+    xmlns:controls="using:BiliLite.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:BiliLite.Controls"
-    mc:Ignorable="d"
+    xmlns:local="using:BiliLite"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:winui="using:Microsoft.UI.Xaml.Controls"
+    winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
     Background="Transparent"
-    Loaded="NoTabMainPage_OnLoaded">
+    Loaded="NoTabMainPage_OnLoaded"
+    mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationBackground}">
+    <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid Height="32">
+
+        <local:NewInstanceFrame x:Name="frame" Grid.Row="1" />
+
+        <Grid
+            x:Name="gridViewer"
+            Grid.RowSpan="2"
+            Background="{ThemeResource SystemControlChromeHighAcrylicElementMediumBrush}"
+            Visibility="Collapsed">
+            <controls:ImageViewerControl x:Name="imgViewer" CloseEvent="imgViewer_CloseEvent" />
+        </Grid>
+        <Border
+            x:Name="MiniWindowsTitleBar"
+            Grid.RowSpan="2"
+            Height="40"
+            VerticalAlignment="Top"
+            Background="#00FFFFFF"
+            Visibility="Collapsed" />
+        <Grid Height="32" Background="Transparent">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Button x:Name="btnBack" Click="btnBack_Click" Visibility="Visible" Height="40" Background="Transparent" Width="48" Margin="0 -4" >
-                <FontIcon FontFamily="Segoe MDL2 Assets" FontSize="14" Glyph="&#xE0A6;" />
+            <Button
+                x:Name="btnBack"
+                Width="48"
+                Height="40"
+                Margin="0,-4"
+                Click="btnBack_Click"
+                Visibility="Visible">
+                <FontIcon
+                    FontFamily="Segoe MDL2 Assets"
+                    FontSize="14"
+                    Glyph="&#xE0A6;" />
             </Button>
-            <Border Grid.Column="1"  x:Name="TitleBar"  Background="#00000000">
-                <TextBlock x:Name="txtTitle" Margin="12 0" VerticalAlignment="Center">哔哩哔哩 UWP</TextBlock>
+            <Border
+                x:Name="TitleBar"
+                Grid.Column="1"
+                Background="Transparent">
+                <TextBlock
+                    x:Name="txtTitle"
+                    Margin="12,0"
+                    VerticalAlignment="Center">
+                    哔哩哔哩 UWP
+                </TextBlock>
             </Border>
         </Grid>
 
-        <local:NewInstanceFrame x:Name="frame" Grid.Row="1"/>
-
-
-        <Border x:Name="MiniWindowsTitleBar" Grid.RowSpan="2" Visibility="Collapsed"  Background="#00FFFFFF" Height="40" VerticalAlignment="Top"></Border>
-        <Grid x:Name="gridViewer" Grid.RowSpan="2" Visibility="Collapsed" Background="{ThemeResource SystemControlChromeHighAcrylicElementMediumBrush}" >
-            <controls:ImageViewerControl x:Name="imgViewer" CloseEvent="imgViewer_CloseEvent"></controls:ImageViewerControl>
-        </Grid>
     </Grid>
 </Page>
diff --git a/src/BiliLite.UWP/NoTabMainPage.xaml.cs b/src/BiliLite.UWP/NoTabMainPage.xaml.cs
index 1472b9ea9..474732cbb 100644
--- a/src/BiliLite.UWP/NoTabMainPage.xaml.cs
+++ b/src/BiliLite.UWP/NoTabMainPage.xaml.cs
@@ -110,7 +110,7 @@ private void Frame_Navigated(object sender, NavigationEventArgs e)
             {
                 txtTitle.Text = "哔哩哔哩 UWP";
             }
-            if (e.Content is Pages.BasePage && e.NavigationMode!=NavigationMode.Back)
+            if (e.Content is Pages.BasePage && e.NavigationMode != NavigationMode.Back)
             {
                 var title = (e.Content as BasePage).Title;
                 PushTitle(title);
@@ -168,6 +168,12 @@ private void NavigationHelper_NavigateToPageEvent(object sender, NavigationInfo
 
         private void btnBack_Click(object sender, RoutedEventArgs e)
         {
+            //如果打开了图片浏览，则关闭图片浏览
+            if (gridViewer.Visibility == Visibility.Visible)
+            {
+                imgViewer_CloseEvent(this, null);
+                return;
+            }
             if (frame.CanGoBack)
             {
                 frame.GoBack();
@@ -289,7 +295,7 @@ public bool Navigate(Type sourcePageType, object parameter = null)
 
             //跳转页面
             (this.Children.Last() as Frame).Navigate(sourcePageType, parameter);
-            
+
             return true;
         }
         public bool CanGoBack
diff --git a/src/BiliLite.UWP/Pages/Bangumi/AnimeIndexPage.xaml b/src/BiliLite.UWP/Pages/Bangumi/AnimeIndexPage.xaml
index 02a0ed8ea..1786c5260 100644
--- a/src/BiliLite.UWP/Pages/Bangumi/AnimeIndexPage.xaml
+++ b/src/BiliLite.UWP/Pages/Bangumi/AnimeIndexPage.xaml
@@ -19,7 +19,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid Background="{ThemeResource TopPaneBackground}">
+        <Grid>
             <ItemsControl ItemsSource="{x:Bind Path=seasonIndexVM.Conditions,Mode=OneWay}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
diff --git a/src/BiliLite.UWP/Pages/Bangumi/SeasonRankPage.xaml b/src/BiliLite.UWP/Pages/Bangumi/SeasonRankPage.xaml
index 15babff94..dc5a00905 100644
--- a/src/BiliLite.UWP/Pages/Bangumi/SeasonRankPage.xaml
+++ b/src/BiliLite.UWP/Pages/Bangumi/SeasonRankPage.xaml
@@ -12,7 +12,7 @@
     xmlns:modules="using:BiliLite.Modules.Season"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <convert:RankColorConvert x:Key="RankConvert"/>
     </Page.Resources>
diff --git a/src/BiliLite.UWP/Pages/Bangumi/TimelinePage.xaml b/src/BiliLite.UWP/Pages/Bangumi/TimelinePage.xaml
index 2545c784b..f0363440c 100644
--- a/src/BiliLite.UWP/Pages/Bangumi/TimelinePage.xaml
+++ b/src/BiliLite.UWP/Pages/Bangumi/TimelinePage.xaml
@@ -13,7 +13,7 @@
     xmlns:fa="using:FontAwesome5"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
     </Page.Resources>
     <Grid>
diff --git a/src/BiliLite.UWP/Pages/DownloadPage.xaml b/src/BiliLite.UWP/Pages/DownloadPage.xaml
index 6be357299..0b3d8cde4 100644
--- a/src/BiliLite.UWP/Pages/DownloadPage.xaml
+++ b/src/BiliLite.UWP/Pages/DownloadPage.xaml
@@ -13,7 +13,7 @@
     xmlns:viewModel="using:BiliLite.ViewModels.Download"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <convert:ByteSizeConvert x:Key="byteSizeConvert"/>
         <convert:DownloadStatusConvert x:Key="downloadStatusConvert"/>
diff --git a/src/BiliLite.UWP/Pages/Home/UserDynamicPage.xaml b/src/BiliLite.UWP/Pages/Home/UserDynamicPage.xaml
index ec9ec5086..f39b3f2a8 100644
--- a/src/BiliLite.UWP/Pages/Home/UserDynamicPage.xaml
+++ b/src/BiliLite.UWP/Pages/Home/UserDynamicPage.xaml
@@ -11,7 +11,7 @@
     xmlns:fa="using:FontAwesome5" 
     xmlns:converters="using:BiliLite.Converters" 
     xmlns:controls1="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    Background="{ThemeResource TopPaneBackground}">
+    Background="Transparent">
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -198,7 +198,6 @@
                 VerticalAlignment="Stretch"
                 Background="{ThemeResource HalfTransparentBackground}"></Grid>
             <Grid x:Name="grid" HorizontalAlignment="Right"
-                  Background="{ThemeResource ApplicationBackground}"
                   Width="{x:Bind m_viewModel.CommentControlWidth}"
                   VerticalAlignment="Stretch" RenderTransformOrigin="0.5,0.5">
                 <Grid.RenderTransform>
diff --git a/src/BiliLite.UWP/Pages/HomePage.xaml b/src/BiliLite.UWP/Pages/HomePage.xaml
index 234a37675..5777ad098 100644
--- a/src/BiliLite.UWP/Pages/HomePage.xaml
+++ b/src/BiliLite.UWP/Pages/HomePage.xaml
@@ -15,9 +15,7 @@
     Background="Transparent">
     <Page.Resources>
         <converters:CountDisplayConvert x:Name="countDisplayConvert"></converters:CountDisplayConvert>
-        <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush" />
         <SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="Transparent" />
-        <StaticResource x:Key="NavigationViewContentGridBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
         <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="Transparent" />
     </Page.Resources>
 
@@ -162,7 +160,7 @@
             </winui:NavigationView.PaneFooter>
             <winui:NavigationView.MenuItemTemplate>
                 <DataTemplate x:DataType="home:HomeNavItemViewModel" >
-                    <winui:NavigationViewItem Content="{x:Bind Title}" Visibility="{x:Bind Path=Show,Mode=OneWay}" ToolTipService.ToolTip="{x:Bind Title}">
+                    <winui:NavigationViewItem Content="{x:Bind Title}" Visibility="{x:Bind Path=Show,Mode=OneWay}" ToolTipService.ToolTip="{x:Bind Title}" UseSystemFocusVisuals="False">
                         <winui:NavigationViewItem.Icon>
                             <fa:FontAwesome Icon="{x:Bind Icon}" Margin="0 2 0 0"></fa:FontAwesome>
                         </winui:NavigationViewItem.Icon>
diff --git a/src/BiliLite.UWP/Pages/Live/LiveAreaDetailPage.xaml b/src/BiliLite.UWP/Pages/Live/LiveAreaDetailPage.xaml
index 240e3b916..db1e33be2 100644
--- a/src/BiliLite.UWP/Pages/Live/LiveAreaDetailPage.xaml
+++ b/src/BiliLite.UWP/Pages/Live/LiveAreaDetailPage.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
     </Page.Resources>
     <Grid>
diff --git a/src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml b/src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml
index 700ab05fa..829a9ee9d 100644
--- a/src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml
+++ b/src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
     </Page.Resources>
     <Grid>
diff --git a/src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml b/src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml
index a019c0040..e4ab034e1 100644
--- a/src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml
+++ b/src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml
@@ -13,13 +13,13 @@
       xmlns:convert="using:BiliLite.Converters"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <convert:DatetimeConvert x:Key="time"/>
     </Page.Resources>
     <Grid>
         <Pivot x:Name="pivot" SelectionChanged="pivot_SelectionChanged">
             <Pivot.RightHeader>
-                <Grid Background="{ThemeResource TopPaneBackground}">
+                <Grid Background="Transparent">
                     <StackPanel Orientation="Horizontal" Margin="8 0">
                        
                         <!--<StackPanel Margin="0 0 12 0" VerticalAlignment="Center">
diff --git a/src/BiliLite.UWP/Pages/Live/LiveRecommendPage.xaml b/src/BiliLite.UWP/Pages/Live/LiveRecommendPage.xaml
index d25da30e1..9494b62ed 100644
--- a/src/BiliLite.UWP/Pages/Live/LiveRecommendPage.xaml
+++ b/src/BiliLite.UWP/Pages/Live/LiveRecommendPage.xaml
@@ -12,7 +12,7 @@
     xmlns:modules="using:BiliLite.Modules.Live" xmlns:fa="using:FontAwesome5" xmlns:controls="using:BiliLite.Controls" xmlns:winui="using:Microsoft.UI.Xaml.Controls"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
     </Page.Resources>
     <Grid>
diff --git a/src/BiliLite.UWP/Pages/Other/MarkdownViewerPage.xaml b/src/BiliLite.UWP/Pages/Other/MarkdownViewerPage.xaml
index f3b1e17c6..f40228c29 100644
--- a/src/BiliLite.UWP/Pages/Other/MarkdownViewerPage.xaml
+++ b/src/BiliLite.UWP/Pages/Other/MarkdownViewerPage.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    Background="Transparent">
 
     <Grid>
         <ScrollViewer VerticalScrollBarVisibility="Auto">
diff --git a/src/BiliLite.UWP/Pages/Other/TopicPage.xaml b/src/BiliLite.UWP/Pages/Other/TopicPage.xaml
index 923edd399..9e6d2d6d3 100644
--- a/src/BiliLite.UWP/Pages/Other/TopicPage.xaml
+++ b/src/BiliLite.UWP/Pages/Other/TopicPage.xaml
@@ -22,7 +22,7 @@
                 <Setter Property="Foreground" Value="#178bcf" />
             </Style>
             <convert:DatetimeConvert x:Key="time"/>
-            <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+            <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
             <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         </ResourceDictionary>
 
@@ -30,7 +30,7 @@
     <Grid>
         <Pivot>
             <Pivot.RightHeader>
-                <Grid VerticalAlignment="Stretch" Background="{ThemeResource TopPaneBackground}">
+                <Grid VerticalAlignment="Stretch" Background="Transparent">
                     <Button Margin="12 0">
                         <StackPanel Orientation="Horizontal">
                             <FontIcon FontSize="12" Margin="0 0 8 0" FontFamily="Segoe MDL2 Assets" Glyph="&#xE109;" />
diff --git a/src/BiliLite.UWP/Pages/RankPage.xaml b/src/BiliLite.UWP/Pages/RankPage.xaml
index 129067881..f0efc4024 100644
--- a/src/BiliLite.UWP/Pages/RankPage.xaml
+++ b/src/BiliLite.UWP/Pages/RankPage.xaml
@@ -16,7 +16,7 @@
     xmlns:rank1="using:BiliLite.ViewModels.Rank"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <convert:RankColorConvert x:Key="RankConvert"/>
         <convert:ProgressToTimeConverter x:Key="progressToTimeConverter"></convert:ProgressToTimeConverter>
diff --git a/src/BiliLite.UWP/Pages/RegionDetailPage.xaml b/src/BiliLite.UWP/Pages/RegionDetailPage.xaml
index 2216b9446..90dcc1e23 100644
--- a/src/BiliLite.UWP/Pages/RegionDetailPage.xaml
+++ b/src/BiliLite.UWP/Pages/RegionDetailPage.xaml
@@ -15,7 +15,7 @@
     Background="Transparent">
     <Page.Resources>
       
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <DataTemplate x:Key="HomeTemplate" x:DataType="modules:RegionDetailHomeVM">
             <Grid>
diff --git a/src/BiliLite.UWP/Pages/SearchPage.xaml b/src/BiliLite.UWP/Pages/SearchPage.xaml
index 5ae765658..51ee5b10d 100644
--- a/src/BiliLite.UWP/Pages/SearchPage.xaml
+++ b/src/BiliLite.UWP/Pages/SearchPage.xaml
@@ -11,10 +11,11 @@
     xmlns:convert="using:BiliLite.Converters"
     xmlns:modules="using:BiliLite.Modules"
     xmlns:control="using:BiliLite.Controls"
-    Background="Transparent">
+    Background="Transparent"
+    Loaded="SearchPage_Loaded">
     <Page.Resources>
         <convert:DatetimeConvert x:Key="ts"/>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <DataTemplate x:Key="VideoTpl" x:DataType="modules:SearchVideoVM">
             <Grid>
@@ -390,7 +391,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Grid  Background="{ThemeResource TopPaneBackground}" Padding="8 8 8 0">
+        <Grid  Background="Transparent" Padding="8 8 8 0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
diff --git a/src/BiliLite.UWP/Pages/SearchPage.xaml.cs b/src/BiliLite.UWP/Pages/SearchPage.xaml.cs
index 74412c492..8a454819f 100644
--- a/src/BiliLite.UWP/Pages/SearchPage.xaml.cs
+++ b/src/BiliLite.UWP/Pages/SearchPage.xaml.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using BiliLite.Extensions;
+using BiliLite.Extensions;
 using BiliLite.Models.Common;
 using BiliLite.Modules;
 using BiliLite.Services;
 using Microsoft.UI.Xaml.Controls;
+using System.Threading.Tasks;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -278,6 +278,11 @@ public async Task Refresh()
             if (!(pivot.SelectedItem is ISearchVM searchVm)) return;
             searchVm.Refresh();
         }
+
+        private void SearchPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            txtKeyword.Focus(FocusState.Keyboard);
+        }
     }
     public class SearchDataTemplateSelector : DataTemplateSelector
     {
diff --git a/src/BiliLite.UWP/Pages/SeasonDetailPage.xaml b/src/BiliLite.UWP/Pages/SeasonDetailPage.xaml
index 203159354..2c524ce9e 100644
--- a/src/BiliLite.UWP/Pages/SeasonDetailPage.xaml
+++ b/src/BiliLite.UWP/Pages/SeasonDetailPage.xaml
@@ -35,7 +35,7 @@
                 <Grid Background="Black">
                     <control:PlayerControl x:Name="player" FullScreenEvent="PlayerControl_FullScreenEvent" FullWindowEvent="PlayerControl_FullWindowEvent" ChangeEpisodeEvent="PlayerControl_ChangeEpisodeEvent"/>
                 </Grid>
-                <Grid Grid.Row="1" x:Name="BottomActionBar" SizeChanged="BottomActionBar_OnSizeChanged" Background="{ThemeResource ApplicationBackground}">
+                <Grid Grid.Row="1" x:Name="BottomActionBar" SizeChanged="BottomActionBar_OnSizeChanged">
                     <StackPanel Orientation="Horizontal" >
                         <Button Background="Transparent"
                                 Width="56" 
@@ -159,7 +159,7 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-            <Grid Grid.Column="1" VerticalAlignment="Top" Background="{ThemeResource ApplicationBackground}"   Height="{x:Bind m_viewModel.RightInfoHeight,Mode=OneWay}">
+            <Grid Grid.Column="1" VerticalAlignment="Top" Height="{x:Bind m_viewModel.RightInfoHeight,Mode=OneWay}">
 
                 <Pivot x:Name="pivot" SelectionChanged="pivot_SelectionChanged"  >
                     <PivotItem Margin="0">
@@ -310,7 +310,7 @@
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="season1:SeasonDetailAreaItemModel">
                                             <HyperlinkButton x:Name="btnOpenIndexWithArea" Click="btnOpenIndexWithArea_Click" Margin="0 0 8 0" Foreground="{ThemeResource TextColor}">
-                                                <Border CornerRadius="4" Padding="8 4" Background="{ThemeResource TopPaneBackground}">
+                                                <Border CornerRadius="4" Padding="8 4" Background="Transparent">
                                                     <TextBlock FontSize="14" Text="{x:Bind Path=Name}"></TextBlock>
                                                 </Border>
                                             </HyperlinkButton>
@@ -327,7 +327,7 @@
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="season1:SeasonDetailStyleItemModel">
                                             <HyperlinkButton x:Name="btnOpenIndexWithStyle" Click="btnOpenIndexWithStyle_Click" Margin="0 0 8 0" Foreground="{ThemeResource TextColor}">
-                                                <Border CornerRadius="4" Padding="8 4" Background="{ThemeResource TopPaneBackground}">
+                                                <Border CornerRadius="4" Padding="8 4" Background="Transparent">
                                                     <TextBlock FontSize="14" Text="{x:Bind Path=Name}"></TextBlock>
                                                 </Border>
                                             </HyperlinkButton>
diff --git a/src/BiliLite.UWP/Pages/SettingPage.xaml b/src/BiliLite.UWP/Pages/SettingPage.xaml
index aa52ad3d9..fa427cc0e 100644
--- a/src/BiliLite.UWP/Pages/SettingPage.xaml
+++ b/src/BiliLite.UWP/Pages/SettingPage.xaml
@@ -14,7 +14,7 @@
     xmlns:settings="using:BiliLite.Controls.Settings"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
 
         <covert:ColorConvert x:Key="color"/>
diff --git a/src/BiliLite.UWP/Pages/User/CollectedPage.xaml b/src/BiliLite.UWP/Pages/User/CollectedPage.xaml
index 851ec68f3..f884eb175 100644
--- a/src/BiliLite.UWP/Pages/User/CollectedPage.xaml
+++ b/src/BiliLite.UWP/Pages/User/CollectedPage.xaml
@@ -10,7 +10,7 @@
     xmlns:user="using:BiliLite.ViewModels.User"
     xmlns:controls="using:BiliLite.Controls"
     mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    Background="Transparent">
 
     <Page.Resources>
         <Style x:Key="SeasonItemStyle" TargetType="GridViewItem">
diff --git a/src/BiliLite.UWP/Pages/User/DynamicDetailPage.xaml b/src/BiliLite.UWP/Pages/User/DynamicDetailPage.xaml
index a78633029..24e965749 100644
--- a/src/BiliLite.UWP/Pages/User/DynamicDetailPage.xaml
+++ b/src/BiliLite.UWP/Pages/User/DynamicDetailPage.xaml
@@ -11,7 +11,7 @@
      xmlns:dynamic="using:BiliLite.Controls.Dynamic"
      xmlns:fa="using:FontAwesome5" xmlns:converters="using:BiliLite.Converters" 
     xmlns:controls1="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    Background="{ThemeResource TopPaneBackground}">
+    Background="Transparent">
 
     <Page.Resources>
         <ResourceDictionary>
diff --git a/src/BiliLite.UWP/Pages/User/DynamicSpacePage.xaml b/src/BiliLite.UWP/Pages/User/DynamicSpacePage.xaml
index 691291fce..c7521494f 100644
--- a/src/BiliLite.UWP/Pages/User/DynamicSpacePage.xaml
+++ b/src/BiliLite.UWP/Pages/User/DynamicSpacePage.xaml
@@ -9,7 +9,7 @@
     xmlns:controls="using:BiliLite.Controls"
     xmlns:controls1="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d"
-    Background="{ThemeResource TopPaneBackground}">
+    Background="Transparent">
 
     <Page.Resources>
         <ResourceDictionary>
@@ -145,7 +145,7 @@
                 VerticalAlignment="Stretch"
                 Background="{ThemeResource HalfTransparentBackground}"></Grid>
             <Grid x:Name="grid" HorizontalAlignment="Right"
-                  Background="{ThemeResource ApplicationBackground}"
+                  
                   Width="{x:Bind m_viewModel.CommentControlWidth}"
                   VerticalAlignment="Stretch" RenderTransformOrigin="0.5,0.5">
                 <Grid.RenderTransform>
diff --git a/src/BiliLite.UWP/Pages/User/FavoritePage.xaml b/src/BiliLite.UWP/Pages/User/FavoritePage.xaml
index 2015d82d0..c3412beaa 100644
--- a/src/BiliLite.UWP/Pages/User/FavoritePage.xaml
+++ b/src/BiliLite.UWP/Pages/User/FavoritePage.xaml
@@ -15,7 +15,7 @@
     xmlns:user="using:BiliLite.ViewModels.User"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
         <convert:BooleanConvert x:Name="boolConvert" />
         <Style x:Key="SeasonItemStyle" TargetType="GridViewItem">
@@ -205,7 +205,7 @@
                                           ItemsSource="{x:Bind Path=animeVM.Follows,Mode=OneWay}"
                                           ItemHeight="140">
                         <GridView.Header>
-                            <Grid Padding="12 4" Background="{ThemeResource TopPaneBackground}">
+                            <Grid Padding="12 4" Background="Transparent">
                                 <StackPanel Orientation="Horizontal">
                                     <ToggleButton FontSize="12" 
                                               Command="{x:Bind Path=animeVM.StatusCommand}" 
@@ -278,7 +278,7 @@
                                           ItemsSource="{x:Bind Path=cinemaVM.Follows,Mode=OneWay}"
                                           ItemHeight="140">
                         <GridView.Header>
-                            <Grid Padding="12 4" Background="{ThemeResource TopPaneBackground}">
+                            <Grid Padding="12 4" Background="Transparent">
                                 <StackPanel Orientation="Horizontal">
                                     <ToggleButton FontSize="12" 
                                               Command="{x:Bind Path=cinemaVM.StatusCommand}" 
diff --git a/src/BiliLite.UWP/Pages/User/HistoryPage.xaml b/src/BiliLite.UWP/Pages/User/HistoryPage.xaml
index bdda56424..5b5146acf 100644
--- a/src/BiliLite.UWP/Pages/User/HistoryPage.xaml
+++ b/src/BiliLite.UWP/Pages/User/HistoryPage.xaml
@@ -15,7 +15,7 @@
     d:DataContext="{d:DesignInstance Type=user:HistoryViewModel}"
     Background="Transparent">
     <Page.Resources>
-        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
         <convert:DatetimeConvert x:Key="datetime"/>
         <Style x:Key="ItemStyle" TargetType="GridViewItem">
             <Setter Property="Margin" Value="4"></Setter>
@@ -64,7 +64,7 @@
     <Grid>
         <Pivot>
             <!--<Pivot.RightHeader>
-                <Grid Background="{ThemeResource TopPaneBackground}">
+                <Grid Background="Transparent">
                     <Button Margin="8 0">清空记录</Button>
                 </Grid>
             </Pivot.RightHeader>-->
diff --git a/src/BiliLite.UWP/Pages/User/WatchlaterPage.xaml b/src/BiliLite.UWP/Pages/User/WatchlaterPage.xaml
index 04b43c822..b9ab5f8d0 100644
--- a/src/BiliLite.UWP/Pages/User/WatchlaterPage.xaml
+++ b/src/BiliLite.UWP/Pages/User/WatchlaterPage.xaml
@@ -42,7 +42,7 @@
             <RowDefinition Height="48"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Grid Background="{ThemeResource TopPaneBackground}">
+        <Grid Background="Transparent">
             <TextBlock Margin="12 0" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left">稍后再看(<Run Text="{x:Bind Path=watchLaterVM.Videos.Count,Mode=OneWay}"/>个视频)</TextBlock>
             <StackPanel Margin="12 0" HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button Command="{x:Bind Path=watchLaterVM.CleanCommand}" Margin="8 0">一键清空</Button>
diff --git a/src/BiliLite.UWP/Pages/UserInfoPage.xaml b/src/BiliLite.UWP/Pages/UserInfoPage.xaml
index 64434c6ee..062e42637 100644
--- a/src/BiliLite.UWP/Pages/UserInfoPage.xaml
+++ b/src/BiliLite.UWP/Pages/UserInfoPage.xaml
@@ -15,7 +15,8 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:userViewModel="using:BiliLite.ViewModels.User" xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-    Background="{ThemeResource ApplicationBackground}">
+    Background="Transparent">
+
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -99,13 +100,13 @@
             <SplitView.Content>
                 <Grid>
                     <Grid.Resources>
-                        <SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
+                        <SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
                     </Grid.Resources>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <Grid Padding="8 0" Background="{ThemeResource TopPaneBackground}" VerticalAlignment="Top" Height="48">
+                    <Grid Padding="8 0" Background="Transparent" VerticalAlignment="Top" Height="48">
                         <Button Background="Transparent" Padding="0" HorizontalAlignment="Left">
                             <Button.Content>
                                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" >
@@ -209,7 +210,7 @@
                     </Grid>
                     <Pivot Grid.Row="1" x:Name="pivot" SelectionChanged="pivot_SelectionChanged">
                         <!--<Pivot.RightHeader>
-                <Grid Background="{ThemeResource TopPaneBackground}">
+                <Grid Background="Transparent">
                     <AutoSuggestBox VerticalAlignment="Center" PlaceholderText="搜索视频" Width="120" Margin="8 0" QueryIcon="Find"></AutoSuggestBox>
                 </Grid>
             </Pivot.RightHeader>-->
diff --git a/src/BiliLite.UWP/Pages/VideoDetailPage.xaml b/src/BiliLite.UWP/Pages/VideoDetailPage.xaml
index e30e007b1..7ca7a9d2e 100644
--- a/src/BiliLite.UWP/Pages/VideoDetailPage.xaml
+++ b/src/BiliLite.UWP/Pages/VideoDetailPage.xaml
@@ -61,7 +61,7 @@
                 <Grid Background="Transparent">
                     <control:PlayerControl x:Name="player" AllMediaEndEvent="player_AllMediaEndEvent" FullScreenEvent="PlayerControl_FullScreenEvent" FullWindowEvent="PlayerControl_FullWindowEvent" ChangeEpisodeEvent="PlayerControl_ChangeEpisodeEvent"/>
                 </Grid>
-                <Grid Grid.Row="1" x:Name="BottomActionBar" SizeChanged="BottomActionBar_OnSizeChanged" Background="{ThemeResource ApplicationBackground}">
+                <Grid Grid.Row="1" x:Name="BottomActionBar" SizeChanged="BottomActionBar_OnSizeChanged">
                     <StackPanel Orientation="Horizontal" >
                         <Button Holding="btnLike_Holding" 
                                   RightTapped="btnLike_RightTapped"
@@ -294,7 +294,7 @@
                 </Grid>
             </Grid>
 
-            <Grid Grid.Column="1"  Background="{ThemeResource ApplicationBackground}" VerticalAlignment="Top" Height="{x:Bind m_viewModel.RightInfoHeight,Mode=OneWay}">
+            <Grid Grid.Column="1"  VerticalAlignment="Top" Height="{x:Bind m_viewModel.RightInfoHeight,Mode=OneWay}">
                 <Pivot x:Name="pivot" PreviewKeyDown="Pivot_OnPreviewKeyDown">
                     <PivotItem Margin="0">
                         <PivotItem.Header>
@@ -416,7 +416,7 @@
                                     <GridView.ItemContainerStyle>
                                         <Style TargetType="GridViewItem">
                                             <Setter Property="BorderThickness" Value="1"></Setter>
-                                            <Setter Property="BorderBrush" Value="{ThemeResource TopPaneBackground}"></Setter>
+                                            <Setter Property="BorderBrush" Value="Transparent"></Setter>
                                             <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
                                             <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
                                         </Style>
@@ -440,7 +440,7 @@
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="videoModel:BiliVideoTag">
                                             <HyperlinkButton Click="btnTagItem_Click" Margin="0 0 8 0" Foreground="{ThemeResource TextColor}">
-                                                <Border CornerRadius="4" Padding="8 4" Background="{ThemeResource TopPaneBackground}">
+                                                <Border CornerRadius="4" Padding="8 4" Background="Transparent">
                                                     <TextBlock FontSize="12" Text="{x:Bind TagName}" Foreground="{ThemeResource TextColor}">></TextBlock>
                                                 </Border>
                                             </HyperlinkButton>
diff --git a/src/BiliLite.UWP/Styles/TabViewStyle.xaml b/src/BiliLite.UWP/Styles/TabViewStyle.xaml
index ababfab74..2fdb4d6c5 100644
--- a/src/BiliLite.UWP/Styles/TabViewStyle.xaml
+++ b/src/BiliLite.UWP/Styles/TabViewStyle.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
 
-    <SolidColorBrush x:Key="TabViewBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="TabViewBorderBrush" Color="Transparent" />
 
     <Style BasedOn="{StaticResource DefaultTabViewStyle}" TargetType="muxc:TabView" />
 
@@ -14,7 +14,6 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="Background" Value="{ThemeResource TabViewBackground}" />
         <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
         <Setter Property="Template">
             <Setter.Value>
@@ -25,83 +24,100 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup>
-                                <VisualState x:Name="NormalBottomBorderLine"/>
-                                <VisualState x:Name="SingleBottomBorderLine">
-                                    <VisualState.Setters>
-                                        <Setter Target="LeftBottomBorderLine.(Grid.ColumnSpan)" Value="4"/>
-                                        <Setter Target="RightBottomBorderLine.Visibility" Value="Collapsed"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Grid x:Name="TabContainerGrid"
-                                Background="{ThemeResource TabViewTabContainerGridColor}"
-                                XYFocusKeyboardNavigation="Enabled">
+                        <Grid
+                            x:Name="TabContainerGrid"
+                            Background="Transparent"
+                            XYFocusKeyboardNavigation="Enabled">
 
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" MinWidth="2"  x:Name="LeftContentColumn"/>
-                                <ColumnDefinition Width="Auto" x:Name="TabColumn"/>
-                                <ColumnDefinition Width="Auto" x:Name="AddButtonColumn"/>
-                                <ColumnDefinition Width="*" x:Name="RightContentColumn"/>
+                                <ColumnDefinition
+                                    x:Name="LeftContentColumn"
+                                    Width="Auto"
+                                    MinWidth="2" />
+                                <ColumnDefinition x:Name="TabColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="AddButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="RightContentColumn" Width="*" />
                             </Grid.ColumnDefinitions>
 
-                            <Border x:Name="LeftBottomBorderLine" BorderBrush="Transparent" BorderThickness="0" Height="0" VerticalAlignment="Bottom"/>
+                            <Border
+                                x:Name="LeftBottomBorderLine"
+                                Height="0"
+                                VerticalAlignment="Bottom"
+                                BorderBrush="Transparent"
+                                BorderThickness="0" />
 
-                            <Border x:Name="RightBottomBorderLine" BorderBrush="Transparent" BorderThickness="0" Height="0" Grid.Column="2" Grid.ColumnSpan="2" VerticalAlignment="Bottom"/>
+                            <Border
+                                x:Name="RightBottomBorderLine"
+                                Grid.Column="2"
+                                Grid.ColumnSpan="2"
+                                Height="0"
+                                VerticalAlignment="Bottom"
+                                BorderBrush="Transparent"
+                                BorderThickness="0" />
 
                             <ContentPresenter
-                                Grid.Column="0"
                                 x:Name="LeftContentPresenter"
+                                Grid.Column="0"
                                 Content="{TemplateBinding TabStripHeader}"
-                                ContentTemplate="{TemplateBinding TabStripHeaderTemplate}"/>
+                                ContentTemplate="{TemplateBinding TabStripHeaderTemplate}" />
 
                             <primitives:TabViewListView
-                                Grid.Column="1"
                                 x:Name="TabListView"
+                                Grid.Column="1"
                                 Padding="{TemplateBinding Padding}"
-                                CanReorderItems="{TemplateBinding CanReorderTabs}"
-                                CanDragItems="{TemplateBinding CanDragTabs}"
                                 AllowDrop="{TemplateBinding AllowDropTabs}"
-                                ItemsSource="{TemplateBinding TabItemsSource}"
+                                CanDragItems="{TemplateBinding CanDragTabs}"
+                                CanReorderItems="{TemplateBinding CanReorderTabs}"
                                 ItemTemplate="{TemplateBinding TabItemTemplate}"
-                                ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}"/>
+                                ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}"
+                                ItemsSource="{TemplateBinding TabItemsSource}" />
 
                             <Border
-                                 Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource TemplatedParent}}"
-                                 Grid.Column="2"
-                                BorderBrush="Transparent"
-                                 Padding="{ThemeResource TabViewItemAddButtonContainerPadding}"
-                                 VerticalAlignment="Center">
+                                Grid.Column="2"
+                                Padding="0,12"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource TabViewRightContentPresenterColor}"
+                                Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource TemplatedParent}}">
                                 <Button
                                     x:Name="AddButton"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Content="&#xE710;"
-                                    IsTextScaleFactorEnabled="False"
                                     Command="{TemplateBinding AddTabButtonCommand}"
                                     CommandParameter="{TemplateBinding AddTabButtonCommandParameter}"
-                                    Style="{ThemeResource TabViewButtonStyle}"
-                                    HighContrastAdjustment="None"/>
+                                    Content="&#xE710;"
+                                    HighContrastAdjustment="None"
+                                    IsTextScaleFactorEnabled="False"
+                                    Style="{ThemeResource TabViewButtonStyle}" />
                             </Border>
 
                             <ContentPresenter
-                                Grid.Column="3"
                                 x:Name="RightContentPresenter"
-                                Background="{ThemeResource TabViewRightContentPresenterColor}"
+                                Grid.Column="3"
                                 HorizontalAlignment="Stretch"
+                                Background="{ThemeResource TabViewRightContentPresenterColor}"
                                 Content="{TemplateBinding TabStripFooter}"
-                                ContentTemplate="{TemplateBinding TabStripFooterTemplate}"/>
+                                ContentTemplate="{TemplateBinding TabStripFooterTemplate}" />
 
                         </Grid>
 
-                        <ContentPresenter x:Name="TabContentPresenter"
-                                          Grid.Row="1"
-                                          Background="{ThemeResource TabViewItemHeaderBackgroundSelected}"
-                                          BorderBrush="Transparent"
-                                          BorderThickness="0" />
+                        <ContentPresenter
+                            x:Name="TabContentPresenter"
+                            Grid.Row="1"
+                            Background="{ThemeResource TabViewItemHeaderBackgroundSelected}"
+                            BorderBrush="Transparent"
+                            BorderThickness="0" />
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup>
+                                <VisualState x:Name="NormalBottomBorderLine" />
+                                <VisualState x:Name="SingleBottomBorderLine">
+                                    <VisualState.Setters>
+                                        <Setter Target="LeftBottomBorderLine.(Grid.ColumnSpan)" Value="4" />
+                                        <Setter Target="RightBottomBorderLine.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -121,23 +137,120 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="muxc:TabViewItem">
-                    <Grid x:Name="LayoutRoot"
-                            Background="{ThemeResource TabViewLayoutRootBackground}"
-                            Padding="{TemplateBinding Padding}"
-                            UseLayoutRounding="False">
+                    <Grid
+                        x:Name="LayoutRoot"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{ThemeResource TabViewLayoutRootBackground}"
+                        UseLayoutRounding="False">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="LeftColumn" Width="Auto"/>
+                            <ColumnDefinition x:Name="LeftColumn" Width="Auto" />
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition x:Name="RightColumn" Width="Auto"/>
+                            <ColumnDefinition x:Name="RightColumn" Width="Auto" />
                         </Grid.ColumnDefinitions>
 
                         <Grid.RenderTransform>
                             <ScaleTransform x:Name="LayoutRootScale" />
                         </Grid.RenderTransform>
 
+                        <Border
+                            x:Name="BottomBorderLine"
+                            Grid.ColumnSpan="3"
+                            BorderBrush="Transparent"
+                            BorderThickness="0" />
+
+                        <Path
+                            x:Name="LeftRadiusRenderArc"
+                            x:Load="False"
+                            Fill="Transparent"
+                            Opacity="0"
+                            Visibility="Collapsed" />
+                        <Path
+                            x:Name="RightRadiusRenderArc"
+                            x:Load="False"
+                            Fill="Transparent"
+                            Opacity="0"
+                            Visibility="Collapsed" />
+
+                        <Path
+                            x:Name="SelectedBackgroundPath"
+                            Grid.ColumnSpan="3"
+                            x:Load="False"
+                            Fill="Transparent"
+                            Opacity="0"
+                            Visibility="Collapsed" />
+
+                        <Border
+                            x:Name="TabSeparator"
+                            Grid.Column="1"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            Opacity="0" />
+
+                        <Grid
+                            x:Name="TabContainer"
+                            Grid.Column="1"
+                            Margin="0,-4,0,-6"
+                            Padding="{ThemeResource TabViewItemHeaderPadding}"
+                            Background="{ThemeResource TabViewRightContentPresenterColor}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Control.IsTemplateFocusTarget="True"
+                            CornerRadius="4"
+                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <Viewbox
+                                x:Name="IconBox"
+                                MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
+                                MaxHeight="{ThemeResource TabViewItemHeaderIconSize}"
+                                Margin="{ThemeResource TabViewItemHeaderIconMargin}">
+                                <ContentControl
+                                    x:Name="IconControl"
+                                    Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement}"
+                                    Foreground="{ThemeResource TabViewItemIconForeground}"
+                                    HighContrastAdjustment="None"
+                                    IsTabStop="False" />
+                            </Viewbox>
+
+                            <!--
+                                If we template bind the ContentPresenter's Content property to the TabViewItem.Header property
+                                we unfortunately run into the following issue if the header is [null] or empty:
+                                The TabViewItem.Content property will be implictly bound to the Content property of the ContentPresenter.
+                                To prevent this, we explicitly set a default empty content here and update the content in code behind.
+                            -->
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                Grid.Column="1"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content=""
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                ContentTransitions="{TemplateBinding ContentTransitions}"
+                                FontSize="{ThemeResource TabViewItemHeaderFontSize}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Foreground="{ThemeResource TabViewItemHeaderForeground}"
+                                HighContrastAdjustment="None"
+                                OpticalMarginAlignment="TrimSideBearings" />
+
+                            <Button
+                                x:Name="CloseButton"
+                                Grid.Column="2"
+                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
+                                Content="&#xE711;"
+                                HighContrastAdjustment="None"
+                                IsTabStop="False"
+                                IsTextScaleFactorEnabled="False"
+                                Style="{ThemeResource TabViewCloseButtonStyle}" />
+                        </Grid>
+
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" >
+                                <VisualState x:Name="Normal">
                                     <VisualState.Setters>
                                         <Setter Target="TabContainer.Background" Value="{ThemeResource TabViewItemHeaderBackgroundNormal}" />
                                     </VisualState.Setters>
@@ -170,7 +283,7 @@
                                         <Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewItemIconForegroundSelected}" />
                                         <Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
                                         <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
-                                        <Setter Target="LayoutRoot.Background" Value="Transparent"/>
+                                        <Setter Target="LayoutRoot.Background" Value="Transparent" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -181,7 +294,7 @@
                                         <Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewItemIconForegroundSelected}" />
                                         <Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
                                         <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
-                                        <Setter Target="LayoutRoot.Background" Value="Transparent"/>
+                                        <Setter Target="LayoutRoot.Background" Value="Transparent" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -192,7 +305,7 @@
                                         <Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewItemIconForegroundSelected}" />
                                         <Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
                                         <Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
-                                        <Setter Target="LayoutRoot.Background" Value="Transparent"/>
+                                        <Setter Target="LayoutRoot.Background" Value="Transparent" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
@@ -223,39 +336,42 @@
 
                                 <VisualState x:Name="BottomReorderHint">
                                     <Storyboard>
-                                        <DragOverThemeAnimation Direction="Bottom"
-                                                        ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                        TargetName="LayoutRoot" />
+                                        <DragOverThemeAnimation
+                                            Direction="Bottom"
+                                            ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                            TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="TopReorderHint">
                                     <Storyboard>
-                                        <DragOverThemeAnimation Direction="Top"
-                                                        ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                        TargetName="LayoutRoot" />
+                                        <DragOverThemeAnimation
+                                            Direction="Top"
+                                            ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                            TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="RightReorderHint">
                                     <Storyboard>
-                                        <DragOverThemeAnimation Direction="Right"
-                                                        ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                        TargetName="LayoutRoot" />
+                                        <DragOverThemeAnimation
+                                            Direction="Right"
+                                            ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                            TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="LeftReorderHint">
                                     <Storyboard>
-                                        <DragOverThemeAnimation Direction="Left"
-                                                        ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                        TargetName="LayoutRoot" />
+                                        <DragOverThemeAnimation
+                                            Direction="Left"
+                                            ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                            TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0:0:0.2"
-                                              To="NoReorderHint" />
+                                    <VisualTransition GeneratedDuration="0:0:0.2" To="NoReorderHint" />
                                 </VisualStateGroup.Transitions>
                             </VisualStateGroup>
 
@@ -264,10 +380,11 @@
 
                                 <VisualState x:Name="Dragging">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                                 Storyboard.TargetProperty="Opacity"
-                                                 To="{ThemeResource ListViewItemDragThemeOpacity}"
-                                                 Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="LayoutRoot"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="{ThemeResource ListViewItemDragThemeOpacity}"
+                                            Duration="0" />
                                         <DragItemThemeAnimation TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
@@ -282,19 +399,21 @@
 
                                 <VisualState x:Name="Reordering">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                                 Storyboard.TargetProperty="Opacity"
-                                                 To="{ThemeResource ListViewItemReorderThemeOpacity}"
-                                                 Duration="0:0:0.240" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="LayoutRoot"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="{ThemeResource ListViewItemReorderThemeOpacity}"
+                                            Duration="0:0:0.240" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="ReorderingTarget">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                                 Storyboard.TargetProperty="Opacity"
-                                                 To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
-                                                 Duration="0:0:0.240" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="LayoutRoot"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
+                                            Duration="0:0:0.240" />
                                     </Storyboard>
                                 </VisualState>
 
@@ -318,145 +437,64 @@
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="IconStates">
-                                <VisualState x:Name="Icon"/>
+                                <VisualState x:Name="Icon" />
                                 <VisualState x:Name="NoIcon">
                                     <VisualState.Setters>
-                                        <Setter Target="IconBox.Visibility" Value="Collapsed"/>
+                                        <Setter Target="IconBox.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="TabWidthModes">
-                                <VisualState x:Name="StandardWidth"/>
+                                <VisualState x:Name="StandardWidth" />
 
                                 <VisualState x:Name="Compact">
                                     <VisualState.Setters>
-                                        <Setter Target="IconBox.Margin" Value="0,0,0,0"/>
-                                        <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
-                                        <Setter Target="IconColumn.Width" Value="{ThemeResource TabViewItemHeaderIconSize}"/>
+                                        <Setter Target="IconBox.Margin" Value="0,0,0,0" />
+                                        <Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
+                                        <Setter Target="IconColumn.Width" Value="{ThemeResource TabViewItemHeaderIconSize}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="CloseIconStates">
-                                <VisualState x:Name="CloseButtonVisible"/>
+                                <VisualState x:Name="CloseButtonVisible" />
                                 <VisualState x:Name="CloseButtonCollapsed">
                                     <VisualState.Setters>
-                                        <Setter Target="CloseButton.Visibility" Value="Collapsed"/>
+                                        <Setter Target="CloseButton.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
 
                             <VisualStateGroup>
-                                <VisualState x:Name="ForegroundNotSet"/>
+                                <VisualState x:Name="ForegroundNotSet" />
                                 <VisualState x:Name="ForegroundSet">
                                     <VisualState.Setters>
-                                        <Setter Target="IconControl.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
-                                        <Setter Target="ContentPresenter.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
+                                        <Setter Target="IconControl.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                                        <Setter Target="ContentPresenter.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
 
                             <VisualStateGroup>
-                                <VisualState x:Name="NormalBottomBorderLine"/>
+                                <VisualState x:Name="NormalBottomBorderLine" />
                                 <VisualState x:Name="LeftOfSelectedTab">
                                     <VisualState.Setters>
-                                        <Setter Target="BottomBorderLine.Margin" Value="0,0,2,0"/>
+                                        <Setter Target="BottomBorderLine.Margin" Value="0,0,2,0" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="RightOfSelectedTab">
                                     <VisualState.Setters>
-                                        <Setter Target="BottomBorderLine.Margin" Value="2,0,0,0"/>
+                                        <Setter Target="BottomBorderLine.Margin" Value="2,0,0,0" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="NoBottomBorderLine">
                                     <VisualState.Setters>
-                                        <Setter Target="BottomBorderLine.Visibility" Value="Collapsed"/>
+                                        <Setter Target="BottomBorderLine.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-
-                        <Border x:Name="BottomBorderLine" BorderBrush="Transparent" BorderThickness="0" Grid.ColumnSpan="3"/>
-
-                        <Path x:Name="LeftRadiusRenderArc"
-                            x:Load="False"
-                            Fill="Transparent"
-                            Visibility="Collapsed"
-                            Opacity="0"/>
-                        <Path x:Name="RightRadiusRenderArc"
-                            x:Load="False"
-                            Fill="Transparent"
-                            Visibility="Collapsed"
-                            Opacity="0"/>
-
-                        <Path x:Name="SelectedBackgroundPath"
-                            Opacity="0"
-                            x:Load="False"
-                            Grid.ColumnSpan="3"
-                            Fill="Transparent"
-                            Visibility="Collapsed"/>
-
-                        <Border x:Name="TabSeparator"
-                            Opacity="0"
-                            Grid.Column="1"
-                            BorderBrush="Transparent"
-                            BorderThickness="0"/>
-
-                        <Grid x:Name="TabContainer"
-                            Grid.Column="1"
-                            Background="{ThemeResource TabViewRightContentPresenterColor}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            Margin="0,-4,0,-6"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Control.IsTemplateFocusTarget="True"
-                            Padding="{ThemeResource TabViewItemHeaderPadding}"
-                            CornerRadius="4"
-                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}">
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <Viewbox x:Name="IconBox"
-                                    MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
-                                    MaxHeight="{ThemeResource TabViewItemHeaderIconSize}"
-                                    Margin="{ThemeResource TabViewItemHeaderIconMargin}">
-                                <ContentControl x:Name="IconControl"
-                                        Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement}"
-                                        IsTabStop="False"
-                                        Foreground="{ThemeResource TabViewItemIconForeground}"
-                                        HighContrastAdjustment="None" />
-                            </Viewbox>
-
-                            <!-- If we template bind the ContentPresenter's Content property to the TabViewItem.Header property
-                                 we unfortunately run into the following issue if the header is [null] or empty:
-                                 The TabViewItem.Content property will be implictly bound to the Content property of the ContentPresenter.
-                                 To prevent this, we explicitly set a default empty content here and update the content in code behind. -->
-                            <ContentPresenter x:Name="ContentPresenter"
-                                Grid.Column="1"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content=""
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"                              
-                                FontWeight="{TemplateBinding FontWeight}"
-                                FontSize="{ThemeResource TabViewItemHeaderFontSize}"
-                                Foreground="{ThemeResource TabViewItemHeaderForeground}"
-                                OpticalMarginAlignment="TrimSideBearings"
-                                HighContrastAdjustment="None" />
-
-                            <Button x:Name="CloseButton"
-                                Grid.Column="2"
-                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
-                                Content="&#xE711;"
-                                IsTextScaleFactorEnabled="False"
-                                IsTabStop="False"
-                                Style="{ThemeResource TabViewCloseButtonStyle}"
-                                HighContrastAdjustment="None" />
-                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -568,8 +606,11 @@
                                         Delay="50"
                                         HighContrastAdjustment="None"
                                         Interval="100"
-                                        Style="{ThemeResource TabViewScrollButtonStyle}" >
-                                        <FontIcon FontFamily="{StaticResource BiliIconFont}" FontSize="10" Glyph="&#xe692;"></FontIcon>
+                                        Style="{ThemeResource TabViewScrollButtonStyle}">
+                                        <FontIcon
+                                            FontFamily="{StaticResource BiliIconFont}"
+                                            FontSize="10"
+                                            Glyph="&#xe692;" />
                                     </RepeatButton>
 
                                 </Border>
@@ -585,8 +626,11 @@
                                         Delay="50"
                                         HighContrastAdjustment="None"
                                         Interval="100"
-                                        Style="{ThemeResource TabViewScrollButtonStyle}" >
-                                        <FontIcon FontFamily="{StaticResource BiliIconFont}" FontSize="10" Glyph="&#xe693;"></FontIcon>
+                                        Style="{ThemeResource TabViewScrollButtonStyle}">
+                                        <FontIcon
+                                            FontFamily="{StaticResource BiliIconFont}"
+                                            FontSize="10"
+                                            Glyph="&#xe693;" />
                                     </RepeatButton>
 
                                 </Border>
@@ -599,22 +643,26 @@
         </Setter>
     </Style>
     <Style x:Key="TabViewButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="{ThemeResource TabViewButtonBackground}"/>
-        <Setter Property="Foreground" Value="{ThemeResource TabViewButtonForeground}"/>
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-        <Setter Property="FontSize" Value="{ThemeResource TabViewItemAddButtonFontSize}"/>
-        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
-        <Setter Property="Width" Value="{ThemeResource TabViewItemAddButtonWidth}"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Height" Value="{ThemeResource TabViewItemAddButtonHeight}"/>
-        <Setter Property="BorderThickness" Value="{ThemeResource TabViewButtonBorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource TabViewButtonBorderBrush}"/>
-        <Setter Property="FocusVisualMargin" Value="-3"/>
+        <Setter Property="Background" Value="{ThemeResource TabViewButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource TabViewButtonForeground}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="FontSize" Value="{ThemeResource TabViewItemAddButtonFontSize}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="Width" Value="{ThemeResource TabViewItemAddButtonWidth}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="{ThemeResource TabViewItemAddButtonHeight}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TabViewButtonBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TabViewButtonBorderBrush}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <ContentPresenter x:Name="ContentPresenter"
+                    <ContentPresenter
+                        x:Name="ContentPresenter"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        AutomationProperties.AccessibilityView="Raw"
                         Background="{TemplateBinding Background}"
                         BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
@@ -623,12 +671,9 @@
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         ContentTransitions="{TemplateBinding ContentTransitions}"
                         CornerRadius="{TemplateBinding CornerRadius}"
-                        FontSize="{TemplateBinding FontSize}"
                         FontFamily="{TemplateBinding FontFamily}"
-                        FontWeight="{TemplateBinding FontWeight}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        AutomationProperties.AccessibilityView="Raw">
+                        FontSize="{TemplateBinding FontSize}"
+                        FontWeight="{TemplateBinding FontWeight}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -689,9 +734,9 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                         contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         AutomationProperties.AccessibilityView="Raw"
                         Background="{TemplateBinding Background}"
+                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         ContentTransitions="{TemplateBinding ContentTransitions}">
diff --git a/src/BiliLite.UWP/Themes/Dark.xaml b/src/BiliLite.UWP/Themes/Dark.xaml
index efc17163d..d48b15abb 100644
--- a/src/BiliLite.UWP/Themes/Dark.xaml
+++ b/src/BiliLite.UWP/Themes/Dark.xaml
@@ -1,12 +1,11 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
-    x:Key="Dark">
+    xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ApplicationBackground" Color="#FF282828" />
-    <Color x:Key="TopPaneBackground">#00000000</Color>
+    <Color x:Key="SystemAccentColor">#ec407a</Color>
     <Color x:Key="HighLightColor">#ec407a</Color>
     <Color x:Key="TextColor">#CCFFFFFF</Color>
     <Color x:Key="CardColor">#19000000</Color>
@@ -20,14 +19,11 @@
     <Color x:Key="PieControlColor">#2d2d2d</Color>
     <Color x:Key="PieControlIconColor">#FF808080</Color>
 
-    <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="{ThemeResource TopPaneBackground}" />
     <Color x:Key="NoTapGridBackground">#FF282828</Color>
 
     <Color x:Key="TabViewBackground">Transparent</Color>
-    <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{ThemeResource TopPaneBackground}"/>
     <SolidColorBrush x:Key="TabViewItemHeaderBackgroundNormal" Color="Transparent"/>
-    <Color x:Key="TabViewRightContentPresenterColor">#1A333333</Color>
-    <Color x:Key="TabViewTabContainerGridColor">#1A333333</Color>
-    <Color x:Key="TabViewLayoutRootBackground">#1A333333</Color>
-
+    <Color x:Key="TabViewRightContentPresenterColor">#1ACFCFCF</Color>
+    <Color x:Key="TabViewTabContainerGridColor">#1ACFCFCF</Color>
+    <Color x:Key="TabViewLayoutRootBackground">#1ACFCFCF</Color>
 </ResourceDictionary>
diff --git a/src/BiliLite.UWP/Themes/Light.xaml b/src/BiliLite.UWP/Themes/Light.xaml
index 6886ece84..47b9ede71 100644
--- a/src/BiliLite.UWP/Themes/Light.xaml
+++ b/src/BiliLite.UWP/Themes/Light.xaml
@@ -2,11 +2,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
-    x:Key="Light">
+    xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ApplicationBackground" Color="#FFF9F9F9" />
-    <Color x:Key="TopPaneBackground">#00000000</Color>
+    <Color x:Key="SystemAccentColor">#ec407a</Color>
     <Color x:Key="HighLightColor">#ec407a</Color>
     <Color x:Key="TextColor">#CC000000</Color>
     <Color x:Key="CardColor">#0F000000</Color>
@@ -20,14 +19,11 @@
     <Color x:Key="PieControlColor">#f8f8f8</Color>
     <Color x:Key="PieControlIconColor">#FF808080</Color>
 
-    <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="{ThemeResource TopPaneBackground}" />
     <Color x:Key="NoTapGridBackground">#FFF9F9F9</Color>
 
     <Color x:Key="TabViewBackground">Transparent</Color>
-    <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{ThemeResource TopPaneBackground}"/>
     <SolidColorBrush x:Key="TabViewItemHeaderBackgroundNormal" Color="Transparent"/>
-    <Color x:Key="TabViewRightContentPresenterColor">#1ACFCFCF</Color>
-    <Color x:Key="TabViewTabContainerGridColor">#1ACFCFCF</Color>
-    <Color x:Key="TabViewLayoutRootBackground">#1ACFCFCF</Color>
-
+    <Color x:Key="TabViewRightContentPresenterColor">#1A333333</Color>
+    <Color x:Key="TabViewTabContainerGridColor">#1A333333</Color>
+    <Color x:Key="TabViewLayoutRootBackground">#1A333333</Color>
 </ResourceDictionary>