MicrosoftDocs
diff --git a/‎hub/android/xamarin-android.md
+1-1 b/‎hub/android/xamarin-android.md
+1-1
diff --git a/‎hub/apps/design/controls/pivot.md
+9-10 b/‎hub/apps/design/controls/pivot.md
+9-10
diff --git a/‎hub/apps/design/style/reveal-focus.md
+1-5 b/‎hub/apps/design/style/reveal-focus.md
+1-5
diff --git a/‎hub/apps/desktop/modernize/apply-rounded-corners.md
+14-11 b/‎hub/apps/desktop/modernize/apply-rounded-corners.md
+14-11
diff --git a/‎hub/apps/desktop/modernize/using-the-visual-layer-with-win32.md
+2-2 b/‎hub/apps/desktop/modernize/using-the-visual-layer-with-win32.md
+2-2
diff --git a/‎hub/apps/develop/title-bar.md
+6-11 b/‎hub/apps/develop/title-bar.md
+6-11
@@ -26,7 +26,7 @@ To use this tutorial, you'll need the following:
 > [!NOTE]
 > This guide works with Visual Studio 2022, Visual Studio 2019, and Visual Studio 2017. If you're using Visual Studio 2017, some instructions might be incorrect due to UI differences between versions of Visual Studio.
 
-You will also to have an Android phone or configured emulator in which to run your app. See [Configuring an Android emulator](emulator.md).
+You will also need to have an Android phone or configured emulator in which to run your app. See [Configuring an Android emulator](emulator.md).
 
 ## Create a new Xamarin.Android project
 
 
@@ -2,7 +2,7 @@
 description: The Pivot control enables touch-swiping between a small set of content sections.
 title: Pivot
 template: detail.hbs
-ms.date: 06/24/2021
+ms.date: 04/04/2022
 ms.topic: article
 keywords: windows 10, uwp
 pm-contact: yulikl
@@ -14,11 +14,6 @@ ms.localizationpriority: medium
 
 # Pivot
 
-> [!Important]
-> The **[Pivot](/uwp/api/Windows.UI.Xaml.Controls.Pivot)** control is no longer recommended and could be removed in future releases of the Windows UI Library (WinUI). Note that information and images in this topic might be out of date.
->
-> Please use the **[NavigationView](navigationview.md)** control with the *Top* navigation style (or display mode) instead.
-
 The [Pivot](/uwp/api/Windows.UI.Xaml.Controls.Pivot) control enables touch-swiping between a small set of content sections.
 
 ![Default focus underlines selected header](images/pivot_focus_selectedHeader.png)
@@ -61,13 +56,17 @@ The Pivot control, just like [NavigationView](navigationview.md), underlines the
 
 ## Is this the right control?
 
