[Settings] Aligning XAML across all pages (#12212)

* Updating settings

* OOBE button

* Removed unused namespaces

Co-authored-by: Niels Laute <niels9001@hotmail.com>

src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml

@@ -2,12 +2,11 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     AutomationProperties.LandmarkType="Main">
@@ -21,334 +20,261 @@
         <localConverters:UpdatingStateReadyToInstallToVisibilityConverter x:Key="UpdatingStateReadyToInstallToVisibilityConverter" />
     </Page.Resources>
 
-    <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="LayoutVisualStates">
-                <VisualState x:Name="WideLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="SmallLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
-                        <Setter Target="SidePanel.Width" Value="Auto"/>
-                        <Setter Target="GeneralView.(Grid.Row)" Value="1" />
-                        <Setter Target="GeneralView.Margin" Value="0" />
-                        <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
-                        <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
-                        <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
-                        <Setter Target="AboutTitle.Visibility" Value="Collapsed" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <StackPanel Orientation="Vertical"
-                    x:Name="GeneralView"
-                    Margin="0,0,48,0"
-                    HorizontalAlignment="Left"
-                    MaxWidth="{StaticResource MaxContentWidth}">
-            <TextBlock x:Uid="Admin_Mode" 
+    <controls:SettingsPageControl x:Uid="About_PowerToys"
+                                  ModuleImageSource="ms-appx:///Assets/Modules/PT.png"
+                                  ModuleImageLink="https://aka.ms/powertoys">
+        <controls:SettingsPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
+                <Button Click="OobeButton_Click"
+                        Style="{StaticResource AccentButtonStyle}"
+                        Margin="0,12,0,24">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <FontIcon FontSize="13" Glyph="&#xF133;" />
+                            <TextBlock Margin="8,0,0,0"
+                               x:Uid="Oobe_Button"/>
+                    </StackPanel>
+                    </Button.Content>
+                </Button>
+                
+                
+                <TextBlock x:Uid="Admin_Mode" 
                        FontWeight="SemiBold"
                        TextWrapping="Wrap"
                        AutomationProperties.HeadingLevel="Level2"
                        Style="{StaticResource SubtitleTextBlockStyle}"/>
 
-            <TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsText}"
+                <TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsText}"
                        TextWrapping="Wrap"
                        Margin="{StaticResource SmallTopMargin}"/>
 
-            <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
+                <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
                     Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource AccentButtonStyle}"
                     Command = "{Binding RestartElevatedButtonEventHandler}"
                     IsEnabled="{Binding Mode=TwoWay, Path=IsAdminButtonEnabled}"
                     />
 
-            <TextBlock x:Uid="General_RunAsAdminRequired"
+                <TextBlock x:Uid="General_RunAsAdminRequired"
                        Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
                        TextWrapping="Wrap"
                        Visibility="{Binding Mode=TwoWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"
                        Margin="0,24,0,-8" />
 
-            <ToggleSwitch Margin="{StaticResource SmallTopMargin}"
+                <ToggleSwitch Margin="{StaticResource SmallTopMargin}"
                           x:Uid="GeneralSettings_AlwaysRunAsAdminText"
                           IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}"
                           IsOn="{Binding Mode=TwoWay, Path=RunElevated}"/>
 
-            <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp">
-                <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" TextWrapping="Wrap" />
-            </HyperlinkButton>
+                <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp">
+                    <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" TextWrapping="Wrap" />
+                </HyperlinkButton>
 
 
-            <TextBlock x:Uid="ShortcutGuide_Appearance_Behavior"
+                <TextBlock x:Uid="ShortcutGuide_Appearance_Behavior"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <!-- Replaced the Radiobuttons parent control with a StackPanel to mitigate the Tab and Arrow key related keyboard navigation issues due to XAML Islands
+                <!-- Replaced the Radiobuttons parent control with a StackPanel to mitigate the Tab and Arrow key related keyboard navigation issues due to XAML Islands
             Tracking issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
-            <TextBlock x:Name="RadioButtons_Name_Theme" 
+                <TextBlock x:Name="RadioButtons_Name_Theme" 
                        x:Uid="ColorModeHeader"
                        Margin="{StaticResource SmallTopMargin}"/>
-            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
-                <RadioButton x:Uid="Radio_Theme_Dark"
+                <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
+                    <RadioButton x:Uid="Radio_Theme_Dark"
                              IsChecked="{ Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}"/>
 
-                <RadioButton x:Uid="Radio_Theme_Light" 
+                    <RadioButton x:Uid="Radio_Theme_Light" 
                              IsChecked="{ Binding Mode=TwoWay, Path=IsLightThemeRadioButtonChecked}"/>
 
