From a84be2ba60263e69d9ec0620e4701ff80b82005c Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 27 Mar 2020 16:58:53 +0100
Subject: [PATCH] New settings pages (XAML) and improvements to ShellPage.
 Added more styles for typical margins and textblocks (#1735)

---
 .../Microsoft.PowerToys.Settings.UI.csproj    |  24 ++++
 .../Strings/en-us/Resources.resw              |  24 ++--
 .../Styles/TextBlock.xaml                     |   5 +
 .../Styles/_Thickness.xaml                    |   5 +-
 .../ViewModels/PowerLauncherViewModel.cs      |  13 +++
 .../ViewModels/PowerRenameViewModel.cs        |  13 +++
 .../ViewModels/ShortcutGuideViewModel.cs      |  12 ++
 .../Views/GeneralPage.xaml                    |  15 +--
 .../Views/GeneralPage.xaml.cs                 |   6 +-
 .../Views/PowerLauncherPage.xaml              |  91 +++++++++++++++
 .../Views/PowerLauncherPage.xaml.cs           |  28 +++++
 .../Views/PowerRenamePage.xaml                |  51 +++++++++
 .../Views/PowerRenamePage.xaml.cs             |  28 +++++
 .../Views/ShellPage.xaml                      | 107 +++++++++++++++---
 .../Views/ShortcutGuidePage.xaml              |  45 ++++++++
 .../Views/ShortcutGuidePage.xaml.cs           |  28 +++++
 .../app/Window Walker/Window Walker.csproj    |   2 +-
 17 files changed, 456 insertions(+), 41 deletions(-)
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerRenameViewModel.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ShortcutGuideViewModel.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
 create mode 100644 src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index dfecc2f6ef..16da96b764 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -134,13 +134,25 @@
     <Compile Include="Services\ActivationService.cs" />
     <Compile Include="Services\NavigationService.cs" />
     <Compile Include="ViewModels\GeneralViewModel.cs" />
+    <Compile Include="ViewModels\PowerRenameViewModel.cs" />
+    <Compile Include="ViewModels\PowerLauncherViewModel.cs" />
     <Compile Include="ViewModels\ShellViewModel.cs" />
+    <Compile Include="ViewModels\ShortcutGuideViewModel.cs" />
     <Compile Include="Views\GeneralPage.xaml.cs">
       <DependentUpon>GeneralPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\PowerLauncherPage.xaml.cs">
+      <DependentUpon>PowerLauncherPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\PowerRenamePage.xaml.cs">
+      <DependentUpon>PowerRenamePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ShellPage.xaml.cs">
       <DependentUpon>ShellPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ShortcutGuidePage.xaml.cs">
+      <DependentUpon>ShortcutGuidePage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -207,10 +219,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\PowerLauncherPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PowerRenamePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ShellPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\ShortcutGuidePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj">
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 229eadb097..da66b76da9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -129,20 +129,20 @@
     <value>Main</value>
     <comment>Navigation view item name for Main</comment>
   </data>
-  <data name="Shell_Test1.Content" xml:space="preserve">
-    <value>Test1</value>
-    <comment>Navigation view item name for Test1</comment>
-  </data>
-  <data name="Shell_Test2.Content" xml:space="preserve">
-    <value>Test2</value>
-    <comment>Navigation view item name for Test2</comment>
-  </data>
-  <data name="Shell_Test3.Content" xml:space="preserve">
-    <value>Test3</value>
-    <comment>Navigation view item name for Test3</comment>
-  </data>
   <data name="Shell_General.Content" xml:space="preserve">
     <value>General</value>
     <comment>Navigation view item name for General</comment>
   </data>
+  <data name="Shell_PowerLauncher.Content" xml:space="preserve">
+    <value>PowerLauncher</value>
+    <comment>Navigation view item name for PowerLauncher</comment>
+  </data>
+  <data name="Shell_PowerRename.Content" xml:space="preserve">
+    <value>PowerRename</value>
+    <comment>Navigation view item name for PowerRename</comment>
+  </data>
+  <data name="Shell_ShortcutGuide.Content" xml:space="preserve">
+    <value>Shortcut Guide</value>
+    <comment>Navigation view item name for Shortcut Guide</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
index 60e02e0f58..64d9e2d665 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
@@ -18,4 +18,9 @@
         <Setter Property="TextWrapping" Value="Wrap" />
     </Style>
 
+
+    <Style x:Key="SettingsGroupTitleStyle" TargetType="TextBlock" BasedOn="{StaticResource SubtitleTextBlockStyle}">
+        <Setter Property="Margin" Value="0,34,0,8" />
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
index 2683ce8952..0a31c986fd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
@@ -9,6 +9,7 @@
     <Thickness x:Key="MediumRightMargin">0,0,24,0</Thickness>
     <Thickness x:Key="MediumTopBottomMargin">0,24,0,24</Thickness>
     <Thickness x:Key="MediumLeftTopRightBottomMargin">24,24,24,24</Thickness>
+    <Thickness x:Key="MediumLeftRightBottomMargin">24,0,24,24</Thickness>
     <Thickness x:Key="MediumBottomMargin">0,0,0,24</Thickness>
 
     <!--Small size margins-->
@@ -17,14 +18,16 @@
     <Thickness x:Key="SmallTopBottomMargin">0, 12, 0, 12</Thickness>
     <Thickness x:Key="SmallLeftRightMargin">12, 0, 12, 0</Thickness>
     <Thickness x:Key="SmallRightMargin">0, 0, 12, 0</Thickness>
+    <Thickness x:Key="SmallLeftRightBottomMargin">12, 0, 12, 12</Thickness>
     <Thickness x:Key="SmallLeftTopRightBottomMargin">12, 12, 12, 12</Thickness>
 
     <!--Extra Small size margins-->
     <Thickness x:Key="XSmallLeftMargin">8, 0, 0, 0</Thickness>
     <Thickness x:Key="XSmallTopMargin">0, 8, 0, 0</Thickness>
+    <Thickness x:Key="XSmallBottomMargin">0, 0, 0, 8</Thickness>
     <Thickness x:Key="XSmallLeftTopRightBottomMargin">8, 8, 8, 8</Thickness>
 
     <!--Extra Extra Small size margins-->
     <Thickness x:Key="XXSmallTopMargin">0, 4, 0, 0</Thickness>
     <Thickness x:Key="XXSmallTopRightBottomMargin">0, 4, 4, 4</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs
new file mode 100644
index 0000000000..557629e4d7
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs
@@ -0,0 +1,13 @@
+using System;
+
+using Microsoft.PowerToys.Settings.UI.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.ViewModels
+{
+    public class PowerLauncherViewModel : Observable
+    {
+        public PowerLauncherViewModel()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerRenameViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerRenameViewModel.cs
new file mode 100644
index 0000000000..fbc924881e
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerRenameViewModel.cs
@@ -0,0 +1,13 @@
+using System;
+
+using Microsoft.PowerToys.Settings.UI.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.ViewModels
+{
+    public class PowerRenameViewModel : Observable
+    {
+        public PowerRenameViewModel()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ShortcutGuideViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ShortcutGuideViewModel.cs
new file mode 100644
index 0000000000..7183da5e11
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ShortcutGuideViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.ViewModels
+{
+    public class ShortcutGuideViewModel : Observable
+    {
+        public ShortcutGuideViewModel()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index 8c61973878..0dd40c279b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -11,22 +11,23 @@
 
     <Grid>
         <ScrollViewer>
-            <StackPanel Orientation="Vertical" Margin="14,0,14,48">
+            <StackPanel Orientation="Vertical">
 
-                <ToggleSwitch Header="Run at startup" x:Name="ToggleSwitch_RunAtStartUp"  Margin="0,14,0,0" Toggled="ToggleSwitch_RunAtStartUp_Toggled" />
+                <ToggleSwitch Header="Run at startup" x:Name="ToggleSwitch_RunAtStartUp"  Margin="{StaticResource SmallTopMargin}" Toggled="ToggleSwitch_RunAtStartUp_Toggled" />
 
-                <muxc:RadioButtons Header="Theme" Margin="0, 28,0,0">
+                <muxc:RadioButtons Header="Theme" Margin="{StaticResource SmallTopMargin}">
                     <RadioButton x:Name="Rodio_Theme_Dark" Content="Dark" Tag="Dark" Checked="Theme_Changed"/>
                     <RadioButton x:Name="Rodio_Theme_Light"  Content="Light" Tag="Light" Checked="Theme_Changed"/>
                     <RadioButton x:Name="Rodio_Theme_Default"  Content="System default" Tag="System" Checked="Theme_Changed"/>
                 </muxc:RadioButtons>
 
                 <!--
+                    <TextBlock Text="Default apps" Style="{StaticResource SettingsGroupTitleStyle}"/>
                 <ToggleSwitch Header="Disable telemetry" IsOn="True" Margin="0,14,0,0" />
                 <TextBlock Text="PowerToys currently respects the Windows data &amp; feedback setting" Opacity="0.8" Margin="0,0,0,0" />
                     -->
 
-                <Button Background="{ThemeResource SystemAccentColor}" Content="Restart as admin" Margin="0,10,0,0" Foreground="White" Click="Restart_Elevated" />
+                <Button Background="{ThemeResource SystemAccentColor}" Content="Restart as admin" Margin="{StaticResource SmallTopMargin}" Foreground="White" Click="Restart_Elevated" />
 
                 <!--
                 <TextBlock Text="Default apps" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/>
@@ -38,12 +39,12 @@
                 </ComboBox>
                -->
 
-                <TextBlock Text="About PowerToys" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/>
-                <TextBlock FontWeight="Bold" Text="Version 0.15.1.0" Margin="0,14,0,0" />
+                <TextBlock Text="About PowerToys" Style="{StaticResource SettingsGroupTitleStyle}"/>
+                <TextBlock Text="Version 0.15.1.0" FontWeight="Bold" Margin="{StaticResource SmallTopMargin}" />
                 <!--<Button Background="{ThemeResource SystemAccentColor}" Content="Check for updates" Margin="0,10,0,0" Foreground="White" />
                  TO DO: The styling of this button should be improved so the hover/pressed states are representing the SystemAccentColor -->
 
-                <HyperlinkButton Content="Report a bug" Margin="0,14,0,0" NavigateUri="https://github.com/microsoft/PowerToys/issues" />
+                <HyperlinkButton Content="Report a bug" NavigateUri="https://github.com/microsoft/PowerToys/issues" />
                 <HyperlinkButton Content="Request a feature"  NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
                 <HyperlinkButton Content="Privacy statement" NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839" />
             </StackPanel>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
index 30558597e6..e97f8787bf 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
@@ -35,14 +35,14 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         /// <inheritdoc/>
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            GeneralSettings settings = SettingsUtils.GetSettings<GeneralSettings>(string.Empty);
+            //GeneralSettings settings = SettingsUtils.GetSettings<GeneralSettings>(string.Empty);
             base.OnNavigatedTo(e);
             
             // load and apply theme settings
-            this.ReLoadTheme(settings.theme);
+          //  this.ReLoadTheme(settings.theme);
 
             // load run on start up ui settings value and update the ui state.
-            this.ToggleSwitch_RunAtStartUp.IsOn = settings.startup;
+            //this.ToggleSwitch_RunAtStartUp.IsOn = settings.startup;
         }
 
         /// <summary>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
new file mode 100644
index 0000000000..6383fca549
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -0,0 +1,91 @@
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
+    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:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+
+        <StackPanel Orientation="Vertical">
+            <TextBlock Text="A quick launcher that has additional capabilities without sacrificing performance."
+                       TextWrapping="Wrap"/>
+
+            <ToggleSwitch Header="Enable PowerLauncher"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}" />
+
+            <TextBlock Text="Search &amp; results"
+                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+            <ComboBox Header="Search result preference"
+                          SelectedIndex="0"
+                              MinWidth="320"
+                          Margin="{StaticResource SmallTopMargin}">
+                <ComboBoxItem>Most commonly used</ComboBoxItem>
+                <ComboBoxItem>Most recently used</ComboBoxItem>
+                <ComboBoxItem>Alphabetical order</ComboBoxItem>
+                <ComboBoxItem>Running processes/opened applications</ComboBoxItem>
+            </ComboBox>
+
+            <ComboBox Header="Search type preference"
+                          SelectedIndex="0"
+                          MinWidth="320"
+                          Margin="{StaticResource SmallTopMargin}">
+                <ComboBoxItem>Application name</ComboBoxItem>
+                <ComboBoxItem>A string that is contained in the application</ComboBoxItem>
+                <ComboBoxItem>Executable name</ComboBoxItem>
+            </ComboBox>
+
+            <muxc:NumberBox Header="Maximum numbers of results"
+                            Value="4"
+                            Width="320"
+                            SpinButtonPlacementMode="Inline"
+                            HorizontalAlignment="Left"
+                            Margin="{StaticResource SmallTopMargin}" />
+
+
+            <TextBlock Text="Shortcuts"
+                       Width="320"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+            <!-- TO DO: Add logic to only allow specific (or combination of) keys as entries -->
+            <TextBox Header="Open PowerLauncher"
+                     Width="320"
+                     HorizontalAlignment="Left"
+                     Margin="{StaticResource SmallTopMargin}"/>
+
+            <!-- TO DO: Add logic to only allow specific (or combination of) keys as entries -->
+            <TextBox Header="Open file location"
+                     Width="320"
+                     HorizontalAlignment="Left"
+                     Margin="{StaticResource SmallTopMargin}"/>
+
+            <!-- TO DO: Add logic to only allow specific (or combination of) keys as entries -->
+            <TextBox Header="Copy path location"
+                     Width="320"
+                     HorizontalAlignment="Left"
+                     Margin="{StaticResource SmallTopMargin}"/>
+
+            <!-- TO DO: Add logic to only allow specific (or combination of) keys as entries -->
+            <TextBox Header="Open console"
+                     HorizontalAlignment="Left"
+                     Width="320"
+                     Margin="{StaticResource SmallTopMargin}"/>
+
+            <ToggleSwitch Header="Override Win+R key"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}"/>
+
+            <ToggleSwitch Header="Override Win+S key"
+                          IsOn="True" 
+                          Margin="{StaticResource SmallTopMargin}" />
+
+        </StackPanel>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
new file mode 100644
index 0000000000..9fe4e17847
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
@@ -0,0 +1,28 @@
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.PowerToys.Settings.UI.Views
+{
+    public sealed partial class PowerLauncherPage : Page
+    {
+        public PowerLauncherViewModel ViewModel { get; } = new PowerLauncherViewModel();
+
+        public PowerLauncherPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
new file mode 100644
index 0000000000..d3caf91e77
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -0,0 +1,51 @@
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage"
+    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:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+
+        <StackPanel Orientation="Vertical">
+            <TextBlock Text="A Windows Shell Extension for more advanced bulk renaming using search and replace or regular expressions."
+                       TextWrapping="Wrap"/>
+
+            <ToggleSwitch Header="Enable PowerRename"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}" />
+
+            <TextBlock Text="Shell integration"
+                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+            <ToggleSwitch Header="Show on default context menu"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}"/>
+
+            <ToggleSwitch Header="Only show on extended context menu (Shift + Right-click)"
+                          IsOn="True" 
+                          Margin="{StaticResource SmallTopMargin}" />
+
+            <TextBlock Text="Miscellaneous" 
+                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+            <ToggleSwitch Header="Enable autocomplete and autosuggest of recently used inputs for search and replace values"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}"/>
+
+            <ToggleSwitch Header="Restore search, replace and flags values on launch from previous run" 
+                          IsOn="True" 
+                          Margin="{StaticResource SmallTopMargin}" />
+
+            <muxc:NumberBox Header="Maximum numbers of items to show in recently used list"
+                            Value="10"
+                            SpinButtonPlacementMode="Inline"
+                            HorizontalAlignment="Left"
+                            Margin="{StaticResource SmallTopMargin}" />
+        </StackPanel>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
new file mode 100644
index 0000000000..50ae295eb1
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
@@ -0,0 +1,28 @@
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.PowerToys.Settings.UI.Views
+{
+    public sealed partial class PowerRenamePage : Page
+    {
+        public PowerRenameViewModel ViewModel { get; } = new PowerRenameViewModel();
+
+        public PowerRenamePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index 4f754aafe4..5807e2ffa0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -18,10 +18,30 @@
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
 
-    <!-- 
-        TODO: 
-            Style clean up for navview
-    -->
+    <Grid>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="LargeLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1100" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="SidePanel.(Grid.Column)" Value="1" />
+                        <Setter Target="SidePanel.(Grid.Row)" Value="0" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="WideLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="480" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="SidePanel.(Grid.Column)" Value="0" />
+                        <Setter Target="SidePanel.(Grid.Row)" Value="1" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+   
     <winui:NavigationView
         x:Name="navigationView"
         IsBackButtonVisible="Collapsed"
@@ -31,15 +51,17 @@
         IsPaneToggleButtonVisible="False" 
         PaneDisplayMode="Left"
         Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
-        <winui:NavigationView.PaneHeader>
-            <!-- 
+            <!--     <winui:NavigationView.PaneHeader>
+           
                 TODO: 
                     PowerToys needs to be string 
                     Think maybe about svg logo here
                     Margin should be style
-            -->
-            <TextBlock Margin="12, 24, 0, 6" Style="{StaticResource SubheaderTextBlockStyle}" FontWeight="Bold">PowerToys</TextBlock>
-        </winui:NavigationView.PaneHeader>
+   
+            <TextBlock Margin="12, 24, 0, 6" Style="{StaticResource SubheaderTextBlockStyle}" FontWeight="Bold">PowerToys</TextBlock>    
+            
+          
+        </winui:NavigationView.PaneHeader>   -->
         <winui:NavigationView.MenuItems>
             <!--
             TODO WTS: Change the symbols for each item as appropriate for your app
@@ -52,10 +74,27 @@
                     <FontIcon Glyph="&#xE713;"/>
                 </winui:NavigationViewItem.Icon>
             </winui:NavigationViewItem>
-            <!--<winui:NavigationViewItem x:Uid="Shell_Main" Icon="Home" helpers:NavHelper.NavigateTo="views:MainPage" />
-            <winui:NavigationViewItem x:Uid="Shell_Test1" Icon="Play" helpers:NavHelper.NavigateTo="views:Test1Page" />
-            <winui:NavigationViewItem x:Uid="Shell_Test2" Icon="Refresh" helpers:NavHelper.NavigateTo="views:Test2Page" />
-            <winui:NavigationViewItem x:Uid="Shell_Test3" Icon="Save" helpers:NavHelper.NavigateTo="views:Test3Page" />-->
+
+            <!-- TO DO: Update icon -->
+            <winui:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
+                <winui:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE8AC;"/>
+                </winui:NavigationViewItem.Icon>
+            </winui:NavigationViewItem>
+
+            <!-- TO DO: Update icon -->
+            <winui:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
+                <winui:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xEDA7;"/>
+                </winui:NavigationViewItem.Icon>
+            </winui:NavigationViewItem>
+
+            <!-- TO DO: Update icon -->
+            <winui:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
+                <winui:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE8A7;"/>
+                </winui:NavigationViewItem.Icon>
+            </winui:NavigationViewItem>
         </winui:NavigationView.MenuItems>
         <i:Interaction.Behaviors>
             <behaviors:NavigationViewHeaderBehavior
@@ -77,8 +116,42 @@
                 <ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" />
             </ic:EventTriggerBehavior>
         </i:Interaction.Behaviors>
-        <Grid>
-            <Frame x:Name="shellFrame" />
-        </Grid>
+        <ScrollViewer Grid.Column="0">
+            <Grid RowSpacing="32"
+                      Margin="{StaticResource MediumLeftRightBottomMargin}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <Frame x:Name="shellFrame" />
+
+                <StackPanel x:Name="SidePanel"
+                                Orientation="Vertical"
+                                HorizontalAlignment="Left"
+                                Width="240"
+                                Grid.Column="1">
+
+                    <TextBlock Text="About this feature"
+                                   Style="{StaticResource SettingsGroupTitleStyle}"
+                                   Margin="{StaticResource XSmallBottomMargin}"/>
+
+                    <HyperlinkButton Content="Module overview"/>
+                    <HyperlinkButton Content="Give feedback"/>
+
+                    <TextBlock Text="Contributors"
+                           Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+                    <HyperlinkButton Content="Contributor name"/>
+                    <HyperlinkButton Content="Contributor name"/>
+                    <HyperlinkButton Content="Contributor name"/>
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
     </winui:NavigationView>
-</UserControl>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
new file mode 100644
index 0000000000..4a3728edba
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -0,0 +1,45 @@
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage"
+    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:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <StackPanel Orientation="Vertical">
+            <TextBlock Text="Shows a help overlay with Windows shortcuts when the Windows key is pressed."
+                       TextWrapping="Wrap"/>
+
+            <ToggleSwitch Header="Enable Shortcut Guide"
+                          IsOn="True"
+                          Margin="{StaticResource SmallTopMargin}" />
+
+            <TextBlock Text="Appearance &amp; behaviour" 
+                       Style="{StaticResource SettingsGroupTitleStyle}"/>
+
+            <muxc:NumberBox Header="How long to press the Windows key before showing the Shortcut Guide"
+                            Minimum="100"
+                            Value="900"
+                            SpinButtonPlacementMode="Inline"
+                            HorizontalAlignment="Left"
+                            Margin="{StaticResource SmallTopMargin}" />
+
+            <Slider Header="Opacity of the Shortcut Guide's overlay background (%)"
+                    Minimum="0"
+                    Maximum="100"
+                    Value="70"
+                    HorizontalAlignment="Left"
+                    Margin="{StaticResource MediumTopMargin}"/>
+
+            <muxc:RadioButtons Header="Theme" Margin="{StaticResource SmallTopMargin}">
+                <RadioButton Content="Dark"/>
+                <RadioButton Content="Light"/>
+                <RadioButton Content="System default" IsChecked="True"/>
+            </muxc:RadioButtons>
+        </StackPanel>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs
new file mode 100644
index 0000000000..a27364a374
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs
@@ -0,0 +1,28 @@
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.PowerToys.Settings.UI.Views
+{
+    public sealed partial class ShortcutGuidePage : Page
+    {
+        public ShortcutGuideViewModel ViewModel { get; } = new ShortcutGuideViewModel();
+
+        public ShortcutGuidePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/modules/windowwalker/app/Window Walker/Window Walker.csproj b/src/modules/windowwalker/app/Window Walker/Window Walker.csproj
index 3a634784cb..34ed03cbbd 100644
--- a/src/modules/windowwalker/app/Window Walker/Window Walker.csproj	
+++ b/src/modules/windowwalker/app/Window Walker/Window Walker.csproj	
@@ -16,6 +16,7 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -28,7 +29,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>