From 227cc0d0aa84f0a7059ad998e02120cc52e986ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=AD?= <blinue@outlook.com>
Date: Mon, 11 Dec 2023 14:08:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E6=A4=8D=20SettingsExpander?=
 =?UTF-8?q?=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Magpie.App/App.idl                        |   4 +
 src/Magpie.App/HomePage.xaml                  |  90 +++++------
 src/Magpie.App/KeyVisual.cpp                  |  13 +-
 src/Magpie.App/PageFrame.cpp                  |  16 +-
 src/Magpie.App/Resources.language-de.resw     |   2 +-
 src/Magpie.App/Resources.language-en-US.resw  |   4 +-
 src/Magpie.App/Resources.language-es.resw     |   4 +-
 src/Magpie.App/Resources.language-fr.resw     |   4 +-
 src/Magpie.App/Resources.language-hu.resw     |   4 +-
 src/Magpie.App/Resources.language-id.resw     |   4 +-
 src/Magpie.App/Resources.language-it.resw     |   4 +-
 src/Magpie.App/Resources.language-ja.resw     |   4 +-
 src/Magpie.App/Resources.language-ko.resw     |   4 +-
 src/Magpie.App/Resources.language-pt-BR.resw  |   4 +-
 src/Magpie.App/Resources.language-ru.resw     |   4 +-
 src/Magpie.App/Resources.language-tr.resw     |   4 +-
 src/Magpie.App/Resources.language-uk.resw     |   4 +-
 src/Magpie.App/Resources.language-vi.resw     |   4 +-
 .../Resources.language-zh-Hans.resw           |   4 +-
 .../Resources.language-zh-Hant.resw           |   4 +-
 src/Magpie.App/SettingsCard2.cpp              | 116 +++++++-------
 src/Magpie.App/SettingsCard2.h                | 143 +++++-------------
 src/Magpie.App/SettingsCard2.idl              |  20 +--
 src/Magpie.App/SettingsExpander.cpp           |  82 +++++++++-
 src/Magpie.App/SettingsExpander.h             |  87 ++++++-----
 src/Magpie.App/SettingsExpander.idl           |  25 ++-
 src/Magpie.App/SettingsExpander.xaml          |   9 +-
 src/Magpie.App/SettingsGroup.cpp              |  10 +-
 src/Magpie.App/ShortcutControl.cpp            |   8 +-
 src/Magpie.App/TextBlockHelper.cpp            |   2 +-
 src/Magpie.App/WrapPanel.cpp                  |  12 +-
 31 files changed, 364 insertions(+), 335 deletions(-)

diff --git a/src/Magpie.App/App.idl b/src/Magpie.App/App.idl
index dce14a2de..be5c744ff 100644
--- a/src/Magpie.App/App.idl
+++ b/src/Magpie.App/App.idl
@@ -1,3 +1,7 @@
+namespace Magpie.App {
+	delegate void SignalDelegate();
+}
+
 #include "BoolNegationConverter.idl"
 #include "BoolToNegativeVisibilityConverter.idl"
 #include "ControlSizeTrigger.idl"
diff --git a/src/Magpie.App/HomePage.xaml b/src/Magpie.App/HomePage.xaml
index e4a0e569a..880ad49dc 100644
--- a/src/Magpie.App/HomePage.xaml
+++ b/src/Magpie.App/HomePage.xaml
@@ -36,7 +36,8 @@
 			</muxc:InfoBar>
 			<local:SettingsGroup x:Uid="Home_Shortcuts"
 			                     Margin="0,-24,0,0">
-				<local:SettingsCard2 x:Uid="Home_Shortcuts_Scale" IsWrapEnabled="True">
+				<local:SettingsCard2 x:Uid="Home_Shortcuts_Scale"
+				                     IsWrapEnabled="True">
 					<local:SettingsCard2.HeaderIcon>
 						<FontIcon Glyph="&#xE740;" />
 					</local:SettingsCard2.HeaderIcon>
@@ -46,7 +47,8 @@
 						</local:ShortcutControl.Action>
 					</local:ShortcutControl>
 				</local:SettingsCard2>
-				<local:SettingsCard2 x:Uid="Home_Shortcuts_Overlay" IsWrapEnabled="True">
+				<local:SettingsCard2 x:Uid="Home_Shortcuts_Overlay"
+				                     IsWrapEnabled="True">
 					<local:SettingsCard2.HeaderIcon>
 						<FontIcon Glyph="&#xE9D9;" />
 					</local:SettingsCard2.HeaderIcon>
@@ -58,53 +60,43 @@
 				</local:SettingsCard2>
 			</local:SettingsGroup>
 			<local:SettingsGroup x:Uid="Home_Activation">
-				<muxc:Expander HorizontalAlignment="Stretch"
-				               HorizontalContentAlignment="Stretch"
-				               Style="{StaticResource SettingExpanderStyle}">
-					<muxc:Expander.Header>
-						<local:SettingsCard x:Uid="Home_Timer"
-						                    Style="{StaticResource ExpanderHeaderSettingStyle}">
-							<local:SettingsCard.Icon>
-								<FontIcon Glyph="&#xE916;" />
-							</local:SettingsCard.Icon>
-							<local:SettingsCard.ActionContent>
-								<StackPanel Orientation="Horizontal"
-								            Spacing="8">
-									<Grid Visibility="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}">
-										<muxc:ProgressRing Width="30"
-										                   Height="30"
-										                   FlowDirection="RightToLeft"
-										                   IsActive="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}"
-										                   IsIndeterminate="False"
-										                   Maximum="1"
-										                   Minimum="0"
-										                   Value="{x:Bind ViewModel.TimerProgressRingValue, Mode=OneWay}" />
-										<TextBlock Margin="0,-1,0,0"
-										           HorizontalAlignment="Center"
-										           VerticalAlignment="Center"
-										           Text="{x:Bind ViewModel.TimerLabelText, Mode=OneWay}" />
-									</Grid>
-									<Button Click="{x:Bind ViewModel.ToggleTimer}"
-									        Content="{x:Bind ViewModel.TimerButtonText, Mode=OneWay}"
-									        IsEnabled="{x:Bind ViewModel.IsNotRunning, Mode=OneWay}" />
-								</StackPanel>
-							</local:SettingsCard.ActionContent>
-						</local:SettingsCard>
-					</muxc:Expander.Header>
-					<muxc:Expander.Content>
-						<local:SettingsCard x:Uid="Home_Timer_Delay"
-						                    Style="{StaticResource ExpanderContentSettingStyle}">
-							<local:SettingsCard.ActionContent>
-								<Slider Width="150"
-								        Loaded="TimerSlider_Loaded"
-								        Maximum="5"
-								        Minimum="1"
-								        TickFrequency="1"
-								        Value="{x:Bind ViewModel.Delay, Mode=TwoWay}" />
-							</local:SettingsCard.ActionContent>
-						</local:SettingsCard>
-					</muxc:Expander.Content>
-				</muxc:Expander>
+				<local:SettingsExpander x:Uid="Home_Timer">
+					<local:SettingsExpander.HeaderIcon>
+						<FontIcon Glyph="&#xE916;" />
+					</local:SettingsExpander.HeaderIcon>
+					<local:SettingsExpander.Content>
+						<StackPanel Orientation="Horizontal"
+						            Spacing="8">
+							<Grid Visibility="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}">
+								<muxc:ProgressRing Width="30"
+								                   Height="30"
+								                   FlowDirection="RightToLeft"
+								                   IsActive="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}"
+								                   IsIndeterminate="False"
+								                   Maximum="1"
+								                   Minimum="0"
+								                   Value="{x:Bind ViewModel.TimerProgressRingValue, Mode=OneWay}" />
+								<TextBlock Margin="0,-1,0,0"
+								           HorizontalAlignment="Center"
+								           VerticalAlignment="Center"
+								           Text="{x:Bind ViewModel.TimerLabelText, Mode=OneWay}" />
+							</Grid>
+							<Button Click="{x:Bind ViewModel.ToggleTimer}"
+							        Content="{x:Bind ViewModel.TimerButtonText, Mode=OneWay}"
+							        IsEnabled="{x:Bind ViewModel.IsNotRunning, Mode=OneWay}" />
+						</StackPanel>
+					</local:SettingsExpander.Content>
+					<local:SettingsExpander.Items>
+						<local:SettingsCard2 x:Uid="Home_Timer_Delay">
+							<Slider Width="150"
+							        Loaded="TimerSlider_Loaded"
+							        Maximum="5"
+							        Minimum="1"
+							        TickFrequency="1"
+							        Value="{x:Bind ViewModel.Delay, Mode=TwoWay}" />
+						</local:SettingsCard2>
+					</local:SettingsExpander.Items>
+				</local:SettingsExpander>
 				<StackPanel Orientation="Vertical">
 					<local:SettingsCard x:Uid="Home_AutoRestore"
 					                    Visibility="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}">
