diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
index 90ac9bcd85..47326a517a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
@@ -45,12 +45,13 @@
                     <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent"/>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-            
-            
-            
-            
-            
+
+
+
+       
             
         </ResourceDictionary>
+
+
     </Application.Resources>
 </xaml:XamlApplication>
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 64495c1582..0605ec8078 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -186,7 +186,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Hide toolbar when both camera and microphone are unmuted</value>
   </data>
   <data name="VideoConference.ModuleTitle" xml:space="preserve">
-    <value>About Video Conference</value>
+    <value>Video Conference</value>
   </data>
   <data name="VideoConference_Camera.Text" xml:space="preserve">
     <value>Camera</value>
@@ -482,7 +482,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <comment>giving credit to the projects this utility was based on</comment>
   </data>
   <data name="General.ModuleTitle" xml:space="preserve">
-    <value>About PowerToys</value>
+    <value>General</value>
   </data>
   <data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve">
     <value>Check for updates</value>
@@ -508,7 +508,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="GeneralPage_RunAtStartUp.Header" xml:space="preserve">
     <value>Run at startup</value>
   </data>
-	<data name="GeneralPage_RunAtStartUp.Description" xml:space="preserve">
+  <data name="GeneralPage_RunAtStartUp.Description" xml:space="preserve">
     <value>PowerToys will launch automatically</value>
   </data>
   <data name="PowerRename.ModuleDescription" xml:space="preserve">
@@ -584,7 +584,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="ShortcutGuide_OverlayOpacity.Header" xml:space="preserve">
     <value>Opacity of background</value>
   </data>
-	<data name="ShortcutGuide_DisabledApps.Header" xml:space="preserve">
+  <data name="ShortcutGuide_DisabledApps.Header" xml:space="preserve">
     <value>Exclude apps</value>
   </data>
   <data name="ShortcutGuide_DisabledApps.Description" xml:space="preserve">
@@ -740,7 +740,10 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Learn more about administrator mode</value>
   </data>
   <data name="GeneralPage_ToggleSwitch_AutoDownloadUpdates.Header" xml:space="preserve">
-    <value>Download updates automatically (Except on metered connections)</value>
+    <value>Download updates automatically</value>
+  </data>
+	<data name="GeneralPage_ToggleSwitch_AutoDownloadUpdates.Description" xml:space="preserve">
+    <value>Except on metered connections</value>
   </data>
   <data name="GeneralPage_ToggleSwitch_RunningAsAdminNote.Text" xml:space="preserve">
     <value>Currently running as administrator</value>
@@ -755,32 +758,32 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Running as administrator</value>
   </data>
   <data name="FancyZones.ModuleTitle" xml:space="preserve">
-    <value>About FancyZones</value>
+    <value>FancyZones</value>
   </data>
   <data name="FileExplorerPreview.ModuleTitle" xml:space="preserve">
-    <value>About File Explorer</value>
+    <value>File Explorer</value>
   </data>
   <data name="FileExplorerPreview_Image.AutomationProperties.Name" xml:space="preserve">
     <value>File Explorer</value>
     <comment>Use same translation as Windows does for File Explorer</comment>
   </data>
   <data name="ImageResizer.ModuleTitle" xml:space="preserve">
-    <value>About Image Resizer</value>
+    <value>Image Resizer</value>
   </data>
   <data name="KeyboardManager.ModuleTitle" xml:space="preserve">
-    <value>About Keyboard Manager</value>
+    <value>Keyboard Manager</value>
   </data>
   <data name="ColorPicker.ModuleTitle" xml:space="preserve">
-    <value>About Color Picker</value>
+    <value>Color Picker</value>
   </data>
   <data name="PowerLauncher.ModuleTitle" xml:space="preserve">
-    <value>About PowerToys Run</value>
+    <value>PowerToys Run</value>
   </data>
   <data name="PowerToys_Run_Image.AutomationProperties.Name" xml:space="preserve">
     <value>PowerToys Run</value>
   </data>
   <data name="PowerRename.ModuleTitle" xml:space="preserve">
-    <value>About PowerRename</value>
+    <value>PowerRename</value>
     <comment>do not loc the product name</comment>
   </data>
   <data name="PowerRename_Image.AutomationProperties.Name" xml:space="preserve">