-                <RadioButton x:Uid="Radio_Theme_Default"
+                    <RadioButton x:Uid="Radio_Theme_Default"
                              IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/>
-                <HyperlinkButton Click="OpenColorsSettings_Click">
-                    <TextBlock x:Uid="Windows_Color_Settings" />
-                </HyperlinkButton>
-            </StackPanel>
+                    <HyperlinkButton Click="OpenColorsSettings_Click">
+                        <TextBlock x:Uid="Windows_Color_Settings" />
+                    </HyperlinkButton>
+                </StackPanel>
 
-            <ToggleSwitch x:Uid="GeneralPage_ToggleSwitch_RunAtStartUp"  
+                <ToggleSwitch x:Uid="GeneralPage_ToggleSwitch_RunAtStartUp"  
                           Margin="{StaticResource SmallTopMargin}" 
                           IsOn="{Binding Mode=TwoWay, Path=Startup}"/>
 
 
-            <TextBlock x:Uid="General_Updates"
+                <TextBlock x:Uid="General_Updates"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateUpToDateToVisibilityConverter}}">
-                <StackPanel Orientation="Horizontal"
+                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateUpToDateToVisibilityConverter}}">
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_Version_UpToDate" 
+                        <TextBlock x:Name="General_Version_UpToDate" 
                                x:Uid="General_Version" 
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    <TextBlock Text="{Binding PowerToysVersion }"
+                        <TextBlock Text="{Binding PowerToysVersion }"
                                Margin="4,0,0,0"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                </StackPanel>
+                    </StackPanel>
 
-                <StackPanel Orientation="Horizontal"
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_VersionLastChecked}"
                             Visibility="{Binding AutoUpdatesEnabled, Converter={StaticResource VisibleIfTrueConverter}}">
-                    
-                    <TextBlock x:Name="General_VersionLastChecked"
+
+                        <TextBlock x:Name="General_VersionLastChecked"
                                x:Uid="General_VersionLastChecked"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
 
-                    <TextBlock Text="{Binding UpdateCheckedDate, Mode=OneWay}"
+                        <TextBlock Text="{Binding UpdateCheckedDate, Mode=OneWay}"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"
                                Margin="6,0" />
-                </StackPanel>
+                    </StackPanel>
 
-                <TextBlock x:Name="General_CheckingForUpdates"
+                    <TextBlock x:Name="General_CheckingForUpdates"
                            x:Uid="General_CheckingForUpdates"
                            Margin="{StaticResource SmallTopMargin}"
                            Visibility="{Binding IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"/>
 
-                <TextBlock x:Name="General_UpToDate"
+                    <TextBlock x:Name="General_UpToDate"
                            x:Uid="General_UpToDate"
                            Margin="{StaticResource SmallTopMargin}"
                            Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"
                            Visibility="{Binding IsNewVersionCheckedAndUpToDate, Converter={StaticResource VisibleIfTrueConverter}}"/>
 
-                <Button x:Uid="GeneralPage_CheckForUpdates"
-                        Style="{StaticResource AccentButtonStyle}"
-                        Foreground="White"
+                    <Button x:Uid="GeneralPage_CheckForUpdates"
                         Margin="{StaticResource SmallTopMargin}"
                         Command="{Binding CheckForUpdatesEventHandler}"
                         IsEnabled="{Binding IsDownloadAllowed}"
                         />
-            </StackPanel>
-
-            <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
-                <StackPanel Orientation="Horizontal"
-                            Margin="{StaticResource SmallTopMargin}"
-                            AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_Version_ReadyToDownload" 
-                               x:Uid="General_Version" 
-                               Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    <TextBlock Text="{Binding PowerToysVersion }"
-                               Margin="4,0,0,0"
-                               Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
                 </StackPanel>
 
-                <StackPanel Orientation="Horizontal"
+                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_NewVersionAvailable"
+                        <TextBlock x:Name="General_Version_ReadyToDownload" 
+                               x:Uid="General_Version" 
+                               Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
+                        <TextBlock Text="{Binding PowerToysVersion }"
+                               Margin="4,0,0,0"
+                               Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal"
+                            Margin="{StaticResource SmallTopMargin}"
+                            AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
+                        <TextBlock x:Name="General_NewVersionAvailable"
                                x:Uid="General_NewVersionAvailable"
                                FontWeight="SemiBold"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    