diff --git a/src/Magpie.App/KeyVisual.cpp b/src/Magpie.App/KeyVisual.cpp
index 03a62e454..cc9b00b2a 100644
--- a/src/Magpie.App/KeyVisual.cpp
+++ b/src/Magpie.App/KeyVisual.cpp
@@ -16,21 +16,21 @@ namespace winrt::Magpie::App::implementation {
 const DependencyProperty KeyVisual::_keyProperty = DependencyProperty::Register(
 	L"Key",
 	xaml_typename<int>(),
-	xaml_typename<Magpie::App::KeyVisual>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value<int>(0), &KeyVisual::_OnPropertyChanged)
 );
 
 const DependencyProperty KeyVisual::_visualTypeProperty = DependencyProperty::Register(
 	L"VisualTypeProperty",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::KeyVisual>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(Magpie::App::VisualType{}), &KeyVisual::_OnPropertyChanged)
 );
 
 const DependencyProperty KeyVisual::_isErrorProperty = DependencyProperty::Register(
 	L"IsError",
 	xaml_typename<bool>(),
-	xaml_typename<Magpie::App::KeyVisual>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(false), &KeyVisual::_OnIsErrorChanged)
 );
 
@@ -40,6 +40,8 @@ KeyVisual::KeyVisual() {
 }
 
 void KeyVisual::OnApplyTemplate() {
+	base_type::OnApplyTemplate();
+
 	_isEnabledChangedRevoker.revoke();
 
 	_keyPresenter = GetTemplateChild(L"KeyPresenter").as<ContentPresenter>();
@@ -49,15 +51,14 @@ void KeyVisual::OnApplyTemplate() {
 	_SetErrorState();
 
 	_isEnabledChangedRevoker = IsEnabledChanged(auto_revoke, { this, &KeyVisual::_IsEnabledChanged });
-	KeyVisual_base<KeyVisual>::OnApplyTemplate();
 }
 
 void KeyVisual::_OnPropertyChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<KeyVisual>(sender.as<Magpie::App::KeyVisual>())->_Update();
+	get_self<KeyVisual>(sender.as<class_type>())->_Update();
 }
 
 void KeyVisual::_OnIsErrorChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<KeyVisual>(sender.as<Magpie::App::KeyVisual>())->_SetErrorState();
+	get_self<KeyVisual>(sender.as<class_type>())->_SetErrorState();
 }
 
 void KeyVisual::_IsEnabledChanged(IInspectable const&, DependencyPropertyChangedEventArgs const&) {
diff --git a/src/Magpie.App/PageFrame.cpp b/src/Magpie.App/PageFrame.cpp
index c6d0378c4..719e46b50 100644
--- a/src/Magpie.App/PageFrame.cpp
+++ b/src/Magpie.App/PageFrame.cpp
@@ -16,28 +16,28 @@ namespace winrt::Magpie::App::implementation {
 const DependencyProperty PageFrame::TitleProperty = DependencyProperty::Register(
 	L"Title",
 	xaml_typename<hstring>(),
-	xaml_typename<Magpie::App::PageFrame>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(L""), &PageFrame::_OnTitleChanged)
 );
 
 const DependencyProperty PageFrame::IconProperty = DependencyProperty::Register(
 	L"Icon",
 	xaml_typename<IconElement>(),
-	xaml_typename<Magpie::App::PageFrame>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &PageFrame::_OnIconChanged)
 );
 
 const DependencyProperty PageFrame::HeaderActionProperty = DependencyProperty::Register(
 	L"HeaderAction",
 	xaml_typename<FrameworkElement>(),
-	xaml_typename<Magpie::App::PageFrame>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &PageFrame::_OnHeaderActionChanged)
 );
 
 const DependencyProperty PageFrame::MainContentProperty = DependencyProperty::Register(
 	L"MainContent",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::PageFrame>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &PageFrame::_OnMainContentChanged)
 );
 
@@ -107,25 +107,25 @@ void PageFrame::_Update() {
 }
 
 void PageFrame::_OnTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	PageFrame* that = get_self<PageFrame>(sender.as<Magpie::App::PageFrame>());
+	PageFrame* that = get_self<PageFrame>(sender.as<class_type>());
 	that->_Update();
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"Title" });
 }
 
 void PageFrame::_OnIconChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	PageFrame* that = get_self<PageFrame>(sender.as<Magpie::App::PageFrame>());
+	PageFrame* that = get_self<PageFrame>(sender.as<class_type>());
 	that->_Update();
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"Icon" });
 }
 
 void PageFrame::_OnHeaderActionChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	PageFrame* that = get_self<PageFrame>(sender.as<Magpie::App::PageFrame>());
+	PageFrame* that = get_self<PageFrame>(sender.as<class_type>());
 	that->_Update();
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"HeaderAction" });
 }
 
 void PageFrame::_OnMainContentChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	PageFrame* that = get_self<PageFrame>(sender.as<Magpie::App::PageFrame>());
+	PageFrame* that = get_self<PageFrame>(sender.as<class_type>());
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"MainContent" });
 }
 
diff --git a/src/Magpie.App/Resources.language-de.resw b/src/Magpie.App/Resources.language-de.resw
index 156ce15f5..42430b6d4 100644
--- a/src/Magpie.App/Resources.language-de.resw
+++ b/src/Magpie.App/Resources.language-de.resw
@@ -82,7 +82,7 @@
   <data name="Home_AutoRestore.Description" xml:space="preserve">
     <value>Automatisch skalieren, sobald das Fenster zum Vordergrund zurück kehrt.</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Verspätetes skalieren</value>
   </data>
   <data name="Home_Timer_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-en-US.resw b/src/Magpie.App/Resources.language-en-US.resw
index 4f4bbf40f..0f23d96d6 100644
--- a/src/Magpie.App/Resources.language-en-US.resw
+++ b/src/Magpie.App/Resources.language-en-US.resw
@@ -147,7 +147,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Scale the foreground window when timer ends</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Delayed scaling</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -156,7 +156,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Delay in seconds</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-es.resw b/src/Magpie.App/Resources.language-es.resw
index de6e9abc3..c01f55300 100644
--- a/src/Magpie.App/Resources.language-es.resw
+++ b/src/Magpie.App/Resources.language-es.resw
@@ -150,7 +150,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Escale la ventana de primer plano cuando finalice el temporizador</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Escalado retrasado</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -159,7 +159,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Espera en segundos</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-fr.resw b/src/Magpie.App/Resources.language-fr.resw
index 56c006d08..f99303032 100644
--- a/src/Magpie.App/Resources.language-fr.resw
+++ b/src/Magpie.App/Resources.language-fr.resw
@@ -222,7 +222,7 @@
   <data name="About_PageFrame.Title" xml:space="preserve">
     <value>A propos</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Délai en secondes</value>
   </data>
   <data name="Root_About.Content" xml:space="preserve">
@@ -231,7 +231,7 @@
   <data name="Home_AutoRestore_Activate.Content" xml:space="preserve">
     <value>Activer</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Mise à l'échelle retardée</value>
   </data>
   <data name="ShortcutDialog_Description.Text" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-hu.resw b/src/Magpie.App/Resources.language-hu.resw
index c66cf314e..93d550f29 100644
--- a/src/Magpie.App/Resources.language-hu.resw
+++ b/src/Magpie.App/Resources.language-hu.resw
@@ -241,13 +241,13 @@
   <data name="About_Version_Version" xml:space="preserve">
     <value>Verzió</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Késleltetett méretezés</value>
   </data>
   <data name="About_PageFrame.Title" xml:space="preserve">
     <value>Rólunk</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Késleltetés másodpercben</value>
   </data>
   <data name="ShortcutDialog_Save" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-id.resw b/src/Magpie.App/Resources.language-id.resw
index 686d604a0..88079568a 100644
--- a/src/Magpie.App/Resources.language-id.resw
+++ b/src/Magpie.App/Resources.language-id.resw
@@ -264,7 +264,7 @@
   <data name="Home_PageFrame.Title" xml:space="preserve">
     <value>Beranda</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Tunda dalam detik</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