@@ -788,7 +791,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <comment>do not loc</comment>
   </data>
   <data name="ShortcutGuide.ModuleTitle" xml:space="preserve">
-    <value>About Shortcut Guide</value>
+    <value>Shortcut Guide</value>
   </data>
   <data name="Shortcut_Guide_Image.AutomationProperties.Name" xml:space="preserve">
     <value>Shortcut Guide</value>
@@ -799,9 +802,6 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="General_Updates.Header" xml:space="preserve">
     <value>Updates</value>
   </data>
-  <data name="General_Version.Text" xml:space="preserve">
-    <value>Installed version:</value>
-  </data>
   <data name="General_VersionLastChecked.Text" xml:space="preserve">
     <value>Last checked: </value>
   </data>
@@ -811,8 +811,8 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="Admin_mode.Header" xml:space="preserve">
     <value>Administrator mode</value>
   </data>
-  <data name="General_RunAsAdminRequired.Message" xml:space="preserve">
-    <value>* You need to run as administrator to use this setting.</value>
+  <data name="General_RunAsAdminRequired.Title" xml:space="preserve">
+    <value>You need to run as administrator to use this setting.</value>
   </data>
   <data name="ShortcutWarningLabel.Text" xml:space="preserve">
     <value>Only shortcuts with the following hotkeys are valid:</value>
@@ -844,7 +844,6 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   </data>
   <data name="General.ModuleDescription" xml:space="preserve">
     <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
-
 Made with 💗 by Microsoft and the PowerToys community.</value>
     <comment>Windows refers to the OS</comment>
   </data>
@@ -958,7 +957,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Use Boost library</value>
     <comment>Boost is a product name, should not be translated</comment>
   </data>
-	<data name="PowerRename_Toggle_UseBoostLib.Description" xml:space="preserve">
+  <data name="PowerRename_Toggle_UseBoostLib.Description" xml:space="preserve">
     <value>Provides extended features but may use different regex syntax</value>
     <comment>Boost is a product name, should not be translated</comment>
   </data>
@@ -1262,7 +1261,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <value>PowerToys Settings</value>
   </data>
   <data name="Awake.ModuleTitle" xml:space="preserve">
-    <value>About Awake</value>
+    <value>Awake</value>
   </data>
   <data name="Awake.ModuleDescription" xml:space="preserve">
     <value>A convenient way to keep your PC awake on-demand.</value>
@@ -1316,7 +1315,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="Oobe_Awake_TipsAndTricks.Text" xml:space="preserve">
     <value>You can always change modes quickly by {right-clicking the Awake icon} in the system tray.</value>
   </data>
-  <data name="General_FailedToDownloadTheNewVersion.Message" xml:space="preserve">
+  <data name="General_FailedToDownloadTheNewVersion.Title" xml:space="preserve">
     <value>An error occurred trying to install this update</value>
   </data>
   <data name="General_InstallNow.Content" xml:space="preserve">
@@ -1325,8 +1324,8 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="General_ReadMore.Text" xml:space="preserve">
     <value>Read more</value>
   </data>
-  <data name="General_NewVersionAvailable.Text" xml:space="preserve">
-    <value>A new version is available: </value>
+  <data name="General_NewVersionAvailable.Title" xml:space="preserve">
+    <value>A new version is available</value>
   </data>
   <data name="General_Downloading.Text" xml:space="preserve">
     <value>Downloading...</value>
@@ -1334,13 +1333,13 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="General_TryAgainToDownloadAndInstall.Content" xml:space="preserve">
     <value>Try again to download and install</value>
   </data>
-  <data name="General_CheckingForUpdates.Message" xml:space="preserve">
+  <data name="General_CheckingForUpdates.Text" xml:space="preserve">
     <value>Checking for updates...</value>
   </data>
-  <data name="General_NewVersionReadyToInstall.Message" xml:space="preserve">
+  <data name="General_NewVersionReadyToInstall.Title" xml:space="preserve">
     <value>A new version is ready to install</value>
   </data>
-  <data name="General_UpToDate.Message" xml:space="preserve">
+  <data name="General_UpToDate.Title" xml:space="preserve">
     <value>PowerToys is up to date</value>
   </data>
   <data name="General_DownloadAndInstall.Content" xml:space="preserve">
