diff --git a/doc/images/icons/Light Switch.png b/doc/images/icons/Light Switch.png
new file mode 100644
index 0000000000..8a0778ff05
Binary files /dev/null and b/doc/images/icons/Light Switch.png differ
diff --git a/doc/images/overview/LightSwitch_large.png b/doc/images/overview/LightSwitch_large.png
new file mode 100644
index 0000000000..3a98b7f3e2
Binary files /dev/null and b/doc/images/overview/LightSwitch_large.png differ
diff --git a/doc/images/overview/LightSwitch_small.png b/doc/images/overview/LightSwitch_small.png
new file mode 100644
index 0000000000..c6e94735a9
Binary files /dev/null and b/doc/images/overview/LightSwitch_small.png differ
diff --git a/doc/images/overview/Original/Light Switch.png b/doc/images/overview/Original/Light Switch.png
new file mode 100644
index 0000000000..04e551a85d
Binary files /dev/null and b/doc/images/overview/Original/Light Switch.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png
index fe484fa0e0..d4ce00c74a 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png
new file mode 100644
index 0000000000..3a98b7f3e2
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png
new file mode 100644
index 0000000000..1532531a86
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
index fbf689b9de..fd684168b0 100644
--- a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
+++ b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
@@ -20,6 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
         FileExplorer,
         ImageResizer,
         KBM,
+        LightSwitch,
         MouseUtils,
         MouseWithoutBorders,
         Peek,
diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
index 05fd1c013f..dd70af7533 100644
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -22,6 +22,7 @@
 	<ItemGroup>
 		<None Remove="Assets\Settings\Modules\APDialog.dark.png" />
 		<None Remove="Assets\Settings\Modules\APDialog.light.png" />
+		<None Remove="Assets\Settings\Modules\LightSwitch.png" />
 		<None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
 		<None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
 		<None Remove="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml
new file mode 100644
index 0000000000..b1f4c3f6fc
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeLightSwitch"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    mc:Ignorable="d">
+
+    <controls:OOBEPageControl x:Uid="Oobe_LightSwitch" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/LightSwitch.png">
+        <controls:OOBEPageControl.PageContent>
+            <StackPanel Orientation="Vertical" Spacing="12">
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
+
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_LightSwitch_HowToUse" />
+
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
+
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_LightSwitch_TipsAndTricks" />
+
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_LightSwitch" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_LightSwitch" TextWrapping="Wrap" />
+                    </HyperlinkButton>
+                </StackPanel>
+            </StackPanel>
+        </controls:OOBEPageControl.PageContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs
new file mode 100644
index 0000000000..32978130f9
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
+using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
+using Microsoft.PowerToys.Settings.UI.Views;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
+{
+    public sealed partial class OobeLightSwitch : Page
+    {
+        public OobePowerToysModule ViewModel { get; set; }
+
+        public OobeLightSwitch()
+        {
+            this.InitializeComponent();
+            ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.LightSwitch]);
+        }
+
+        private void SettingsLaunchButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (OobeShellPage.OpenMainWindowCallback != null)
+            {
+                OobeShellPage.OpenMainWindowCallback(typeof(LightSwitchPage));
+            }
+
+            ViewModel.LogOpeningSettingsEvent();
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
index d3f3d7e257..ed03a477e4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
@@ -117,6 +117,10 @@
                     x:Uid="Shell_KeyboardManager"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}"
                     Tag="KBM" />
+                <NavigationViewItem
+                    x:Uid="Shell_LightSwitch"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}"
+                    Tag="LightSwitch" />
                 <NavigationViewItem
                     x:Uid="Shell_MouseUtilities"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
index 53f41db2bf..8b01ab0bd0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
@@ -138,6 +138,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 ModuleName = "KBM",
                 IsNew = false,
             });
+            Modules.Insert((int)PowerToysModules.LightSwitch, new OobePowerToysModule()
+            {
+                ModuleName = "LightSwitch",
+                IsNew = true,
+            });
             Modules.Insert((int)PowerToysModules.MouseUtils, new OobePowerToysModule()
             {
                 ModuleName = "MouseUtils",
@@ -287,6 +292,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                     case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break;
                     case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break;
                     case "KBM": NavigationFrame.Navigate(typeof(OobeKBM)); break;
+                    case "LightSwitch": NavigationFrame.Navigate(typeof(OobeLightSwitch)); break;
                     case "PowerRename": NavigationFrame.Navigate(typeof(OobePowerRename)); break;
                     case "QuickAccent": NavigationFrame.Navigate(typeof(OobePowerAccent)); break;
                     case "FileExplorer": NavigationFrame.Navigate(typeof(OobeFileExplorer)); break;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
index 2f80a0b6f9..b949dba094 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
@@ -23,7 +23,7 @@
     <controls:SettingsPageControl
         x:Uid="LightSwitch"
         IsTabStop="False"
-        ModuleImageSource="ms-appx:///Assets/Settings/Modules/Awake.png">
+        ModuleImageSource="ms-appx:///Assets/Settings/Modules/LightSwitch.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
                 <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
@@ -310,7 +310,7 @@
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_LightSwitch" Link="https://aka.ms/PowerToysOverview_ZoomIt" />
+            <controls:PageLink x:Uid="LearnMore_LightSwitch" Link="https://aka.ms/PowerToysOverview_LightSwitch" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
     <VisualStateManager.VisualStateGroups>
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index eea8574d48..70fc0c4b5b 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -3253,10 +3253,10 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Pin a window</value>
   </data>
   <data name="LightSwitch_ThemeToggle_Shortcut.Header" xml:space="preserve">
-    <value>Toggle theme shortcut</value>
+    <value>Theme toggle shortcut</value>
   </data>
   <data name="LightSwitch_ThemeToggle_Shortcut.Description" xml:space="preserve">
-    <value>Toggle between light and dark mode</value>
+    <value>Switch between light and dark mode</value>
   </data>
   <data name="LightSwitch_ForceDarkMode" xml:space="preserve">
     <value>Toggle theme</value>
@@ -5318,7 +5318,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>Get current location</value>
   </data>
   <data name="LightSwitch_LocationDialog_Description.Text" xml:space="preserve">
-    <value>To calculate the sunrise and sunset, LightSwitch needs a location.</value>
+    <value>To calculate the sunrise and sunset, Light Switch needs a location.</value>
   </data>
   <data name="LightSwitch_SunriseText.Text" xml:space="preserve">
     <value>Sunrise</value>
@@ -5432,4 +5432,20 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="UtilitiesHeader.Title" xml:space="preserve">
     <value>Utilities</value>
   </data>
+  <data name="Oobe_LightSwitch.Title" xml:space="preserve">
+    <value>Light Switch</value>
+    <comment>Product name. Do not localize this string</comment>
+  </data>
+  <data name="Oobe_LightSwitch.Description" xml:space="preserve">
+    <value>Light Switch automatically manages your Windows light and dark mode based on schedules, sunrise/sunset times, or manual control. Keep your system theme synchronized with your preferences and daily rhythm.</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
+  <data name="Oobe_LightSwitch_HowToUse.Text" xml:space="preserve">
+    <value>Open **PowerToys Settings** and enable Light Switch to set up automatic theme switching</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
+  <data name="Oobe_LightSwitch_TipsAndTricks.Text" xml:space="preserve">
+    <value>Use the **keyboard shortcut** to instantly toggle between light and dark modes, or set up **sunrise/sunset automation** for natural theme transitions.</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
 </root>
\ No newline at end of file