@@ -465,7 +465,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Skalakan window latar depan saat timer berakhir</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Tunda penskalaan</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-it.resw b/src/Magpie.App/Resources.language-it.resw
index dec3ce055..0884e5c66 100644
--- a/src/Magpie.App/Resources.language-it.resw
+++ b/src/Magpie.App/Resources.language-it.resw
@@ -150,13 +150,13 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Ridimensiona la finestra in primo piano allo scadere del timer</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Ridimensionamento ritardato</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
     <value>Ridimensiona dopo {}s</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Ritardo in secondi</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-ja.resw b/src/Magpie.App/Resources.language-ja.resw
index a5584fc15..878859f6e 100644
--- a/src/Magpie.App/Resources.language-ja.resw
+++ b/src/Magpie.App/Resources.language-ja.resw
@@ -135,13 +135,13 @@
   <data name="Home_PageFrame.Title" xml:space="preserve">
     <value>ホーム</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>タイマー</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
     <value>{}秒後にスケーリング</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>カウントダウンタイム</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-ko.resw b/src/Magpie.App/Resources.language-ko.resw
index 0dda711cd..3a781c6d8 100644
--- a/src/Magpie.App/Resources.language-ko.resw
+++ b/src/Magpie.App/Resources.language-ko.resw
@@ -204,7 +204,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>타이머가 끝날 때 포그라운드 창을 스케일</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>타이머</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -213,7 +213,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>카운트다운(초)</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-pt-BR.resw b/src/Magpie.App/Resources.language-pt-BR.resw
index d2811b8d2..0f8371b94 100644
--- a/src/Magpie.App/Resources.language-pt-BR.resw
+++ b/src/Magpie.App/Resources.language-pt-BR.resw
@@ -132,10 +132,10 @@
   <data name="Home_AutoRestore_CurWindow" xml:space="preserve">
     <value>Janela atual: </value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Redimensionamento com atraso</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Tempo de atraso em segundos</value>
   </data>
   <data name="ShortcutDialog_Description.Text" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-ru.resw b/src/Magpie.App/Resources.language-ru.resw
index f03b003f4..ca626190a 100644
--- a/src/Magpie.App/Resources.language-ru.resw
+++ b/src/Magpie.App/Resources.language-ru.resw
@@ -198,7 +198,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Масштабирование переднего окна после задержки</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Отложенное масштабирование</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -207,7 +207,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Задержка в секундах</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-tr.resw b/src/Magpie.App/Resources.language-tr.resw
index 5a7bc2976..a6247bc6b 100644
--- a/src/Magpie.App/Resources.language-tr.resw
+++ b/src/Magpie.App/Resources.language-tr.resw
@@ -192,7 +192,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Zamanlayıcı sona erdiğinde ön plandaki pencereyi ölçeklendir</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Gecikmeli ölçek</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -201,7 +201,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>İptal</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Gecikme saniyesi</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-uk.resw b/src/Magpie.App/Resources.language-uk.resw
index 8eeb660d3..b2e96d873 100644
--- a/src/Magpie.App/Resources.language-uk.resw
+++ b/src/Magpie.App/Resources.language-uk.resw
@@ -147,10 +147,10 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Масштабування вікна переднього плану після закінчення таймера</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Відкладене масштабування</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Затримка в секундах</value>
   </data>
   <data name="ShortcutDialog_Description.Text" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-vi.resw b/src/Magpie.App/Resources.language-vi.resw
index a79bb2b67..81c73c71c 100644
--- a/src/Magpie.App/Resources.language-vi.resw
+++ b/src/Magpie.App/Resources.language-vi.resw
@@ -289,7 +289,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>Scale cửa sổ trên cùng khi hết thời gian</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>Thời gian chờ Scale</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -298,7 +298,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>Hủy</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>Thời gian bằng giây</value>
   </data>
   <data name="Home_UpdateCard_AutoCheckForUpdates.Content" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-zh-Hans.resw b/src/Magpie.App/Resources.language-zh-Hans.resw
index 7b1b1fc6d..ade08e584 100644
--- a/src/Magpie.App/Resources.language-zh-Hans.resw
+++ b/src/Magpie.App/Resources.language-zh-Hans.resw
@@ -147,7 +147,7 @@
   <data name="Home_Timer.Description" xml:space="preserve">
     <value>计时结束后缩放前台窗口</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>定时器</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -156,7 +156,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>倒计时时长</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/Resources.language-zh-Hant.resw b/src/Magpie.App/Resources.language-zh-Hant.resw
index f646447cf..fd3a6bde2 100644
--- a/src/Magpie.App/Resources.language-zh-Hant.resw
+++ b/src/Magpie.App/Resources.language-zh-Hant.resw
@@ -144,7 +144,7 @@
   <data name="Home_PageFrame.Title" xml:space="preserve">
     <value>首頁</value>
   </data>
-  <data name="Home_Timer.Title" xml:space="preserve">
+  <data name="Home_Timer.Header" xml:space="preserve">
     <value>計時器</value>
   </data>
   <data name="Home_Timer_ButtonText" xml:space="preserve">
@@ -156,7 +156,7 @@
   <data name="Home_Timer_Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="Home_Timer_Delay.Title" xml:space="preserve">
+  <data name="Home_Timer_Delay.Header" xml:space="preserve">
     <value>倒數計時延遲</value>
   </data>
   <data name="ShortcutDialog_Cancel" xml:space="preserve">
diff --git a/src/Magpie.App/SettingsCard2.cpp b/src/Magpie.App/SettingsCard2.cpp
index 28243fd48..74b110bae 100644
--- a/src/Magpie.App/SettingsCard2.cpp
+++ b/src/Magpie.App/SettingsCard2.cpp
@@ -1,4 +1,4 @@
-// 移植自 https://github.com/CommunityToolkit/Windows/blob/bef863ca70bb1edf8c940198dd5cc74afa5d2aab/components/SettingsControls/src/SettingsCard/SettingsCard.cs
+// 移植自 https://github.com/CommunityToolkit/Windows/tree/bef863ca70bb1edf8c940198dd5cc74afa5d2aab/components/SettingsControls/src/SettingsCard
 
 #include "pch.h"
 #include "SettingsCard2.h"