@@ -1380,11 +1379,14 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="Delete_Dialog_Description" xml:space="preserve">
     <value>Are you sure you want to delete this item?</value>
   </data>
-	<data name="Yes" xml:space="preserve">
+  <data name="Yes" xml:space="preserve">
     <value>Yes</value>
     <comment>Label of a confirmation button</comment>
-	  </data>
+  </data>
   <data name="Learn_More_Description.AutomationProperties.Name" xml:space="preserve">
     <value>Learn more</value>
   </data>
+  <data name="SeeWhatsNew.Content" xml:space="preserve">
+    <value>See what's new</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index d036a9f009..3ba4310ed9 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -26,11 +26,159 @@
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
 
+                <toolkitcontrols:HeaderedItemsControl x:Uid="General_Updates">
+                    <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;">
+                        <controls:Setting.Description>
+                            <TextBlock>
+                            <Run x:Uid="General_VersionLastChecked" />
+                            <Run Text="{Binding UpdateCheckedDate, Mode=OneWay}"/>
+                            </TextBlock>
+                        </controls:Setting.Description>
+                        <controls:Setting.ActionContent>
+                            <Grid Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateUpToDateToVisibilityConverter}}">
+                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
+                                        Orientation="Horizontal"
+                                        Spacing="18"
+                                        Margin="0,0,0,16">
+                                    <muxc:ProgressRing Height="24"
+                                                   Width="24"/>
+                                    <TextBlock x:Uid="General_CheckingForUpdates"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                </StackPanel>
 
+                                <Button x:Uid="GeneralPage_CheckForUpdates"
+                                        Command="{Binding CheckForUpdatesEventHandler}"
+                                        IsEnabled="{Binding IsDownloadAllowed}"/>
+                            </Grid>
+                        </controls:Setting.ActionContent>
+                    </controls:Setting>
+
+                    <muxc:InfoBar x:Uid="General_UpToDate"
+                              IsOpen="True"
+                              IsClosable="False"
+                              Severity="Success"
+                              Visibility="{Binding IsNewVersionCheckedAndUpToDate, Converter={StaticResource VisibleIfTrueConverter}}"/>
+
+                    <!-- New version avaialble -->
+                    <muxc:InfoBar x:Uid="General_NewVersionAvailable"
+                              IsOpen="True"
+                              IsClosable="False"
+                              Severity="Informational"
+                              Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
+                        <muxc:InfoBar.Content>
+                            <StackPanel Spacing="16">
+                                <StackPanel Orientation="Horizontal"
+                                        Spacing="12">
+                                    <TextBlock Text="{Binding PowerToysNewAvailableVersion}"
+                                           VerticalAlignment="Center" />
+                                    <HyperlinkButton x:Uid="SeeWhatsNew"
+                                                 NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                                 Margin="0,1,0,0"
+                                                 Padding="0" />
+                                </StackPanel>
+                                <!-- In progress panel -->
+                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
+                                        Orientation="Horizontal"
+                                        Spacing="18"
+                                        Margin="0,0,0,16">
+                                    <muxc:ProgressRing Height="24"
+                                                   Width="24"/>
+                                    <TextBlock x:Uid="General_Downloading"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </muxc:InfoBar.Content>
+                        <muxc:InfoBar.ActionButton>
+                            <Button x:Uid="General_DownloadAndInstall"
+                                Command="{Binding UpdateNowButtonEventHandler}"
+                                IsEnabled="{Binding IsDownloadAllowed}"/>
+                        </muxc:InfoBar.ActionButton>
+                    </muxc:InfoBar>
+
+
+                    <!-- Ready to install -->
+                    <muxc:InfoBar x:Uid="General_NewVersionReadyToInstall"
+                              IsOpen="True"
+                              IsClosable="False"
+                              Severity="Success"
+                              Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToInstallToVisibilityConverter}}">
+                        <muxc:InfoBar.Content>
+                            <StackPanel Spacing="16">
+                                <StackPanel Orientation="Horizontal"
+                                        Spacing="12"
+                                        Margin="0,0,0,16">
+                                    <TextBlock Text="{Binding PowerToysNewAvailableVersion}"
+                                           VerticalAlignment="Center" />
+                                    <HyperlinkButton x:Uid="SeeWhatsNew"
+                                                 NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                                 Margin="0,1,0,0"
+                                                 Padding="0" />
+                                </StackPanel>
+                            </StackPanel>
+                        </muxc:InfoBar.Content>
+                        <muxc:InfoBar.ActionButton>
+                            <Button x:Uid="General_InstallNow"
+                                    Command="{Binding UpdateNowButtonEventHandler}"
+                                    IsEnabled="{Binding IsDownloadAllowed}"/>
+                        </muxc:InfoBar.ActionButton>
+                    </muxc:InfoBar>
+
+
+
+                    <!-- Install failed -->
+                    <muxc:InfoBar x:Uid="General_FailedToDownloadTheNewVersion"
+                              IsOpen="True"
+                              IsClosable="False"
+                              Severity="Error"
+                              Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateCannotDownloadToVisibilityConverter}}">
+                        <muxc:InfoBar.Content>
+                            <StackPanel Spacing="16">
+                                <StackPanel Orientation="Horizontal"
+                                        Spacing="12">
+                                    <TextBlock Text="{Binding PowerToysNewAvailableVersion}"
+                                           VerticalAlignment="Center" />
+                                    <HyperlinkButton x:Uid="SeeWhatsNew"
+                                                 NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                                 Margin="0,1,0,0"
+                                                 Padding="0" />
+                                </StackPanel>
+                                <!-- In progress panel -->
+                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
+                                        Orientation="Horizontal"
+                                        Spacing="18"
+                                        Margin="0,0,0,16">
+                                    <muxc:ProgressRing Height="24"
+                                                   Width="24"/>
+                                    <TextBlock x:Uid="General_Downloading"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </muxc:InfoBar.Content>
+                        <muxc:InfoBar.ActionButton>
+                            <Button x:Uid="General_TryAgainToDownloadAndInstall"
+                                    Command="{Binding UpdateNowButtonEventHandler}"
+                                    IsEnabled="{Binding IsDownloadAllowed}"/>
+                        </muxc:InfoBar.ActionButton>
+                    </muxc:InfoBar>
+
+                    <controls:Setting x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates"
+                                      Margin="0,-6,0,0"
+                                      Visibility="{Binding Mode=TwoWay, Path=IsAdmin, Converter={StaticResource VisibleIfTrueConverter}}">
+                        <ToggleSwitch FlowDirection="RightToLeft"
+                          IsOn="{Binding Mode=TwoWay, Path=AutoDownloadUpdates}"
+                          IsEnabled="{Binding AutoUpdatesEnabled}" />
+                    </controls:Setting>
+                </toolkitcontrols:HeaderedItemsControl>
+
+
+
+
+
+                <toolkitcontrols:HeaderedItemsControl x:Uid="Admin_Mode">
                     <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
                         <muxc:Expander.Header>