-                    <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                        <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
-                    </HyperlinkButton>
-                    
-                    <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
+
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
+                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
                                      Margin="4,-6,0,0" 
                                      IsEnabled="{Binding AutoUpdatesEnabled}">
-                        <TextBlock x:Name="General_ReadMore_ReadyToDownload" x:Uid="General_ReadMore" />
-                    </HyperlinkButton>
-                </StackPanel>
+                            <TextBlock x:Name="General_ReadMore_ReadyToDownload" x:Uid="General_ReadMore" />
+                        </HyperlinkButton>
+                    </StackPanel>
 
-                <TextBlock x:Name="General_Downloading"
+                    <TextBlock x:Name="General_Downloading"
                            x:Uid="General_Downloading"
                            Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
                            Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
 
-                <Button x:Uid="General_DownloadAndInstall"
+                    <Button x:Uid="General_DownloadAndInstall"
                         Margin="{StaticResource SmallTopMargin}"
-                        Style="{StaticResource AccentButtonStyle}"
-                        Foreground="White"
                         Command="{Binding UpdateNowButtonEventHandler}"
                         IsEnabled="{Binding IsDownloadAllowed}"/>
-            </StackPanel>
+                </StackPanel>
 
-            <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToInstallToVisibilityConverter}}">
-                <StackPanel Orientation="Horizontal"
+                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToInstallToVisibilityConverter}}">
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_Version_ReadyToInstall" 
+                        <TextBlock x:Name="General_Version_ReadyToInstall" 
                                x:Uid="General_Version" 
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    <TextBlock Text="{Binding PowerToysVersion }"
+                        <TextBlock Text="{Binding PowerToysVersion }"
                                Margin="4,0,0,0"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                </StackPanel>
-                
-                <StackPanel Orientation="Horizontal"
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_NewVersionReadyToInstall"
+                        <TextBlock x:Name="General_NewVersionReadyToInstall"
                                x:Uid="General_NewVersionReadyToInstall"
                                Style="{StaticResource SemiBoldBody}"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                        <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
-                    </HyperlinkButton>
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
+                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
+                        </HyperlinkButton>
 
-                    <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
                                      Margin="4,-6,0,0" 
                                      IsEnabled="{Binding AutoUpdatesEnabled}">
-                        <TextBlock x:Name="General_ReadMore_ReadyToInstall" x:Uid="General_ReadMore" />
-                    </HyperlinkButton>
-                </StackPanel>
+                            <TextBlock x:Name="General_ReadMore_ReadyToInstall" x:Uid="General_ReadMore" />
+                        </HyperlinkButton>
+                    </StackPanel>
 
-                <Button x:Uid="General_InstallNow"
+                    <Button x:Uid="General_InstallNow"
                         Margin="{StaticResource SmallTopMargin}"
-                        Style="{StaticResource AccentButtonStyle}"
-                        Foreground="White"
                         Command="{Binding UpdateNowButtonEventHandler}"
                         IsEnabled="{Binding AutoUpdatesEnabled}"/>
-            </StackPanel>
+                </StackPanel>
 
-            <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateCannotDownloadToVisibilityConverter}}">
-                <StackPanel Orientation="Horizontal"
+                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateCannotDownloadToVisibilityConverter}}">
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_Version_Error" 
+                        <TextBlock x:Name="General_Version_Error" 
                                x:Uid="General_Version" 
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                    <TextBlock Text="{Binding PowerToysVersion }"
+                        <TextBlock Text="{Binding PowerToysVersion }"
                                Margin="4,0,0,0"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                </StackPanel>
+                    </StackPanel>
 
-                <StackPanel Orientation="Horizontal"
+                    <StackPanel Orientation="Horizontal"
                             Margin="{StaticResource SmallTopMargin}"
                             AutomationProperties.LabeledBy="{Binding ElementName=General_Version}">
-                    <TextBlock x:Name="General_FailedToDownloadTheNewVersion" 
+                        <TextBlock x:Name="General_FailedToDownloadTheNewVersion" 
                                x:Uid="General_FailedToDownloadTheNewVersion"
                                Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"/>
-                    <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                        <TextBlock Text="{Binding PowerToysNewAvailableVersion }" />
-                    </HyperlinkButton>
-                </StackPanel>
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
+                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" />
+                        </HyperlinkButton>
+                    </StackPanel>
 
-                <TextBlock x:Name="General_Downloading_TryAgain"
+                    <TextBlock x:Name="General_Downloading_TryAgain"
                            x:Uid="General_Downloading"
                            Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
                            Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                
-                <Button x:Uid="General_TryAgainToDownloadAndInstall"
+
+                    <Button x:Uid="General_TryAgainToDownloadAndInstall"
                         Margin="{StaticResource SmallTopMargin}"