@@ -14,92 +14,92 @@ using namespace Windows::UI::Xaml::Input;
 
 namespace winrt::Magpie::App::implementation {
 
-constexpr const wchar_t* CommonStates = L"CommonStates";
-constexpr const wchar_t* NormalState = L"Normal";
-constexpr const wchar_t* PointerOverState = L"PointerOver";
-constexpr const wchar_t* PressedState = L"Pressed";
-constexpr const wchar_t* DisabledState = L"Disabled";
+static constexpr const wchar_t* CommonStates = L"CommonStates";
+static constexpr const wchar_t* NormalState = L"Normal";
+static constexpr const wchar_t* PointerOverState = L"PointerOver";
+static constexpr const wchar_t* PressedState = L"Pressed";
+static constexpr const wchar_t* DisabledState = L"Disabled";
 
-constexpr const wchar_t* ContentAlignmentStates = L"ContentAlignmentStates";
-constexpr const wchar_t* RightState = L"Right";
-constexpr const wchar_t* RightWrappedState = L"RightWrapped";
-constexpr const wchar_t* RightWrappedNoIconState = L"RightWrappedNoIcon";
-constexpr const wchar_t* LeftState = L"Left";
-constexpr const wchar_t* VerticalState = L"Vertical";
+static constexpr const wchar_t* ContentAlignmentStates = L"ContentAlignmentStates";
+static constexpr const wchar_t* RightState = L"Right";
+static constexpr const wchar_t* RightWrappedState = L"RightWrapped";
+static constexpr const wchar_t* RightWrappedNoIconState = L"RightWrappedNoIcon";
+static constexpr const wchar_t* LeftState = L"Left";
+static constexpr const wchar_t* VerticalState = L"Vertical";
 
-constexpr const wchar_t* ContentSpacingStates = L"ContentSpacingStates";
-constexpr const wchar_t* NoContentSpacingState = L"NoContentSpacing";
-constexpr const wchar_t* ContentSpacingState = L"ContentSpacing";
+static constexpr const wchar_t* ContentSpacingStates = L"ContentSpacingStates";
+static constexpr const wchar_t* NoContentSpacingState = L"NoContentSpacing";
+static constexpr const wchar_t* ContentSpacingState = L"ContentSpacing";
 
-constexpr const wchar_t* RootGrid = L"PART_RootGrid";
-constexpr const wchar_t* ActionIconPresenterHolder = L"PART_ActionIconPresenterHolder";
-constexpr const wchar_t* HeaderPresenter = L"PART_HeaderPresenter";
-constexpr const wchar_t* DescriptionPresenter = L"PART_DescriptionPresenter";
-constexpr const wchar_t* HeaderIconPresenterHolder = L"PART_HeaderIconPresenterHolder";
+static constexpr const wchar_t* RootGrid = L"PART_RootGrid";
+static constexpr const wchar_t* ActionIconPresenterHolder = L"PART_ActionIconPresenterHolder";
+static constexpr const wchar_t* HeaderPresenter = L"PART_HeaderPresenter";
+static constexpr const wchar_t* DescriptionPresenter = L"PART_DescriptionPresenter";
+static constexpr const wchar_t* HeaderIconPresenterHolder = L"PART_HeaderIconPresenterHolder";
 
-constexpr const wchar_t* RightWrappedTrigger = L"RightWrappedTrigger";
-constexpr const wchar_t* RightWrappedNoIconTrigger = L"RightWrappedNoIconTrigger";
+static constexpr const wchar_t* RightWrappedTrigger = L"RightWrappedTrigger";
+static constexpr const wchar_t* RightWrappedNoIconTrigger = L"RightWrappedNoIconTrigger";
 
 const DependencyProperty SettingsCard2::_headerProperty = DependencyProperty::Register(
 	L"Header",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &SettingsCard2::_OnHeaderChanged)
 );
 
 const DependencyProperty SettingsCard2::_descriptionProperty = DependencyProperty::Register(
 	L"Description",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &SettingsCard2::_OnDescriptionChanged)
 );
 
 const DependencyProperty SettingsCard2::_headerIconProperty = DependencyProperty::Register(
 	L"HeaderIcon",
 	xaml_typename<IconElement>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &SettingsCard2::_OnHeaderIconChanged)
 );
 
 const DependencyProperty SettingsCard2::_actionIconProperty = DependencyProperty::Register(
 	L"ActionIcon",
 	xaml_typename<IconElement>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(L"\ue974"))
 );
 
 const DependencyProperty SettingsCard2::_actionIconToolTipProperty = DependencyProperty::Register(
 	L"ActionIconToolTip",
 	xaml_typename<hstring>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 const DependencyProperty SettingsCard2::_isClickEnabledProperty = DependencyProperty::Register(
 	L"IsClickEnabled",
 	xaml_typename<bool>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(false), &SettingsCard2::_OnIsClickEnabledChanged)
 );
 
 const DependencyProperty SettingsCard2::_contentAlignmentProperty = DependencyProperty::Register(
 	L"ContentAlignment",
 	xaml_typename<Magpie::App::ContentAlignment>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(ContentAlignment::Right))
 );
 
 const DependencyProperty SettingsCard2::_isActionIconVisibleProperty = DependencyProperty::Register(
 	L"IsActionIconVisible",
 	xaml_typename<bool>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(true), &SettingsCard2::_OnIsActionIconVisibleChanged)
 );
 
 const DependencyProperty SettingsCard2::_isWrapEnabledProperty = DependencyProperty::Register(
 	L"IsWrapEnabled",
 	xaml_typename<bool>(),
-	xaml_typename<Magpie::App::SettingsCard2>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(false), &SettingsCard2::_OnIsWrapEnabledChanged)
 );
 