-                        <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                            <controls:Setting.ActionContent>
+                            <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                                <controls:Setting.ActionContent>
                                     <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
                                             Command = "{Binding RestartElevatedButtonEventHandler}"
                                             IsEnabled="{Binding Mode=TwoWay, Path=IsAdminButtonEnabled}"/>
@@ -38,25 +186,27 @@
                             </controls:Setting>
                         </muxc:Expander.Header>
                         <muxc:Expander.Content>
-                        <StackPanel Orientation="Vertical">
-                            <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
+                            <StackPanel Orientation="Vertical">
+                                <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.Description>
+                                        <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
+                                             x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
+                                    </controls:Setting.Description>
                                     <controls:Setting.ActionContent>
-                                        <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}"/>
+                                        <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}" FlowDirection="RightToLeft"/>
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
-                            <muxc:InfoBar x:Uid="General_RunAsAdminRequired" 
+                                <muxc:InfoBar x:Uid="General_RunAsAdminRequired" 
                                           Severity="Warning"
                                           IsClosable="False"
                                           IsOpen="True"
                                           Visibility="{Binding Mode=TwoWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                            <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
-                                             Margin="56,0,0,0"
-                                             x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
-                        </StackPanel>
+
+                            </StackPanel>
                         </muxc:Expander.Content>
                     </muxc:Expander>
+                </toolkitcontrols:HeaderedItemsControl>
 
-         
 
 
                 <toolkitcontrols:HeaderedItemsControl IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
@@ -80,7 +230,7 @@
                             <StackPanel Orientation="Vertical">
                                 <controls:Setting x:Uid="GeneralPage_RunAtStartUp" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