-                        Style="{StaticResource AccentButtonStyle}"
-                        Foreground="White"
                         Command="{Binding UpdateNowButtonEventHandler}"
                         IsEnabled="{Binding IsDownloadAllowed}"/>
-            </StackPanel>
+                </StackPanel>
 
-            <ToggleSwitch x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates" 
+                <ToggleSwitch x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates" 
                           Margin="{StaticResource MediumTopMargin}"
                           Visibility="{Binding Mode=TwoWay, Path=IsAdmin, Converter={StaticResource VisibleIfTrueConverter}}"
                           IsOn="{Binding Mode=TwoWay, Path=AutoDownloadUpdates}"
                           IsEnabled="{Binding AutoUpdatesEnabled}" />
-        </StackPanel>
-
-        <RelativePanel x:Name="SidePanel" 
-                    HorizontalAlignment="Left"
-                    Width="{StaticResource SidePanelWidth}"
-                    Grid.Column="1">
-            <StackPanel x:Name="DescriptionPanel">
-                <TextBlock x:Uid="GeneralPage_AboutPowerToysHeader" 
-                           x:Name="AboutTitle" 
-                           Grid.ColumnSpan="2"
-                           Style="{StaticResource SettingsGroupTitleStyle}"
-                           Margin="{StaticResource XSmallBottomMargin}"/>
-                <TextBlock x:Uid="About_PowerToys" TextWrapping="Wrap" />
-                <TextBlock x:Uid="MadeWithOssLove" TextWrapping="Wrap" Margin="0, 10, 0, 0" />
             </StackPanel>
-
-            <Border x:Name="AboutImage"
-                    CornerRadius="4"
-                    Grid.Row="2"
-                    MaxWidth="240"
-                    HorizontalAlignment="Left"
-                    Margin="{StaticResource SmallTopBottomMargin}"
-                    RelativePanel.Below="DescriptionPanel">
-                <HyperlinkButton x:Uid="GeneralPage_ImageHyperlinkToDocs">
-                    <Image x:Uid="PowerToys_Icon" Source="ms-appx:///Assets/Modules/PT.png"/>
-                </HyperlinkButton>
-            </Border>
-            <StackPanel x:Name="LinksPanel"
-                        Margin="0,1,0,0"
-                        RelativePanel.Below="AboutImage"
-                        Orientation="Vertical" >
-
+        </controls:SettingsPageControl.ModuleContent>
+        <!-- 
                 <HyperlinkButton Click="OobeButton_Click">
                     <TextBlock x:Uid="Oobe_Button"/>
-                </HyperlinkButton>
-                
-                <HyperlinkButton x:Uid="GeneralPage_ImageHyperlinkToDocs">
-                    <TextBlock x:Uid="General_Repository"/>
-                </HyperlinkButton>
+                </HyperlinkButton> -->
+        <!-- Side panel -->
 
-                <HyperlinkButton NavigateUri="https://aka.ms/powerToysReportBug">
-                    <TextBlock x:Uid="GeneralPage_ReportAbug"/>
-                </HyperlinkButton>
-
-                <HyperlinkButton NavigateUri="https://aka.ms/powerToysRequestFeature">
-                    <TextBlock x:Uid="GeneralPage_RequestAFeature_URL"/>
-                </HyperlinkButton>
-
-                <HyperlinkButton NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839">
-                    <TextBlock x:Uid="GeneralPage_PrivacyStatement_URL"/>
-                </HyperlinkButton>
-
-                <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md">
-                    <TextBlock x:Uid="OpenSource_Notice"/>
-                </HyperlinkButton>
-            </StackPanel>
-        </RelativePanel>
-    </Grid>
+        <controls:SettingsPageControl.ModuleLinks>
+            <controls:SidePanelLink x:Uid="General_Repository" Link="https://aka.ms/powertoys"/>
+            <controls:SidePanelLink x:Uid="GeneralPage_ReportAbug" Link="https://aka.ms/powerToysReportBug"/>
+            <controls:SidePanelLink x:Uid="GeneralPage_RequestAFeature_URL" Link="https://aka.ms/powerToysRequestFeature"/>
+            <controls:SidePanelLink x:Uid="GeneralPage_PrivacyStatement_URL" Link="http://go.microsoft.com/fwlink/?LinkId=521839"/>
+            <controls:SidePanelLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md"/>
+        </controls:SettingsPageControl.ModuleLinks>
+    </controls:SettingsPageControl>
 </Page>