@@ -115,7 +115,7 @@ SettingsCard2::~SettingsCard2() {
 }
 
 void SettingsCard2::OnApplyTemplate() {
-	SettingsCard2_base::OnApplyTemplate();
+	base_type::OnApplyTemplate();
 
 	// https://github.com/microsoft/microsoft-ui-xaml/issues/7792
 	// 对于 Content，模板中的样式不起作用
@@ -126,6 +126,10 @@ void SettingsCard2::OnApplyTemplate() {
 
 	_OnIsWrapEnabledChanged();
 
+	_contentAlignmentStatesChangedRevoker.revoke();
+	_sizeChangedRevoker.revoke();
+	_isEnabledChangedRevoker.revoke();
+
 	_OnActionIconChanged();
 	_OnHeaderChanged();
 	_OnHeaderIconChanged();
@@ -133,34 +137,34 @@ void SettingsCard2::OnApplyTemplate() {
 	_OnIsClickEnabledChanged();
 
 	VisualStateGroup contentAlignmentStatesGroup = GetTemplateChild(ContentAlignmentStates).as<VisualStateGroup>();
-	contentAlignmentStatesGroup.CurrentStateChanged([this](IInspectable const&, VisualStateChangedEventArgs const& e) {
-		_CheckVerticalSpacingState(e.NewState());
+	_contentAlignmentStatesChangedRevoker = contentAlignmentStatesGroup.CurrentStateChanged(auto_revoke, [this](IInspectable const&, VisualStateChangedEventArgs const& args) {
+		_CheckVerticalSpacingState(args.NewState());
 	});
 
 	// 修复启动时的动画错误
-	SizeChanged([this, contentAlignmentStatesGroup(std::move(contentAlignmentStatesGroup))](IInspectable const&, SizeChangedEventArgs const&) {
+	_sizeChangedRevoker = SizeChanged(auto_revoke, [this, contentAlignmentStatesGroup(std::move(contentAlignmentStatesGroup))](IInspectable const&, SizeChangedEventArgs const&) {
 		_CheckVerticalSpacingState(contentAlignmentStatesGroup.CurrentState());
 	});
 
 	VisualStateManager::GoToState(*this, IsEnabled() ? NormalState : DisabledState, true);
-	IsEnabledChanged([this](IInspectable const&, DependencyPropertyChangedEventArgs const&) {
+	_isEnabledChangedRevoker = IsEnabledChanged(auto_revoke, [this](IInspectable const&, DependencyPropertyChangedEventArgs const&) {
 		VisualStateManager::GoToState(*this, IsEnabled() ? NormalState : DisabledState, true);
 	});
 }
 
-void SettingsCard2::OnPointerPressed(PointerRoutedEventArgs const& e) {
+void SettingsCard2::OnPointerPressed(PointerRoutedEventArgs const& args) {
 	// 忽略鼠标右键
-	if (IsClickEnabled() && !(e.Pointer().PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Mouse && e.GetCurrentPoint(*this).Properties().PointerUpdateKind() == Windows::UI::Input::PointerUpdateKind::RightButtonPressed)) {
-		SettingsCard2_base::OnPointerPressed(e);
+	if (IsClickEnabled() && !(args.Pointer().PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Mouse && args.GetCurrentPoint(*this).Properties().PointerUpdateKind() == Windows::UI::Input::PointerUpdateKind::RightButtonPressed)) {
+		base_type::OnPointerPressed(args);
 		VisualStateManager::GoToState(*this, PressedState, true);
 
 		_isCursorCaptured = true;
 	}
 }
 
-void SettingsCard2::OnPointerReleased(PointerRoutedEventArgs e) {
+void SettingsCard2::OnPointerReleased(PointerRoutedEventArgs const& args) {
 	if (_isCursorCaptured && IsClickEnabled()) {
-		SettingsCard2_base::OnPointerReleased(e);
+		base_type::OnPointerReleased(args);
 		VisualStateManager::GoToState(*this, _isCursorOnControl ? PointerOverState : NormalState, true);
 	}
 
@@ -168,42 +172,42 @@ void SettingsCard2::OnPointerReleased(PointerRoutedEventArgs e) {
 }
 
 void SettingsCard2::_OnHeaderChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnHeaderChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnHeaderChanged();
 }
 
 void SettingsCard2::_OnDescriptionChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnDescriptionChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnDescriptionChanged();
 }
 
 void SettingsCard2::_OnHeaderIconChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnHeaderIconChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnHeaderIconChanged();
 }
 
 void SettingsCard2::_OnIsClickEnabledChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnIsClickEnabledChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnIsClickEnabledChanged();
 }
 
 void SettingsCard2::_OnIsActionIconVisibleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnActionIconChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnActionIconChanged();
 }
 
 void SettingsCard2::_OnIsWrapEnabledChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	get_self<SettingsCard2>(sender.as<Magpie::App::SettingsCard2>())->_OnIsWrapEnabledChanged();
+	get_self<SettingsCard2>(sender.as<class_type>())->_OnIsWrapEnabledChanged();
 }
 
-void SettingsCard2::_OnHeaderChanged() {
+void SettingsCard2::_OnHeaderChanged() const {
 	if (FrameworkElement headerPresenter = GetTemplateChild(HeaderPresenter).try_as<FrameworkElement>()) {
 		headerPresenter.Visibility(Header() ? Visibility::Visible : Visibility::Collapsed);
 	}
 }
 
-void SettingsCard2::_OnDescriptionChanged() {
+void SettingsCard2::_OnDescriptionChanged() const {
 	if (FrameworkElement descriptionPresenter = GetTemplateChild(DescriptionPresenter).try_as<FrameworkElement>()) {
 		descriptionPresenter.Visibility(Description() ? Visibility::Visible : Visibility::Collapsed);
 	}
 }
 
-void SettingsCard2::_OnHeaderIconChanged() {
+void SettingsCard2::_OnHeaderIconChanged() const {
 	if (FrameworkElement headerIconPresenter = GetTemplateChild(HeaderIconPresenterHolder).try_as<FrameworkElement>()) {
 		headerIconPresenter.Visibility(HeaderIcon() ? Visibility::Visible : Visibility::Collapsed);
 	}
@@ -219,7 +223,7 @@ void SettingsCard2::_OnIsClickEnabledChanged() {
 	}
 }
 
-void SettingsCard2::_OnActionIconChanged() {
+void SettingsCard2::_OnActionIconChanged() const {
 	if (FrameworkElement actionIconPresenter = GetTemplateChild(ActionIconPresenterHolder).try_as<FrameworkElement>()) {
 		if (IsClickEnabled() && IsActionIconVisible()) {
 			actionIconPresenter.Visibility(Visibility::Visible);
@@ -229,7 +233,7 @@ void SettingsCard2::_OnActionIconChanged() {
 	}
 }
 
-void SettingsCard2::_OnIsWrapEnabledChanged() {
+void SettingsCard2::_OnIsWrapEnabledChanged() const {
 	auto trigger1 = GetTemplateChild(RightWrappedTrigger);
 	auto trigger2 = GetTemplateChild(RightWrappedNoIconTrigger);
 
@@ -275,8 +279,8 @@ void SettingsCard2::_EnableButtonInteraction() {
 	_pointerCaptureLostRevoker = PointerCaptureLost(auto_revoke, goToNormalState);
 	_pointerCanceledRevoker = PointerCanceled(auto_revoke, goToNormalState);
 
-	_previewKeyDownRevoker = PreviewKeyDown(auto_revoke, [this](IInspectable const&, KeyRoutedEventArgs const& e) {
-		const VirtualKey key = e.Key();
+	_previewKeyDownRevoker = PreviewKeyDown(auto_revoke, [this](IInspectable const&, KeyRoutedEventArgs const& args) {
+		const VirtualKey key = args.Key();
 		if (key == VirtualKey::Enter || key == VirtualKey::Space || key == VirtualKey::GamepadA) {
 			// Check if the active focus is on the card itself - only then we show the pressed state.
 			if (FocusManager::GetFocusedElement(XamlRoot()) == *this) {
@@ -285,8 +289,8 @@ void SettingsCard2::_EnableButtonInteraction() {
 		}
 	});
 
-	_previewKeyUpRevoker = PreviewKeyUp(auto_revoke, [this](IInspectable const&, KeyRoutedEventArgs const& e) {
-		const VirtualKey key = e.Key();
+	_previewKeyUpRevoker = PreviewKeyUp(auto_revoke, [this](IInspectable const&, KeyRoutedEventArgs const& args) {
+		const VirtualKey key = args.Key();
 		if (key == VirtualKey::Enter || key == VirtualKey::Space || key == VirtualKey::GamepadA) {
 			VisualStateManager::GoToState(*this, NormalState, true);
 		}
diff --git a/src/Magpie.App/SettingsCard2.h b/src/Magpie.App/SettingsCard2.h
index 3c475b2ed..cae0ad832 100644
--- a/src/Magpie.App/SettingsCard2.h
+++ b/src/Magpie.App/SettingsCard2.h
@@ -8,119 +8,48 @@ struct SettingsCard2 : SettingsCard2_base<SettingsCard2> {
 
 	~SettingsCard2();
 
-	IInspectable Header() const {
-		return GetValue(_headerProperty);
-	}
+	static DependencyProperty HeaderProperty() { return _headerProperty; }
+	static DependencyProperty DescriptionProperty() { return _descriptionProperty; }
+	static DependencyProperty HeaderIconProperty() { return _headerIconProperty; }
+	static DependencyProperty ActionIconProperty() { return _actionIconProperty; }
+	static DependencyProperty ActionIconToolTipProperty() { return _actionIconToolTipProperty; }
+	static DependencyProperty IsClickEnabledProperty() { return _isClickEnabledProperty; }
+	static DependencyProperty ContentAlignmentProperty() { return _contentAlignmentProperty; }
+	static DependencyProperty IsActionIconVisibleProperty() { return _isActionIconVisibleProperty; }
+	static DependencyProperty IsWrapEnabledProperty() { return _isWrapEnabledProperty; }
 
-	void Header(IInspectable const& value) {
-		SetValue(_headerProperty, value);
-	}
+	IInspectable Header() const { return GetValue(_headerProperty); }
+	void Header(IInspectable const& value) const { SetValue(_headerProperty, value); }
 
-	IInspectable Description() const {
-		return GetValue(_descriptionProperty);
-	}
+	IInspectable Description() const { return GetValue(_descriptionProperty); }
+	void Description(IInspectable const& value) const { SetValue(_descriptionProperty, value); }
 
-	void Description(IInspectable const& value) {
-		SetValue(_descriptionProperty, value);
-	}
+	Controls::IconElement HeaderIcon() const { return GetValue(_headerIconProperty).as<Controls::IconElement>(); }
+	void HeaderIcon(Controls::IconElement const& value) const { SetValue(_headerIconProperty, value); }
 
-	Controls::IconElement HeaderIcon() const {
-		return GetValue(_headerIconProperty).as<Controls::IconElement>();
-	}
+	Controls::IconElement ActionIcon() const { return GetValue(_actionIconProperty).as<Controls::IconElement>(); }
+	void ActionIcon(Controls::IconElement const& value) const { SetValue(_actionIconProperty, value); }
 
-	void HeaderIcon(Controls::IconElement const& value) {
-		SetValue(_headerIconProperty, value);
-	}
+	hstring ActionIconToolTip() const { return GetValue(_actionIconToolTipProperty).as<hstring>(); }
+	void ActionIconToolTip(const hstring& value) const { SetValue(_actionIconToolTipProperty, box_value(value)); }
 
-	Controls::IconElement ActionIcon() const {
-		return GetValue(_actionIconProperty).as<Controls::IconElement>();
-	}
+	bool IsClickEnabled() const { return GetValue(_isClickEnabledProperty).as<bool>(); }
+	void IsClickEnabled(bool value) const { SetValue(_isClickEnabledProperty, box_value(value)); }
 
-	void ActionIcon(Controls::IconElement const& value) {
-		SetValue(_actionIconProperty, value);
-	}
+	ContentAlignment ContentAlignment() const { return GetValue(_contentAlignmentProperty).as<Magpie::App::ContentAlignment>(); }
+	void ContentAlignment(Magpie::App::ContentAlignment value) const { SetValue(_contentAlignmentProperty, box_value(value)); }
 
-	hstring ActionIconToolTip() const {
-		return GetValue(_actionIconToolTipProperty).as<hstring>();
-	}
+	bool IsActionIconVisible() const { return GetValue(_isActionIconVisibleProperty).as<bool>(); }
+	void IsActionIconVisible(bool value) const { SetValue(_isActionIconVisibleProperty, box_value(value)); }
 
-	void ActionIconToolTip(const hstring& value) {
-		SetValue(_actionIconToolTipProperty, box_value(value));
-	}
-
-	bool IsClickEnabled() const {
-		return GetValue(_isClickEnabledProperty).as<bool>();
-	}
-
-	void IsClickEnabled(bool value) {
-		SetValue(_isClickEnabledProperty, box_value(value));
-	}
-
-	ContentAlignment ContentAlignment() const {
-		return GetValue(_contentAlignmentProperty).as<Magpie::App::ContentAlignment>();
-	}
-
-	void ContentAlignment(Magpie::App::ContentAlignment value) {
-		SetValue(_contentAlignmentProperty, box_value(value));
-	}
-
-	bool IsActionIconVisible() const {
-		return GetValue(_isActionIconVisibleProperty).as<bool>();
-	}
-
-	void IsActionIconVisible(bool value) {
-		SetValue(_isActionIconVisibleProperty, box_value(value));
-	}
-
-	bool IsWrapEnabled() const {
-		return GetValue(_isWrapEnabledProperty).as<bool>();
-	}
-
-	void IsWrapEnabled(bool value) {
-		SetValue(_isWrapEnabledProperty, box_value(value));
-	}
+	bool IsWrapEnabled() const { return GetValue(_isWrapEnabledProperty).as<bool>(); }
+	void IsWrapEnabled(bool value) const { SetValue(_isWrapEnabledProperty, box_value(value)); }
 
 	void OnApplyTemplate();
 
-	void OnPointerPressed(Input::PointerRoutedEventArgs const& e);
-
-	void OnPointerReleased(Input::PointerRoutedEventArgs e);
+	void OnPointerPressed(Input::PointerRoutedEventArgs const& args);
 
-	static DependencyProperty HeaderProperty() {
-		return _headerProperty;
-	}
-
-	static DependencyProperty DescriptionProperty() {
-		return _descriptionProperty;
-	}
-
-	static DependencyProperty HeaderIconProperty() {
-		return _headerIconProperty;
-	}
-
-	static DependencyProperty ActionIconProperty() {
-		return _actionIconProperty;
-	}
-
-	static DependencyProperty ActionIconToolTipProperty() {
-		return _actionIconToolTipProperty;
-	}
-
-	static DependencyProperty IsClickEnabledProperty() {
-		return _isClickEnabledProperty;
-	}
-
-	static DependencyProperty ContentAlignmentProperty() {
-		return _contentAlignmentProperty;
-	}
-
-	static DependencyProperty IsActionIconVisibleProperty() {
-		return _isActionIconVisibleProperty;
-	}
-
-	static DependencyProperty IsWrapEnabledProperty() {
-		return _isWrapEnabledProperty;
-	}
+	void OnPointerReleased(Input::PointerRoutedEventArgs const& args);
 
 private:
 	static const DependencyProperty _headerProperty;
@@ -140,12 +69,12 @@ struct SettingsCard2 : SettingsCard2_base<SettingsCard2> {
 	static void _OnIsActionIconVisibleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
 	static void _OnIsWrapEnabledChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
 
-	void _OnHeaderChanged();
-	void _OnDescriptionChanged();
-	void _OnHeaderIconChanged();
+	void _OnHeaderChanged() const;
+	void _OnDescriptionChanged() const;
+	void _OnHeaderIconChanged() const;
 	void _OnIsClickEnabledChanged();
-	void _OnActionIconChanged();
-	void _OnIsWrapEnabledChanged();
+	void _OnActionIconChanged() const;
+	void _OnIsWrapEnabledChanged() const;
 
 	void _CheckVerticalSpacingState(VisualState const& s);
 
@@ -153,6 +82,10 @@ struct SettingsCard2 : SettingsCard2_base<SettingsCard2> {
 
 	void _DisableButtonInteraction();
 
+	IsEnabledChanged_revoker _isEnabledChangedRevoker;
+	VisualStateGroup::CurrentStateChanged_revoker _contentAlignmentStatesChangedRevoker;
+	SizeChanged_revoker _sizeChangedRevoker;
+
 	UIElement::PointerEntered_revoker _pointerEnteredRevoker;
 	UIElement::PointerExited_revoker _pointerExitedRevoker;
 	UIElement::PointerCaptureLost_revoker _pointerCaptureLostRevoker;
diff --git a/src/Magpie.App/SettingsCard2.idl b/src/Magpie.App/SettingsCard2.idl
index 47912b18c..2c4d65fa6 100644
--- a/src/Magpie.App/SettingsCard2.idl
+++ b/src/Magpie.App/SettingsCard2.idl
@@ -24,16 +24,6 @@ namespace Magpie.App{
 	runtimeclass SettingsCard2 : Windows.UI.Xaml.Controls.Primitives.ButtonBase {
 		SettingsCard2();
 
-		Object Header;
-		Object Description;
-		Windows.UI.Xaml.Controls.IconElement HeaderIcon;
-		Windows.UI.Xaml.Controls.IconElement ActionIcon;
-		String ActionIconToolTip;
-		Boolean IsClickEnabled;
-		ContentAlignment ContentAlignment;
-		Boolean IsActionIconVisible;
-		Boolean IsWrapEnabled;
-
 		static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
 		static Windows.UI.Xaml.DependencyProperty DescriptionProperty { get; };
 		static Windows.UI.Xaml.DependencyProperty HeaderIconProperty { get; };
@@ -43,5 +33,15 @@ namespace Magpie.App{
 		static Windows.UI.Xaml.DependencyProperty ContentAlignmentProperty { get; };
 		static Windows.UI.Xaml.DependencyProperty IsActionIconVisibleProperty { get; };
 		static Windows.UI.Xaml.DependencyProperty IsWrapEnabledProperty { get; };
+
+		Object Header;
+		Object Description;
+		Windows.UI.Xaml.Controls.IconElement HeaderIcon;
+		Windows.UI.Xaml.Controls.IconElement ActionIcon;
+		String ActionIconToolTip;
+		Boolean IsClickEnabled;
+		ContentAlignment ContentAlignment;
+		Boolean IsActionIconVisible;
+		Boolean IsWrapEnabled;
 	}
 }
diff --git a/src/Magpie.App/SettingsExpander.cpp b/src/Magpie.App/SettingsExpander.cpp
index 944145a42..5bc782533 100644
--- a/src/Magpie.App/SettingsExpander.cpp
+++ b/src/Magpie.App/SettingsExpander.cpp
@@ -1,4 +1,4 @@
-// 移植自 https://github.com/CommunityToolkit/Windows/tree/main/components/SettingsControls/src/SettingsExpander
+// 移植自 https://github.com/CommunityToolkit/Windows/tree/bef863ca70bb1edf8c940198dd5cc74afa5d2aab/components/SettingsControls/src/SettingsExpander
 
 #include "pch.h"
 #include "SettingsExpander.h"
@@ -11,36 +11,108 @@ using namespace Windows::UI::Xaml::Controls;
 
 namespace winrt::Magpie::App::implementation {
 
+static constexpr const wchar_t* PART_ItemsRepeater = L"PART_ItemsRepeater";
+
 const DependencyProperty SettingsExpander::_headerProperty = DependencyProperty::Register(
 	L"Header",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsExpander>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 const DependencyProperty SettingsExpander::_descriptionProperty = DependencyProperty::Register(
 	L"Description",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsExpander>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 const DependencyProperty SettingsExpander::_headerIconProperty = DependencyProperty::Register(
 	L"HeaderIcon",
 	xaml_typename<IconElement>(),
-	xaml_typename<Magpie::App::SettingsExpander>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 const DependencyProperty SettingsExpander::_contentProperty = DependencyProperty::Register(
 	L"Content",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsExpander>(),
+	xaml_typename<class_type>(),
+	nullptr
+);
+
+const DependencyProperty SettingsExpander::_itemsHeaderProperty = DependencyProperty::Register(
+	L"ItemsHeader",
+	xaml_typename<UIElement>(),
+	xaml_typename<class_type>(),
+	nullptr
+);
+
+const DependencyProperty SettingsExpander::_itemsFooterProperty = DependencyProperty::Register(
+	L"ItemsFooter",
+	xaml_typename<UIElement>(),
+	xaml_typename<class_type>(),
+	nullptr
+);
+
+const DependencyProperty SettingsExpander::_isExpandedProperty = DependencyProperty::Register(
+	L"IsExpanded",
+	xaml_typename<bool>(),
+	xaml_typename<class_type>(),
+	PropertyMetadata(box_value(false), &SettingsExpander::_OnIsExpandedChanged)
+);
+
+const DependencyProperty SettingsExpander::_itemsProperty = DependencyProperty::Register(
+	L"Items",
+	xaml_typename<IVector<IInspectable>>(),
+	xaml_typename<class_type>(),
+	PropertyMetadata(nullptr, &SettingsExpander::_OnItemsConnectedPropertyChanged)
+);
+
+const DependencyProperty SettingsExpander::_itemsSourceProperty = DependencyProperty::Register(
+	L"ItemsSource",
+	xaml_typename<IInspectable>(),
+	xaml_typename<class_type>(),
+	PropertyMetadata(nullptr, &SettingsExpander::_OnItemsConnectedPropertyChanged)
+);
+
+const DependencyProperty SettingsExpander::_itemTemplateProperty = DependencyProperty::Register(
+	L"ItemTemplate",
+	xaml_typename<IInspectable>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 SettingsExpander::SettingsExpander() {
 	DefaultStyleKey(box_value(GetRuntimeClassName()));
+	Items(single_threaded_vector<IInspectable>());
+}
+
+void SettingsExpander::OnApplyTemplate() {
+	base_type::OnApplyTemplate();
+	
+	_OnItemsConnectedPropertyChanged();
+}
+
+void SettingsExpander::_OnIsExpandedChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const& args) {
+	SettingsExpander* that = get_self<SettingsExpander>(sender.as<class_type>());
+
+	if (args.NewValue().as<bool>()) {
+		that->_expandedEvent();
+	} else {
+		that->_collapsedEvent();
+	}
+}
+
+void SettingsExpander::_OnItemsConnectedPropertyChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
+	get_self<SettingsExpander>(sender.as<class_type>())->_OnItemsConnectedPropertyChanged();
+}
+
+void SettingsExpander::_OnItemsConnectedPropertyChanged() {
+	if (MUXC::ItemsRepeater itemsRepeater = GetTemplateChild(PART_ItemsRepeater).as<MUXC::ItemsRepeater>()) {
+		IInspectable datasource = ItemsSource();
+		itemsRepeater.ItemsSource(datasource ? datasource : Items());
+	}
 }
 
 }
diff --git a/src/Magpie.App/SettingsExpander.h b/src/Magpie.App/SettingsExpander.h
index 72e627e41..1a8e39db5 100644
--- a/src/Magpie.App/SettingsExpander.h
+++ b/src/Magpie.App/SettingsExpander.h
@@ -6,59 +6,74 @@ namespace winrt::Magpie::App::implementation {
 struct SettingsExpander : SettingsExpander_base<SettingsExpander> {
 	SettingsExpander();
 
-	IInspectable Header() const {
-		return GetValue(_headerProperty);
-	}
+	static DependencyProperty HeaderProperty() { return _headerProperty; }
+	static DependencyProperty DescriptionProperty() { return _descriptionProperty; }
+	static DependencyProperty HeaderIconProperty() { return _headerIconProperty; }
+	static DependencyProperty ContentProperty() { return _contentProperty; }
+	static DependencyProperty ItemsHeaderProperty() { return _itemsHeaderProperty; }
+	static DependencyProperty ItemsFooterProperty() { return _itemsFooterProperty; }
+	static DependencyProperty IsExpandedProperty() { return _isExpandedProperty; }
+	static DependencyProperty ItemsProperty() { return _itemsProperty; }
+	static DependencyProperty ItemsSourceProperty() { return _itemsSourceProperty; }
+	static DependencyProperty ItemTemplateProperty() { return _itemTemplateProperty; }
 
-	void Header(IInspectable const& value) {
-		SetValue(_headerProperty, value);
-	}
+	IInspectable Header() const { return GetValue(_headerProperty); }
+	void Header(IInspectable const& value) const { SetValue(_headerProperty, value); }
 
-	IInspectable Description() const {
-		return GetValue(_descriptionProperty);
-	}
+	IInspectable Description() const { return GetValue(_descriptionProperty); }
+	void Description(IInspectable const& value) const { SetValue(_descriptionProperty, value); }
 
-	void Description(IInspectable const& value) {
-		SetValue(_descriptionProperty, value);
-	}
+	Controls::IconElement HeaderIcon() const { return GetValue(_headerIconProperty).as<Controls::IconElement>(); }
+	void HeaderIcon(Controls::IconElement const& value)const { SetValue(_headerIconProperty, value); }
 
-	Controls::IconElement HeaderIcon() const {
-		return GetValue(_headerIconProperty).as<Controls::IconElement>();
-	}
+	IInspectable Content() const { return GetValue(_contentProperty); }
+	void Content(IInspectable const& value) const { SetValue(_contentProperty, value); }
 
-	void HeaderIcon(Controls::IconElement const& value) {
-		SetValue(_headerIconProperty, value);
-	}
+	UIElement ItemsHeader() const { return GetValue(_itemsHeaderProperty).as<UIElement>(); }
+	void ItemsHeader(UIElement const& value) const { SetValue(_itemsHeaderProperty, value); }
 
-	IInspectable Content() const {
-		return GetValue(_contentProperty);
-	}
+	UIElement ItemsFooter() const { return GetValue(_itemsFooterProperty).as<UIElement>(); }
+	void ItemsFooter(UIElement const& value) const { SetValue(_itemsFooterProperty, value); }
 
-	void Content(IInspectable const& value) {
-		SetValue(_contentProperty, value);
-	}
+	bool IsExpanded() const { return GetValue(_isExpandedProperty).as<bool>(); }
+	void IsExpanded(bool value) const { SetValue(_isExpandedProperty, box_value(value)); }
 
-	static DependencyProperty HeaderProperty() {
-		return _headerProperty;
-	}
+	event_token Expanded(SignalDelegate const& handler) { return _expandedEvent.add(handler); }
+	void Expanded(winrt::event_token const& token) { _expandedEvent.remove(token); }
 
-	static DependencyProperty DescriptionProperty() {
-		return _descriptionProperty;
-	}
+	event_token Collapsed(SignalDelegate const& handler) { return _collapsedEvent.add(handler); }
+	void Collapsed(winrt::event_token const& token) { _collapsedEvent.remove(token); }
 
-	static DependencyProperty HeaderIconProperty() {
-		return _headerIconProperty;
-	}
+	IVector<IInspectable> Items() const { return GetValue(_itemsProperty).as<IVector<IInspectable>>(); }
+	void Items(IVector<IInspectable> const& value) const { SetValue(_itemsProperty, value); }
 
-	static DependencyProperty ContentProperty() {
-		return _contentProperty;
-	}
+	IInspectable ItemsSource() const { return GetValue(_itemsSourceProperty); }
+	void ItemsSource(IInspectable const& value) const { SetValue(_itemsSourceProperty, value); }
+
+	IInspectable ItemTemplate() const { return GetValue(_itemTemplateProperty); }
+	void ItemTemplate(IInspectable const& value) const { SetValue(_itemTemplateProperty, value); }
+
+	void OnApplyTemplate();
 
 private:
 	static const DependencyProperty _headerProperty;
 	static const DependencyProperty _descriptionProperty;
 	static const DependencyProperty _headerIconProperty;
 	static const DependencyProperty _contentProperty;
+	static const DependencyProperty _itemsHeaderProperty;
+	static const DependencyProperty _itemsFooterProperty;
+	static const DependencyProperty _isExpandedProperty;
+	static const DependencyProperty _itemsProperty;
+	static const DependencyProperty _itemsSourceProperty;
+	static const DependencyProperty _itemTemplateProperty;
+
+	static void _OnIsExpandedChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const& args);
+	static void _OnItemsConnectedPropertyChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
+
+	void _OnItemsConnectedPropertyChanged();
+
+	event<SignalDelegate> _expandedEvent;
+	event<SignalDelegate> _collapsedEvent;
 };
 
 }
diff --git a/src/Magpie.App/SettingsExpander.idl b/src/Magpie.App/SettingsExpander.idl
index 2157a48ba..c1383aba7 100644
--- a/src/Magpie.App/SettingsExpander.idl
+++ b/src/Magpie.App/SettingsExpander.idl
@@ -2,15 +2,30 @@ namespace Magpie.App {
     [Windows.UI.Xaml.Markup.ContentProperty("Content")]
     runtimeclass SettingsExpander : Windows.UI.Xaml.Controls.Control {
         SettingsExpander();
-        
+
+        static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty DescriptionProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty HeaderIconProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ContentProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ItemsHeaderProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ItemsFooterProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty IsExpandedProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ItemsProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ItemsSourceProperty { get; };
+        static Windows.UI.Xaml.DependencyProperty ItemTemplateProperty { get; };
+
         Object Header;
         Object Description;
         Windows.UI.Xaml.Controls.IconElement HeaderIcon;
         Object Content;
+        Windows.UI.Xaml.UIElement ItemsHeader;
+        Windows.UI.Xaml.UIElement ItemsFooter;
+        Boolean IsExpanded;
+        IVector<Object> Items;
+        Object ItemsSource;
+        Object ItemTemplate;
 
-        static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
-        static Windows.UI.Xaml.DependencyProperty DescriptionProperty{ get; };
-        static Windows.UI.Xaml.DependencyProperty HeaderIconProperty{ get; };
-        static Windows.UI.Xaml.DependencyProperty ContentProperty{ get; };
+        event SignalDelegate Expanded;
+        event SignalDelegate Collapsed;
     }
 }
diff --git a/src/Magpie.App/SettingsExpander.xaml b/src/Magpie.App/SettingsExpander.xaml
index 0a166ab5f..0bd2a7979 100644
--- a/src/Magpie.App/SettingsExpander.xaml
+++ b/src/Magpie.App/SettingsExpander.xaml
@@ -4,8 +4,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
                     xmlns:local="using:Magpie.App"
-                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-                    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
 
 	<x:String x:Key="SettingsExpanderChevronToolTip">Show all settings</x:String>
 	<Thickness x:Key="SettingsExpanderHeaderPadding">16,16,4,16</Thickness>
@@ -72,8 +71,6 @@
 						               MinHeight="{TemplateBinding MinHeight}"
 						               HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
 						               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-						               win:AutomationProperties.HelpText="{TemplateBinding AutomationProperties.HelpText}"
-						               win:AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
 						               CornerRadius="{TemplateBinding CornerRadius}"
 						               IsExpanded="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
 						               Style="{StaticResource SettingsExpanderExpanderStyle}">
@@ -144,8 +141,6 @@
 						              HorizontalAlignment="Stretch"
 						              HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
 						              VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
-						              win:AutomationProperties.AutomationId="ExpanderToggleButton"
-						              win:AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
 						              BackgroundSizing="{TemplateBinding BackgroundSizing}"
 						              BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
 						              BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
@@ -314,7 +309,6 @@
 						<ContentPresenter x:Name="ContentPresenter"
 						                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 						                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-						                  win:AutomationProperties.AccessibilityView="Raw"
 						                  Content="{TemplateBinding Content}"
 						                  ContentTemplate="{TemplateBinding ContentTemplate}"
 						                  ContentTransitions="{TemplateBinding ContentTransitions}"
@@ -343,7 +337,6 @@
 							                   HorizontalAlignment="Center"
 							                   VerticalAlignment="Center"
 							                   muxc:AnimatedIcon.State="NormalOff"
-							                   win:AutomationProperties.AccessibilityView="Raw"
 							                   Foreground="{ThemeResource ExpanderChevronForeground}"
 							                   RenderTransformOrigin="0.5, 0.5">
 								<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
diff --git a/src/Magpie.App/SettingsGroup.cpp b/src/Magpie.App/SettingsGroup.cpp
index c01cfb629..7175600c5 100644
--- a/src/Magpie.App/SettingsGroup.cpp
+++ b/src/Magpie.App/SettingsGroup.cpp
@@ -13,21 +13,21 @@ namespace winrt::Magpie::App::implementation {
 const DependencyProperty SettingsGroup::ChildrenProperty = DependencyProperty::Register(
 	L"Children",
 	xaml_typename<UIElementCollection>(),
-	xaml_typename<Magpie::App::SettingsGroup>(),
+	xaml_typename<class_type>(),
 	nullptr
 );
 
 const DependencyProperty SettingsGroup::TitleProperty = DependencyProperty::Register(
 	L"Title",
 	xaml_typename<hstring>(),
-	xaml_typename<Magpie::App::SettingsGroup>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(L""), &SettingsGroup::_OnTitleChanged)
 );
 
 const DependencyProperty SettingsGroup::DescriptionProperty = DependencyProperty::Register(
 	L"Description",
 	xaml_typename<IInspectable>(),
-	xaml_typename<Magpie::App::SettingsGroup>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(nullptr, &SettingsGroup::_OnDescriptionChanged)
 );
 
@@ -47,13 +47,13 @@ void SettingsGroup::Loading(FrameworkElement const&, IInspectable const&) {
 }
 
 void SettingsGroup::_OnTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	SettingsGroup* that = get_self<SettingsGroup>(sender.as<Magpie::App::SettingsGroup>());
+	SettingsGroup* that = get_self<SettingsGroup>(sender.as<class_type>());
 	that->_Update();
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"Title" });
 }
 
 void SettingsGroup::_OnDescriptionChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	SettingsGroup* that = get_self<SettingsGroup>(sender.as<Magpie::App::SettingsGroup>());
+	SettingsGroup* that = get_self<SettingsGroup>(sender.as<class_type>());
 	that->_Update();
 	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"Description" });
 }
diff --git a/src/Magpie.App/ShortcutControl.cpp b/src/Magpie.App/ShortcutControl.cpp
index ecc2c34ef..2847cfe4e 100644
--- a/src/Magpie.App/ShortcutControl.cpp
+++ b/src/Magpie.App/ShortcutControl.cpp
@@ -41,14 +41,14 @@ static IVector<IInspectable> ToKeys(const Shortcut& shortcut, bool isError) {
 const DependencyProperty ShortcutControl::ActionProperty = DependencyProperty::Register(
 	L"Action",
 	xaml_typename<ShortcutAction>(),
-	xaml_typename<Magpie::App::ShortcutControl>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(ShortcutAction::COUNT_OR_NONE), &ShortcutControl::_OnActionChanged)
 );
 
 const DependencyProperty ShortcutControl::TitleProperty = DependencyProperty::Register(
 	L"Title",
 	xaml_typename<hstring>(),
-	xaml_typename<Magpie::App::ShortcutControl>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(L""), &ShortcutControl::_OnTitleChanged)
 );
 
@@ -228,12 +228,12 @@ LRESULT ShortcutControl::_LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM
 }
 
 void ShortcutControl::_OnActionChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	ShortcutControl* that = get_self<ShortcutControl>(sender.as<Magpie::App::ShortcutControl>());
+	ShortcutControl* that = get_self<ShortcutControl>(sender.as<class_type>());
 	that->_UpdateShortcut();
 }
 
 void ShortcutControl::_OnTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const& args) {
-	ShortcutControl* that = get_self<ShortcutControl>(sender.as<Magpie::App::ShortcutControl>());
+	ShortcutControl* that = get_self<ShortcutControl>(sender.as<class_type>());
 	if (that->_shortcutDialog) {
 		that->_shortcutDialog.Title(args.NewValue());
 	}
diff --git a/src/Magpie.App/TextBlockHelper.cpp b/src/Magpie.App/TextBlockHelper.cpp
index 3e95f4421..24e290690 100644
--- a/src/Magpie.App/TextBlockHelper.cpp
+++ b/src/Magpie.App/TextBlockHelper.cpp
@@ -15,7 +15,7 @@ namespace winrt::Magpie::App::implementation {
 DependencyProperty TextBlockHelper::_isAutoTooltipProperty = DependencyProperty::RegisterAttached(
     L"IsAutoTooltip",
     xaml_typename<bool>(),
-    xaml_typename<Magpie::App::TextBlockHelper>(),
+    xaml_typename<class_type>(),
     PropertyMetadata(box_value(false), _OnIsAutoTooltipChanged)
 );
 
diff --git a/src/Magpie.App/WrapPanel.cpp b/src/Magpie.App/WrapPanel.cpp
index c7e622303..2bd7d68e1 100644
--- a/src/Magpie.App/WrapPanel.cpp
+++ b/src/Magpie.App/WrapPanel.cpp
@@ -12,35 +12,35 @@ namespace winrt::Magpie::App::implementation {
 const DependencyProperty WrapPanel::HorizontalSpacingProperty = DependencyProperty::Register(
 	L"HorizontalSpacing",
 	xaml_typename<double>(),
-	xaml_typename<Magpie::App::WrapPanel>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(0.0), &WrapPanel::_OnLayoutPropertyChanged)
 );
 
 const DependencyProperty WrapPanel::VerticalSpacingProperty = DependencyProperty::Register(
 	L"VerticalSpacing",
 	xaml_typename<double>(),
-	xaml_typename<Magpie::App::WrapPanel>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(0.0), &WrapPanel::_OnLayoutPropertyChanged)
 );
 
 const DependencyProperty WrapPanel::OrientationProperty = DependencyProperty::Register(
 	L"Orientation",
 	xaml_typename<Controls::Orientation>(),
-	xaml_typename<Magpie::App::WrapPanel>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(Orientation::Horizontal), &WrapPanel::_OnLayoutPropertyChanged)
 );
 
 const DependencyProperty WrapPanel::PaddingProperty = DependencyProperty::Register(
 	L"Padding",
 	xaml_typename<Thickness>(),
-	xaml_typename<Magpie::App::WrapPanel>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(Thickness{}), &WrapPanel::_OnLayoutPropertyChanged)
 );
 
 const DependencyProperty WrapPanel::StretchChildProperty = DependencyProperty::Register(
 	L"StretchChild",
 	xaml_typename<Magpie::App::StretchChild>(),
-	xaml_typename<Magpie::App::WrapPanel>(),
+	xaml_typename<class_type>(),
 	PropertyMetadata(box_value(StretchChild::None), &WrapPanel::_OnLayoutPropertyChanged)
 );
 
@@ -98,7 +98,7 @@ Size WrapPanel::ArrangeOverride(Size finalSize) {
 }
 
 void WrapPanel::_OnLayoutPropertyChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
-	WrapPanel* that = get_self<WrapPanel>(sender.as<Magpie::App::WrapPanel>());
+	WrapPanel* that = get_self<WrapPanel>(sender.as<class_type>());
 	that->InvalidateMeasure();
 	that->InvalidateArrange();
 }