-To achieve common top navigation and tabs patterns, we recommend using [NavigationView](navigationview.md), which automatically adapts to different screen sizes and allows for greater customization.
+> [!NOTE]
+>The Pivot control is not recommended for [Windows 11 design patterns](../basics/app-silhouette.md). When designing for Windows 11, consider using a [NavigationView](navigationview.md) or [TabView](tab-view.md) control instead of a Pivot control. See the [Use NavigationView instead of Pivot](#use-navigationview-instead-of-pivot) section for an example
+
+To create a tabbed UI, use a [TabView](tab-view.md) control.
 
-However, if your navigation requires touch-swiping, we recommend using Pivot.
+To achieve common top navigation patterns, we recommend using [NavigationView](navigationview.md), which automatically adapts to different screen sizes and allows for greater customization.
 
-The other key differences between the NavigationView and Pivot controls are the default overflow behavior and the navigation API:
+Some key differences between the NavigationView and Pivot are listed here:
 
-- Pivot carousels overflow items, while NavigationView uses a menu dropdown overflow so that users can see all items.
+- Pivot supports touch-swiping to switch between items.
+- Overflow items in a Pivot carousel, while NavigationView uses a menu dropdown overflow so that users can see all items.
 - Pivot handles navigation between content sections, while NavigationView allows for more control over navigation behavior.
 
 ## Use NavigationView instead of Pivot
 
@@ -2,7 +2,7 @@
 description: Reveal Focus is a lighting effect that animates the border of focusable elements when the user moves gamepad or keyboard focus to them.
 title: Reveal Focus
 template: detail.hbs
-ms.date: 09/24/2020
+ms.date: 03/25/2022
 ms.topic: article
 keywords: windows 10, uwp
 pm-contact: chphilip
@@ -16,9 +16,6 @@ ms.localizationpriority: medium
 
 Reveal Focus is a lighting effect for [10-foot experiences](../devices/designing-for-tv.md), such as Xbox One and television screens. It animates the border of focusable elements, such as buttons, when the user moves gamepad or keyboard focus to them. It's turned off by default, but it's simple to enable. 
 
-(For the Reveal Highlight effect, a lighting affect that highlights interactive elements, see the [Reveal Highlight article](./index.md).)
-
-
 > **Important APIs**: [Application.FocusVisualKind property](/uwp/api/windows.ui.xaml.application.FocusVisualKind), [FocusVisualKind enum](/uwp/api/windows.ui.xaml.focusvisualkind), [Control.UseSystemFocusVisuals property](/uwp/api/Windows.UI.Xaml.Controls.Control.UseSystemFocusVisuals)
 
 ## How it works
@@ -166,7 +163,6 @@ Reveal Focus is a Fluent Design System component that adds light to your app. To
 
 ## Related articles
 
-- [Reveal Highlight](./index.md)
 - [Designing for Xbox and TV](../devices/designing-for-tv.md)
 - [Gamepad and remote control interactions](../input/gamepad-and-remote-interactions.md)
 - [Focus visuals sample](https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/XamlFocusVisuals)
 
@@ -32,7 +32,7 @@ If your app's main window doesn't receive automatic rounding, it's because you'v
     - Empty non-client area
     - Other customizations, such as extra non-child windows used for custom shadows
 
-    Changing one of these things will break automatic rounding. Although we did try to round as many apps as possible with our system heuristics, there are some combinations of customizations that we can't predict so we provided a manual opt-in API for those cases. If you address these issues in your app or call the opt-in API, described in the following section, then it's possible for the system to round you. Note, however, that the API is a hint to the system and does not guarantee rounding, depending on the customizations.
+    Changing one of these things will break automatic rounding. Although we did try to round as many apps as possible with our system heuristics, there are some combinations of customizations that we can't predict so we provided a manual opt-in API for those cases. If you address these issues in your app or call the opt-in API, described in the following section, then it's possible for the system to round your app's window. Note, however, that the API is a hint to the system and does not guarantee rounding, depending on the customizations.
 1. Apps that cannot ever be rounded, even if they call the opt-in API.
 
     These apps have no frame or borders, and typically have heavily customized UI. If your app does one of the following, it cannot be rounded:
@@ -59,7 +59,7 @@ A pointer to the appropriate value from this enum is passed to the third paramet
 
 ### For C# apps
 
-DwmSetWindowAttribute is a native C++ API. If your app is based on .NET and uses C#, you'll need to use [P/Invoke](/dotnet/standard/native-interop/pinvoke) to import dwmapi.dll and the DwmSetWindowAttribute function signature. All standard WinForms and WPF apps are rounded automatically like any other app, but if you customize your window frame or use a third party framework, you might need to opt-in to rounded corners if doing so results in losing the default rounding. See the Examples section for further details.
+DwmSetWindowAttribute is a native Win32 API and is not exposed directly to .NET code. You'll need to use your language's implementation of P/Invoke to declare the function (C# code is given in the example below). All standard WinForms and WPF apps are rounded automatically, but if you customize your window frame or use a third party framework, you might need to opt-in to rounded corners. See the Examples section for further details.
 
 ## Examples
 
@@ -70,7 +70,7 @@ The following examples show how you can call [**DwmSetWindowAttribute**](/window
 
 ### Example 1 - Rounding an app's main window in C# - WPF
 
-To call DwmSetWindowAttribute in a C# WPF desktop app, you'll need to import dwmapi.dll and the DwmSetWindowAttribute function signature with [P/Invoke](/dotnet/standard/native-interop/pinvoke). First you'll need to redefine the required enum values from the native dwmapi.h header, then declare the function using C# types equivalent to the original native function. Because the original takes a pointer for the third parameter, make sure to use the *ref* keyword so you can pass the address of a variable when you call the function. You can do this in your MainWindow class in MainWindow.xaml.cs.
+This example shows how to call DwmSetWindowAttribute from C# by using the **[DllImport]** attribute. Note that this definition is specific to rounded corners; the DwmSetWindowAttribute function is designed to take different parameters depending on the flags provided, so this is not a general-purpose signature. The example also includes copies of the relevant enums from the dwmapi.h header file. Because the Win32 API takes a pointer for the third parameter, make sure to use the *ref* keyword so you can pass the address of a variable when you call the function. You can do this in your MainWindow class in MainWindow.xaml.cs.
 
 ```CSharp
 using System.Runtime.InteropServices;
@@ -79,13 +79,15 @@ using System.Windows.Interop;
 public partial class MainWindow : Window
 {
     // The enum flag for DwmSetWindowAttribute's second parameter, which tells the function what attribute to set.
+    // Copied from dwmapi.h
     public enum DWMWINDOWATTRIBUTE
     {
         DWMWA_WINDOW_CORNER_PREFERENCE = 33
     }
 
     // The DWM_WINDOW_CORNER_PREFERENCE enum for DwmSetWindowAttribute's third parameter, which tells the function
     // what value of the enum to set.
+    // Copied from dwmapi.h
     public enum DWM_WINDOW_CORNER_PREFERENCE
     {
         DWMWCP_DEFAULT      = 0,
@@ -95,12 +97,11 @@ public partial class MainWindow : Window
     }
 
     // Import dwmapi.dll and define DwmSetWindowAttribute in C# corresponding to the native function.
-    [DllImport("dwmapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    private static extern long DwmSetWindowAttribute(IntPtr hwnd,
+    [DllImport("dwmapi.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+    internal static extern void DwmSetWindowAttribute(IntPtr hwnd,
                                                      DWMWINDOWATTRIBUTE attribute,
                                                      ref DWM_WINDOW_CORNER_PREFERENCE pvAttribute,
                                                      uint cbAttribute);
-
     // ...
     // Various other definitions
     // ...
@@ -127,7 +128,7 @@ public MainWindow()
 
 ### Example 2 - Rounding an app's main window in C# - WinForms
 
-Like with WPF, for a WinForms app you'll first need to import dwmapi.dll and the DwmSetWindowAttribute function signature with [P/Invoke](/dotnet/standard/native-interop/pinvoke). You can do this in your primary Form class.
+Like with WPF, for a WinForms app you'll first need to import dwmapi.dll and the DwmSetWindowAttribute function signature with P/Invoke. You can do this in your primary Form class.
 
 ```Csharp
 using System;
@@ -136,24 +137,26 @@ using System.Runtime.InteropServices;
 public partial class Form1 : Form
 {
     // The enum flag for DwmSetWindowAttribute's second parameter, which tells the function what attribute to set.
+    // Copied from dwmapi.h
     public enum DWMWINDOWATTRIBUTE
     {
         DWMWA_WINDOW_CORNER_PREFERENCE = 33
-    }            
+    }
 
     // The DWM_WINDOW_CORNER_PREFERENCE enum for DwmSetWindowAttribute's third parameter, which tells the function
     // what value of the enum to set.
+    // Copied from dwmapi.h
     public enum DWM_WINDOW_CORNER_PREFERENCE
     {
         DWMWCP_DEFAULT      = 0,
         DWMWCP_DONOTROUND   = 1,
         DWMWCP_ROUND        = 2,
         DWMWCP_ROUNDSMALL   = 3
-    }               
+    }
 
     // Import dwmapi.dll and define DwmSetWindowAttribute in C# corresponding to the native function.
-    [DllImport("dwmapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    private static extern long DwmSetWindowAttribute(IntPtr hwnd, 
+    [DllImport("dwmapi.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+    internal static extern void DwmSetWindowAttribute(IntPtr hwnd,
                                                      DWMWINDOWATTRIBUTE attribute, 
                                                      ref DWM_WINDOW_CORNER_PREFERENCE pvAttribute, 
                                                      uint cbAttribute);
 
@@ -53,7 +53,7 @@ To create a new Win32 Application project in C++ named _HelloComposition_:
 
 To use Windows Runtime (WinRT) APIs in your Win32 app, we use C++/WinRT. You need to configure your Visual Studio project to add C++/WinRT support.
 
-(For details, see [Get started with C++/WinRT - Modify a Windows Desktop application project to add C++/WinRT support](/windows/uwp/cpp-and-winrt-apis/get-started.md#modify-a-windows-desktop-application-project-to-add-cwinrt-support)).
+(For details, see [Get started with C++/WinRT - Modify a Windows Desktop application project to add C++/WinRT support](/windows/uwp/cpp-and-winrt-apis/get-started#modify-a-windows-desktop-application-project-to-add-cwinrt-support)).
 
 1. From the **Project** menu, open the project properties (_HelloComposition Properties_) and ensure the following settings are set to the specified values:
 
@@ -620,4 +620,4 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 // ...
 // ... code not shown ...
 // ...
-```
+```
@@ -93,7 +93,7 @@ In UWP applications, you can customize the title bar by using members of the App
 > [!NOTE]
 > The [Windows.UI.WindowManagement.AppWindow](/uwp/api/windows.ui.windowmanagement.appwindow) class, used for secondary windows in UWP apps, does not support title bar customization. To customize the title bar of a UWP app that uses secondary windows, use ApplicationView as described in [Show multiple views with ApplicationView](/windows/apps/design/layout/application-view).
 
-If you are considering migrating your UWP app to Windows App SDK, please view our windowing functionality migration guide. See [Windowing functionality migration](/windows-app-sdk/migrate-to-windows-app-sdk/guides/windowing.md) for more information.
+If you are considering migrating your UWP app to Windows App SDK, please view our windowing functionality migration guide. See [Windowing functionality migration](../windows-app-sdk/migrate-to-windows-app-sdk/guides/windowing.md) for more information.
 
 ---
 
@@ -443,8 +443,7 @@ You specify the drag region by calling the [Window.SetTitleBar](/windows/winui/a
 Here's how to set a `Grid` of content as the draggable title bar region. This code goes in the XAML and code-behind for your app's first page.
 
 ```xaml
-<Grid x:Name="AppTitleBar" 
-      Margin="0,0,120,0">
+<Grid x:Name="AppTitleBar">
     <Image Source="Images/WindowIcon.png"
            HorizontalAlignment="Left" 
            Width="16" Height="16" 
@@ -798,7 +797,7 @@ These lines from the previous example show the padding columns in the XAML that
     <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
     <ColumnDefinition/>
     <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
-</Grid.ColumnDefinition
+</Grid.ColumnDefinitions>
 ```
 
 The dimensions and position of the caption control area is communicated by the [AppWindowTitleBar](/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar) class so that you can account for it in the layout of your title bar UI. The width of the reserved region on each side is given by the [LeftInset](/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar.leftinset) or [RightInset](/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar.rightinset) properties, and its height is given by the [Height](/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar.height) property.
@@ -820,11 +819,7 @@ LeftPaddingColumn.Width = new GridLength(CaptionButtonOcclusionWidthLeft);
 
 #### [WinUI 3](#tab/winui3)
 
-The title bar element (specified in the call to `SetTitleBar`) is presented over the caption buttons, so you need to set the side margins of your UIElement to leave space for the caption buttons. (If the title bar element is placed over the caption buttons and has a transparent background, the caption buttons will show through but will not receive any input.) For example, if all caption buttons (minimize, maximize/restore, close) are shown on the right side of the window, your title bar element should have a right margin value of 120 to ensure enough space for the buttons.
-
-```xaml
-<Grid x:Name="AppTitleBar" Margin="0,0,120,0">
-```
+The system reserves the upper-left or upper-right corner of the app window for the system caption buttons (minimize, maximize/restore, close). The system retains control of the caption button area to guarantee that minimum functionality is provided for dragging, minimizing, maximizing, and closing the window. The system draws the Close button in the upper-right for left-to-right languages and the upper-left for right-to-left languages.
 
 #### [UWP/WinUI 2](#tab/winui2)
 
@@ -839,7 +834,7 @@ These lines from the previous example show the padding columns in the XAML that
     <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
     <ColumnDefinition/>
     <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
-</Grid.ColumnDefinition
+</Grid.ColumnDefinitions>
 ```
 
 The dimensions and position of the caption control area is communicated by the [CoreApplicationViewTitleBar](/uwp/api/windows.applicationmodel.core.coreapplicationviewtitlebar) class so that you can account for it in the layout of your title bar UI. The width of the reserved region on each side is given by the [SystemOverlayLeftInset](/uwp/api/windows.applicationmodel.core.coreapplicationviewtitlebar.SystemOverlayLeftInset) or [SystemOverlayRightInset](/uwp/api/windows.applicationmodel.core.coreapplicationviewtitlebar.SystemOverlayRightInset) properties, and its height is given by the [Height](/uwp/api/windows.applicationmodel.core.coreapplicationviewtitlebar.Height) property.
@@ -1439,7 +1434,7 @@ namespace WASDK_ExtendedTitleBar
             <RowDefinition/>
         </Grid.RowDefinitions>
 
-        <Grid x:Name="AppTitleBar" Margin="0,0,120,0">
+        <Grid x:Name="AppTitleBar">
             <Image Source="Images/WindowIcon.png"
                    HorizontalAlignment="Left" 
                    Width="16" Height="16"