-                                        <ToggleSwitch  IsOn="{Binding Mode=TwoWay, Path=Startup}"/>
+                                        <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=Startup}" FlowDirection="RightToLeft"/>
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                             </StackPanel>
@@ -88,107 +238,8 @@
                     </muxc:Expander>
 
                 </toolkitcontrols:HeaderedItemsControl>
-
-
-
-                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateUpToDateToVisibilityConverter}}">
-
-                    <TextBlock Margin="{StaticResource SmallTopMargin}" Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}">
-                        <Run x:Uid="General_Version" />
-                        <Run Text="{Binding PowerToysVersion}"/>
-                    </TextBlock>
-
-                    <TextBlock Margin="{StaticResource SmallTopMargin}" Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}">
-                        <Run x:Uid="General_VersionLastChecked" />
-                        <Run Text="{Binding UpdateCheckedDate, Mode=OneWay}"/>
-                    </TextBlock>
-
-                    <TextBlock x:Uid="General_CheckingForUpdates" Margin="{StaticResource SmallTopMargin}" Visibility="{Binding IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"/>
-
-                    <TextBlock x:Uid="General_UpToDate"
-                               Margin="{StaticResource SmallTopMargin}"
-                               Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"
-                               Visibility="{Binding IsNewVersionCheckedAndUpToDate, Converter={StaticResource VisibleIfTrueConverter}}"/>
-
-                    <Button x:Uid="GeneralPage_CheckForUpdates"
-                        Margin="{StaticResource SmallTopMargin}"
-                        Command="{Binding CheckForUpdatesEventHandler}"
-                        IsEnabled="{Binding IsDownloadAllowed}"
-                        />
-                </StackPanel>
-
-
-
-<!-- Read to download and install--><!--
-                <StackPanel Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
-                    <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}" Content="{Binding PowerToysNewAvailableVersion}" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}"/>
-                    </StackPanel>
-
-                    <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"
-                        Margin="{StaticResource SmallTopMargin}"
-                        Command="{Binding UpdateNowButtonEventHandler}"
-                        IsEnabled="{Binding IsDownloadAllowed}"/>
-                </StackPanel>-->
-
-
-                <muxc:InfoBar x:Uid="General_NewVersionReadyToInstall" Severity="Success" IsOpen="True" IsClosable="False" Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
-                    <muxc:InfoBar.ActionButton>
-                        <Button x:Uid="General_InstallNow"
-                        Command="{Binding UpdateNowButtonEventHandler}"
-                        IsEnabled="{Binding AutoUpdatesEnabled}"/>
-                    </muxc:InfoBar.ActionButton>
-                </muxc:InfoBar>
-
-
-
-
-
-                <muxc:InfoBar x:Uid="General_NewVersionReadyToInstall" Severity="Success" IsOpen="True" IsClosable="False" Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToInstallToVisibilityConverter}}">
-                    <muxc:InfoBar.ActionButton>
-                        <Button x:Uid="General_InstallNow"
-                        Command="{Binding UpdateNowButtonEventHandler}"
-                        IsEnabled="{Binding AutoUpdatesEnabled}"/>
-                    </muxc:InfoBar.ActionButton>
-                </muxc:InfoBar>
-
-
-
-
-                <muxc:InfoBar x:Uid="General_FailedToDownloadTheNewVersion" Severity="Warning" IsOpen="True" IsClosable="False" Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateCannotDownloadToVisibilityConverter}}">
-                    <muxc:InfoBar.ActionButton>
-                        <Button x:Uid="General_TryAgainToDownloadAndInstall"
-                                Command="{Binding UpdateNowButtonEventHandler}"
-                                IsEnabled="{Binding IsDownloadAllowed}"/>
-                    </muxc:InfoBar.ActionButton> 
-                </muxc:InfoBar>
-
-                <!--<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}}"/>-->
-
-
-
-
-
-                <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>
+               
         </controls:SettingsPageControl.ModuleContent>
         <!-- 
                 <HyperlinkButton Click="OobeButton_Click">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index 952775d735..dd115e5983 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -80,7 +80,7 @@
                             </StackPanel>
                         </muxc:Expander.Content>
                     </muxc:Expander>
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
                         </muxc:Expander.Header>