diff --git a/components/CameraPreview/samples/CameraPreviewSample.xaml b/components/CameraPreview/samples/CameraPreviewSample.xaml
index 55dc1101..09c3bac8 100644
--- a/components/CameraPreview/samples/CameraPreviewSample.xaml
+++ b/components/CameraPreview/samples/CameraPreviewSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="CameraPreviewExperiment.Samples.CameraPreviewSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,8 @@
                 Spacing="12">
         <Button HorizontalAlignment="Center"
                 Click="CaptureButton_Click"
-                Content="Capture" />
+                Content="Capture"
+                Style="{StaticResource AccentButtonStyle}" />
         <controls:CameraPreview x:Name="CameraPreviewControl"
                                 Height="320"
                                 IsFrameSourceGroupButtonVisible="{x:Bind ShowCamera, Mode=OneWay}" />
diff --git a/components/Extensions/samples/ListViewExtensions/SmoothScrollIntoViewSample.xaml.cs b/components/Extensions/samples/ListViewExtensions/SmoothScrollIntoViewSample.xaml.cs
index e92a1837..7d9be4b3 100644
--- a/components/Extensions/samples/ListViewExtensions/SmoothScrollIntoViewSample.xaml.cs
+++ b/components/Extensions/samples/ListViewExtensions/SmoothScrollIntoViewSample.xaml.cs
@@ -12,7 +12,7 @@
 
 namespace ExtensionsExperiment.Samples.ListViewExtensions;
 
-[ToolkitSample(id: nameof(SmoothScrollIntoViewSample), "SmoothScrollIntoView Extension", description: "A sample for showing how to the SmoothScrollIntoViewWithIndexAsync API.")]
+[ToolkitSample(id: nameof(SmoothScrollIntoViewSample), "SmoothScrollIntoView Extension", description: "A sample for showing how to use the SmoothScrollIntoViewWithIndexAsync API.")]
 public sealed partial class SmoothScrollIntoViewSample : Page
 {
     public ObservableCollection<string> Items { get; set; } = new();
diff --git a/components/Extensions/samples/TextBoxExtensions.md b/components/Extensions/samples/TextBoxExtensions.md
index a74553e7..b3e8ec00 100644
--- a/components/Extensions/samples/TextBoxExtensions.md
+++ b/components/Extensions/samples/TextBoxExtensions.md
@@ -14,6 +14,20 @@ icon: Assets/Extensions.png
 
 The `TextBoxExtensions` type provides additional features for the [`TextBox`](https://learn.microsoft.com/uwp/api/windows.ui.xaml.controls.textbox) control through extension methods and attached properties.
 
+## Text regex
+
+The `Regex` attached property allows text validation using a regular expression or using built in validation types.
+
+The developer adds a regular expression to validate the TextBox Text against the regular expression throw Regex property or from selecting ValidationType property on the TextBox.
+
+The validation has 3 modes (`TextBoxExtensions.ValidationMode`):
+
+1) `Normal` (Default): this mode will set the `IsValid` attached property to `false` or `true` whether the `TextBox` text is a valid or not against the `Regex` property.
+2) `Forced`: this mode sets the `IsValid` property and removes the `TextBox` text if not valid when the `TextBox` loses focus.
+3) `Dynamic`: this mode extends `Normal` and if is the newest input of the `TextBox` is invalid, the character which is invalid will be deleted. Note that the `TextBoxExtensions.ValidationType` values `Email` and `PhoneNumber` don't support this validation mode. If you set the validation mode to `Dynamic`, `Normal` is selected automatically instead.
+
+> [!SAMPLE RegexSample]
+
 ## Text mask
 
 The `Mask` attached property allows a user to more easily enter fixed width text in `TextBox` control where you would like them to enter the data in a certain format, ex: phone number, postal code.
@@ -39,119 +53,14 @@ You can escape variable by using `\` (eg. the mask `+\964` will be presented to
 
 In case you want to add a custom variable character you can use the `CustomMask` property. You can add a character that represents certain regex as `c:[a-c]` and once you use character `c` in the mask the mask will prevent any characters but from `a` to `c` inside the `TextBox`, also you specify multiple variable characters by adding comma `,` after every character and its representation. This feature is helpful if you want to allow certain language characters (eg. French or Arabic only `TextBox`).
 
-### Syntax
-
-```xaml
-<Page ...
-     xmlns:ui="using:CommunityToolkit.WinUI">
-    <StackPanel>
-
-        <!-- Mask = "9a9a-a9a*" (9 means [0-9], a means [a-Z], * allows both)-->
-        <TextBox ui:TextBoxExtensions.Mask="9a9a-a9a*"/>
-
-        <!-- A mask of "+1999-9999" and an empty space as placeholder. That is,
-             characters not yet filled in by the user will just be blank spaces. -->
-        <TextBox
-            ui:TextBoxExtensions.Mask="+1999-9999"
-            ui:TextBoxExtensions.MaskPlaceholder=" "/>
-
-        <!-- Mask = "+964 799 999 9999" (note the escape fore the first 9) -->
-        <TextBox ui:TextBoxExtensions.Mask="+\964 799 999 9999"/>
-
-        <!-- Mask = "99\99\9999" (a backslash can be escaped with another backslash) -->
-        <TextBox ui:TextBoxExtensions.Mask="99\\99\\9999"/>
-
-        <!-- Custom mask with some user-defined special characters. In this case,
-             we define 5 to mean [1-5], and c to mean [a-c]. The mask is "a5c-5c*9" -->
-        <TextBox
-            ui:TextBoxExtensions.CustomMask="5:[1-5],c:[a-c]"
-            ui:TextBoxExtensions.Mask="a5c-5c*9"/>
-    </StackPanel>
-</Page>
-```
-
-### Sample output
-
-A `TextBox` with `Mask` set to `+1999-9999` and `MaskPlaceholder` as space (the placeholder represents the characters the user can change on runtime) will be displayed as follows:
-
-![TextBoxMask animation](../resources/images/Extensions/TextBoxMask.gif)
-
-## Text regex
-
-The `Regex` attached property allows text validation using a regular expression or using built in validation types.
-
-The developer adds a regular expression to validate the TextBox Text against the regular expression throw Regex property or from selecting ValidationType property on the TextBox.
-
-The validation has 3 modes (`TextBoxExtensions.ValidationMode`):
-
-1) `Normal` (Default): this mode will set the `IsValid` attached property to `false` or `true` whether the `TextBox` text is a valid or not against the `Regex` property.
-2) `Forced`: this mode sets the `IsValid` property and removes the `TextBox` text if not valid when the `TextBox` loses focus.
-3) `Dynamic`: this mode extends `Normal` and if is the newest input of the `TextBox` is invalid, the character which is invalid will be deleted. Note that the `TextBoxExtensions.ValidationType` values `Email` and `PhoneNumber` don't support this validation mode. If you set the validation mode to `Dynamic`, `Normal` is selected automatically instead.
-
-### Syntax
-
-```xaml
-<TextBox
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    ui:TextBoxExtensions.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$" />
-
-<TextBox
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    ui:TextBoxExtensions.ValidationMode="Forced"
-    ui:TextBoxExtensions.ValidationType="PhoneNumber"
-    Text="+61616161611" />
-
-<TextBox
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    ui:TextBoxExtensions.ValidationType="Email"   />
-
-<TextBox
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    ui:TextBoxExtensions.ValidationMode="Forced"
-    ui:TextBoxExtensions.ValidationType="Decimal" />
-```
-
-### Sample output
-
-Here is a `TextBox` with `ValidationType="Email"`, with the validation occurring when `TextChanged` is raised:
-
-![TextBoxRegex animation](../resources/images/Extensions/TextBoxRegex.gif)
+> [!SAMPLE TextBoxMaskSample]
 
 ## Surface Dial support
 
 The `SurfaceDialOptions` property adds features from the Surface Dial control to a numeric `TextBox`. This enables you to modify the content of the `TextBox` when rotating the Surface Dial (increasing or decreasing the value) and optionally go to the next focus element by tapping the Surface Dial click button. The various options are set through the `SurfaceDialOptions` type, which is declared in XAML and used to set all the values to use for a given `TextBox` from a single place.
-
-### Syntax
-
-```xaml
-<Page ...
-    xmlns:ui="using:CommunityToolkit.WinUI">
-
-    <TextBox
-        Text="0"
-        Width="106"
-        HorizontalAlignment="Left"
-        VerticalAlignment="Top">
-        <ui:TextBoxExtensions.SurfaceDialOptions>
-            <ui:SurfaceDialOptions
-                EnableHapticFeedback="True"
-                EnableMinMaxValue="True"
-                EnableTapToNextControl="False"
-                StepValue="1"
-                RotationResolutionInDegrees="12"
-                MinValue="0"
-                MaxValue="100"
-                Icon="Ruler"/>
-        </ui:TextBoxExtensions.SurfaceDialOptions>
-    </TextBox>
-</Page>
-```
-
-### Sample output
-
 Here is an example of the visual result when scrolling on a Surface Dial over a `TextBox`:
 
-![SurfaceDialTextbox animation](../resources/images/Extensions/SurfaceDialTextbox.gif)
+> [!SAMPLE SurfaceDialOptionsSample]
 
 ## Examples
 
diff --git a/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml b/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml
new file mode 100644
index 00000000..09694cf3
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml
@@ -0,0 +1,104 @@
+<Page x:Class="ExtensionsExperiment.Samples.TextBoxExtensions.RegexSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:converters="using:CommunityToolkit.Converters"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:ui="using:CommunityToolkit.WinUI"
+      mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="TextBoxRegexStyle"
+               TargetType="TextBox">
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+        <DataTemplate x:Key="HeaderTemplate">
+            <StackPanel>
+                <TextBlock Text="{Binding}"
+                           TextWrapping="WrapWholeWords" />
+            </StackPanel>
+        </DataTemplate>
+    </Page.Resources>
+
+    <Grid>
+        <Grid RowSpacing="32">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <StackPanel>
+                <TextBox Name="PhoneNumberValidator"
+                         ui:TextBoxExtensions.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
+                         Header="Text box with Regex extension for phone number, validation occurs on TextChanged"
+                         HeaderTemplate="{StaticResource HeaderTemplate}"
+                         Style="{StaticResource TextBoxRegexStyle}" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                    <Run Text="Is valid: " />
+                    <Run FontWeight="SemiBold"
+                         Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=PhoneNumberValidator}" />
+                </TextBlock>
+            </StackPanel>
+
+            <StackPanel Grid.Row="1">
+                <TextBox Name="CharactValidator"
+                         ui:TextBoxExtensions.ValidationMode="Dynamic"
+                         ui:TextBoxExtensions.ValidationType="Characters"
+                         Header="Text box with ValidationType=Characters, validation occurs at input with ValidationMode=Dynamic and clear only single character when value is invalid"
+                         HeaderTemplate="{StaticResource HeaderTemplate}"
+                         Style="{StaticResource TextBoxRegexStyle}"
+                         Text="abcdef" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                    <Run Text="Is valid: " />
+                    <Run FontWeight="SemiBold"
+                         Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=CharactValidator}" />
+                </TextBlock>
+            </StackPanel>
+
+            <StackPanel Grid.Row="2">
+                <TextBox Name="EmailValidator"
+                         ui:TextBoxExtensions.ValidationType="Email"
+                         Header="Text box with ValidationType=Email, validation occurs on TextChanged"
+                         HeaderTemplate="{StaticResource HeaderTemplate}"
+                         Style="{StaticResource TextBoxRegexStyle}" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                    <Run Text="Is valid: " />
+                    <Run FontWeight="SemiBold"
+                         Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=EmailValidator}" />
+                </TextBlock>
+            </StackPanel>
+
+            <StackPanel Grid.Row="3">
+                <TextBox Name="DecimalValidatorForce"
+                         ui:TextBoxExtensions.ValidationMode="Forced"
+                         ui:TextBoxExtensions.ValidationType="Decimal"
+                         Header="Text box with ValidationType=Decimal, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force (333,111 or 333.111)"
+                         HeaderTemplate="{StaticResource HeaderTemplate}"
+                         Style="{StaticResource TextBoxRegexStyle}" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                    <Run Text="Is valid: " />
+                    <Run FontWeight="SemiBold"
+                         Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=DecimalValidatorForce}" />
+                </TextBlock>
+            </StackPanel>
+
+            <StackPanel Grid.Row="4">
+                <TextBox Name="NumberValidatorDynamic"
+                         ui:TextBoxExtensions.ValidationMode="Dynamic"
+                         ui:TextBoxExtensions.ValidationType="Number"
+                         Header="Text box with ValidationType=Number, validation occurs at input with ValidationMode=Dynamic and clear only single character when value is invalid"
+                         HeaderTemplate="{StaticResource HeaderTemplate}"
+                         Style="{StaticResource TextBoxRegexStyle}" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                    <Run Text="Is valid: " />
+                    <Run FontWeight="SemiBold"
+                         Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=NumberValidatorDynamic}" />
+                </TextBlock>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml.cs b/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml.cs
new file mode 100644
index 00000000..b0b47d5c
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/RegexSample.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace ExtensionsExperiment.Samples.TextBoxExtensions;
+
+[ToolkitSample(id: nameof(RegexSample), "Regex Extension", description: "A sample for showing how to use the Regex Extension.")]
+public sealed partial class RegexSample : Page
+{
+    public RegexSample()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml b/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml
new file mode 100644
index 00000000..9f31f71a
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml
@@ -0,0 +1,26 @@
+<Page x:Class="ExtensionsExperiment.Samples.TextBoxExtensions.SurfaceDialOptionsSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:ui="using:CommunityToolkit.WinUI"
+      xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      mc:Ignorable="d">
+
+
+    <win:TextBox HorizontalAlignment="Left"
+                 VerticalAlignment="Top"
+                 Header="For this sample, you need a Surface Dial"
+                 Text="0">
+        <ui:TextBoxExtensions.SurfaceDialOptions>
+            <ui:SurfaceDialOptions EnableHapticFeedback="True"
+                                   EnableMinMaxValue="True"
+                                   EnableTapToNextControl="False"
+                                   Icon="Ruler"
+                                   MaxValue="100"
+                                   MinValue="0"
+                                   RotationResolutionInDegrees="12"
+                                   StepValue="1" />
+        </ui:TextBoxExtensions.SurfaceDialOptions>
+    </win:TextBox>
+</Page>
diff --git a/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml.cs b/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml.cs
new file mode 100644
index 00000000..408a6eca
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/SurfaceDialOptionsSample.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace ExtensionsExperiment.Samples.TextBoxExtensions;
+
+[ToolkitSample(id: nameof(SurfaceDialOptionsSample), "SurfaceDialOptions Extension", description: "A sample for showing how to use the SurfaceDialOptions Extension.")]
+public sealed partial class SurfaceDialOptionsSample : Page
+{
+    public SurfaceDialOptionsSample()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml b/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml
new file mode 100644
index 00000000..b80223e1
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml
@@ -0,0 +1,57 @@
+<Page x:Class="ExtensionsExperiment.Samples.TextBoxExtensions.TextBoxMaskSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:ui="using:CommunityToolkit.WinUI"
+      xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      mc:Ignorable="d">
+
+
+    <Page.Resources>
+        <Style x:Key="MaskedTextBoxStyle"
+               TargetType="TextBox">
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+        <DataTemplate x:Key="HeaderTemplate">
+            <StackPanel>
+                <TextBlock Text="{Binding}"
+                           TextWrapping="WrapWholeWords" />
+            </StackPanel>
+        </DataTemplate>
+    </Page.Resources>
+
+    <Grid>
+        <StackPanel Spacing="24">
+            <TextBox ui:TextBoxExtensions.Mask="9a9a-a9a*"
+                     Header="Text box with Mask 9a9a-a9a* (9 allows from 0 to 9, a allow from a to Z and * allows both a and 9)"
+                     HeaderTemplate="{StaticResource HeaderTemplate}"
+                     Style="{StaticResource MaskedTextBoxStyle}"
+                     Text="TextBoxMask" />
+
+            <TextBox ui:TextBoxExtensions.Mask="+1999-9999"
+                     ui:TextBoxExtensions.MaskPlaceholder=" "
+                     Header="Text box with Mask +1999-9999 and placeHolder as space (placeholder represents the characters the user can change on runtime)"
+                     HeaderTemplate="{StaticResource HeaderTemplate}"
+                     Style="{StaticResource MaskedTextBoxStyle}" />
+
+            <TextBox ui:TextBoxExtensions.Mask="+\964 799 999 9999"
+                     Header="Text box with Mask +964 799 999 9999 (Notice how we escape the first 9 with a backslash)"
+                     HeaderTemplate="{StaticResource HeaderTemplate}"
+                     Style="{StaticResource MaskedTextBoxStyle}" />
+
+            <TextBox ui:TextBoxExtensions.Mask="99\\99\\9999"
+                     Header="Text box with Mask 99\99\9999 (You can escape a backslash with another backslash)"
+                     HeaderTemplate="{StaticResource HeaderTemplate}"
+                     Style="{StaticResource MaskedTextBoxStyle}" />
+
+            <TextBox ui:TextBoxExtensions.CustomMask="5:[1-5],c:[a-c]"
+                     ui:TextBoxExtensions.Mask="a5c-5c*9"
+                     Header="Text box with CustomMask in case you want to define your own variable character like a, 9 and *. Mask: a5c-5c*9, 5: [1-5], c: [a-c]"
+                     HeaderTemplate="{StaticResource HeaderTemplate}"
+                     Style="{StaticResource MaskedTextBoxStyle}" />
+
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml.cs b/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml.cs
new file mode 100644
index 00000000..8c5ff793
--- /dev/null
+++ b/components/Extensions/samples/TextBoxExtensions/TextBoxMaskSample.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace ExtensionsExperiment.Samples.TextBoxExtensions;
+
+[ToolkitSample(id: nameof(TextBoxMaskSample), "TextBoxMask Extension", description: "A sample for showing how to use the TextBoxMask Extension.")]
+public sealed partial class TextBoxMaskSample : Page
+{
+    public TextBoxMaskSample()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/components/Helpers/samples/CameraHelperSample.xaml b/components/Helpers/samples/CameraHelperSample.xaml
index 435c5684..52d47005 100644
--- a/components/Helpers/samples/CameraHelperSample.xaml
+++ b/components/Helpers/samples/CameraHelperSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <UserControl x:Class="HelpersExperiment.Samples.CameraHelperSample"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -35,6 +35,7 @@
         <Button x:Name="CaptureButton"
                 HorizontalAlignment="Center"
                 Click="CaptureButton_Click"
-                Content="Capture video frame" />
+                Content="Capture video frame"
+                Style="{StaticResource AccentButtonStyle}" />
     </StackPanel>
 </UserControl>
diff --git a/components/ImageCropper/samples/ImageCropper.md b/components/ImageCropper/samples/ImageCropper.md
index 34276f6f..c7d210e4 100644
--- a/components/ImageCropper/samples/ImageCropper.md
+++ b/components/ImageCropper/samples/ImageCropper.md
@@ -12,8 +12,6 @@ issue-id: 0
 icon: Assets/ImageCropper.png
 ---
 
-# ImageCropper
-
 The `ImageCropper Control` allows user to freely crop an image.
 
 > [!Sample ImageCropperSample]
diff --git a/components/MetadataControl/samples/MetadataControlSample.xaml.cs b/components/MetadataControl/samples/MetadataControlSample.xaml.cs
index 32bb9c5e..7ce72542 100644
--- a/components/MetadataControl/samples/MetadataControlSample.xaml.cs
+++ b/components/MetadataControl/samples/MetadataControlSample.xaml.cs
@@ -26,7 +26,11 @@ public MetadataControlSample()
     {
         this.InitializeComponent();
         _random = new Random();
-        _units = new ObservableCollection<MetadataItem>();
+        _units = new ObservableCollection<MetadataItem>
+        {
+            new MetadataItem { Label = GetRandomLabel() },
+            new MetadataItem { Label = GetRandomLabel() }
+        };
         _command = new DelegateCommand<object>(OnExecuteCommand);
         metadataControl.Items = _units;
     }
diff --git a/components/Primitives/samples/Assets/StaggeredLayout.png b/components/Primitives/samples/Assets/StaggeredLayout.png
new file mode 100644
index 00000000..6d5a81bb
Binary files /dev/null and b/components/Primitives/samples/Assets/StaggeredLayout.png differ
diff --git a/components/Primitives/samples/Primitives.Samples.csproj b/components/Primitives/samples/Primitives.Samples.csproj
index fcdf49bc..86904b1d 100644
--- a/components/Primitives/samples/Primitives.Samples.csproj
+++ b/components/Primitives/samples/Primitives.Samples.csproj
@@ -22,6 +22,7 @@
     <None Remove="Assets\WestSeattleView.jpg" />
     <None Remove="Assets\WrapLayout.png" />
     <None Remove="Assets\WrapPanel.png" />
+    <None Remove="Assets\StaggeredLayout.png" />
   </ItemGroup>
   
   <ItemGroup>
@@ -40,6 +41,9 @@
     <Content Include="Assets\StaggeredPanel.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\StaggeredLayout.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\SwitchPresenter.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/components/Primitives/samples/StaggeredLayout.md b/components/Primitives/samples/StaggeredLayout.md
new file mode 100644
index 00000000..3e199f37
--- /dev/null
+++ b/components/Primitives/samples/StaggeredLayout.md
@@ -0,0 +1,19 @@
+---
+title: StaggeredLayout
+author: skendrot
+description: The StaggeredLayout displays items in a column approach where an item will be added to whichever column has used the least amount of space.
+keywords: StaggeredPanel, StaggeredLayout, Layout
+dev_langs:
+  - csharp
+category: Layouts
+subcategory: Layout
+discussion-id: 0
+issue-id: 0
+icon: Assets/StaggeredLayout.png
+---
+
+The `StaggeredLayout` allows for layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+
+It is a Layout for `ItemsRepeater` which will provide better virtualization compared to the `StaggeredPanel` below.
+
+> [!SAMPLE StaggeredLayoutSample]
diff --git a/components/Primitives/samples/StaggeredLayoutSample.xaml.cs b/components/Primitives/samples/StaggeredLayoutSample.xaml.cs
index 69450d52..d4eea6c7 100644
--- a/components/Primitives/samples/StaggeredLayoutSample.xaml.cs
+++ b/components/Primitives/samples/StaggeredLayoutSample.xaml.cs
@@ -22,7 +22,7 @@ public StaggeredLayoutSample()
         this.InitializeComponent();
 
         random = new Random(DateTime.Now.Millisecond);
-        for (int i = 0; i < random.Next(1000, 5000); i++)
+        for (int i = 0; i < random.Next(100, 200); i++)
         {
             var item = new ColorItem { Index = i, Width = random.Next(50, 250), Height = random.Next(50, 250), Color = Color.FromArgb(255, (byte)random.Next(0, 255), (byte)random.Next(0, 255), (byte)random.Next(0, 255)) };
             ColorsCollection.Add(item);
diff --git a/components/Primitives/samples/StaggeredPanel.md b/components/Primitives/samples/StaggeredPanel.md
new file mode 100644
index 00000000..d90c51da
--- /dev/null
+++ b/components/Primitives/samples/StaggeredPanel.md
@@ -0,0 +1,17 @@
+---
+title: StaggeredPanel
+author: skendrot
+description: The StaggeredPanel displays items in a column approach where an item will be added to whichever column has used the least amount of space.
+keywords: StaggeredPanel, StaggeredLayout, Layout
+dev_langs:
+  - csharp
+category: Layouts
+subcategory: Panel
+discussion-id: 0
+issue-id: 0
+icon: Assets/StaggeredPanel.png
+---
+
+The `StaggeredPanel` allows for layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+
+> [!SAMPLE StaggeredPanelSample]
diff --git a/components/Primitives/samples/StaggeredPanelSample.xaml b/components/Primitives/samples/StaggeredPanelSample.xaml
new file mode 100644
index 00000000..40eba9cd
--- /dev/null
+++ b/components/Primitives/samples/StaggeredPanelSample.xaml
@@ -0,0 +1,49 @@
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<Page x:Class="PrimitivesExperiment.Samples.StaggeredPanelSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:attributes="using:CommunityToolkit.Tooling.SampleGen.Attributes"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:local="using:PrimitivesExperiment.Samples"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+      x:Name="ThisSamplePage">
+
+    <Page.Resources>
+        <DataTemplate x:Key="StaggeredTemplate">
+            <Grid Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                  BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                  BorderThickness="1"
+                  CornerRadius="{StaticResource ControlCornerRadius}">
+                <Border Width="{Binding Width}"
+                        Height="{Binding Height}"
+                        Margin="4"
+                        CornerRadius="{StaticResource ControlCornerRadius}">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding Color}" />
+                    </Border.Background>
+                    <TextBlock Margin="6,4,4,4"
+                               FontSize="16"
+                               Text="{Binding Index}" />
+                </Border>
+            </Grid>
+
+        </DataTemplate>
+    </Page.Resources>
+
+
+    <Grid>
+        <GridView Name="GridView"
+                  ItemTemplate="{StaticResource StaggeredTemplate}"
+                  ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
+
+            <GridView.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <controls:StaggeredPanel ColumnSpacing="{Binding ColumnSpacing, ElementName=ThisSamplePage, Mode=OneWay}"
+                                             DesiredColumnWidth="{Binding DesiredColumnWidth, ElementName=ThisSamplePage, Mode=OneWay}"
+                                             RowSpacing="{Binding RowSpacing, ElementName=ThisSamplePage, Mode=OneWay}" />
+                </ItemsPanelTemplate>
+            </GridView.ItemsPanel>
+        </GridView>
+    </Grid>
+</Page>
diff --git a/components/Primitives/samples/StaggeredPanelSample.xaml.cs b/components/Primitives/samples/StaggeredPanelSample.xaml.cs
new file mode 100644
index 00000000..fdbcdd47
--- /dev/null
+++ b/components/Primitives/samples/StaggeredPanelSample.xaml.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using CommunityToolkit.WinUI.Controls;
+using Windows.UI;
+
+namespace PrimitivesExperiment.Samples;
+
+[ToolkitSampleNumericOption("DesiredColumnWidth", initial: 250, min: 50, max: 400, step: 1, Title = "DesiredColumnWidth")]
+[ToolkitSampleNumericOption("ColumnSpacing", initial: 5, min: 0, max: 50, step: 1, Title = "ColumnSpacing")]
+[ToolkitSampleNumericOption("RowSpacing", initial: 5, min: 0, max: 50, step: 1, Title = "RowSpacing")]
+
+[ToolkitSample(id: nameof(StaggeredPanelSample), "WrapPanel", description: $"A sample for showing how to create and use a {nameof(StaggeredPanel)}.")]
+public sealed partial class StaggeredPanelSample : Page
+{
+    public ObservableCollection<ColorItem> ColorsCollection = new();
+    public Random random;
+
+    public StaggeredPanelSample()
+    {
+        this.InitializeComponent();
+        random = new Random(DateTime.Now.Millisecond);
+        for (int i = 0; i < random.Next(100, 200); i++)
+        {
+            var item = new ColorItem { Index = i, Width = random.Next(50, 250), Height = random.Next(50, 250), Color = Color.FromArgb(255, (byte)random.Next(0, 255), (byte)random.Next(0, 255), (byte)random.Next(0, 255)) };
+            ColorsCollection.Add(item);
+        }
+    }
+}
diff --git a/components/Primitives/samples/StaggeredSamples.md b/components/Primitives/samples/StaggeredSamples.md
deleted file mode 100644
index a68c99f9..00000000
--- a/components/Primitives/samples/StaggeredSamples.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: StaggeredLayout / StaggeredPanel
-author: skendrot
-description: The StaggeredLayout and StaggeredPanel display items in a column approach where an item will be added to whichever column has used the least amount of space.
-keywords: StaggeredPanel, StaggeredLayout, Layout
-dev_langs:
-  - csharp
-category: Layouts
-subcategory: Panel
-discussion-id: 0
-issue-id: 0
-icon: Assets/StaggeredPanel.png
----
-
-## StaggeredLayout
-
-The `StaggeredLayout` allows for layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
-
-It is a Layout for `ItemsRepeater` which will provide better virtualization compared to the `StaggeredPanel` below.
-
-> [!SAMPLE StaggeredLayoutSample]
-
-## StaggeredPanel
-
-The `StaggeredPanel` allows for layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
-
-```xaml
-<ItemsControl>
-    <ItemsControl.ItemTemplate>
-        <DataTemplate>
-            <Image Source="{Binding Thumbnail}"/>
-        </DataTemplate>
-    </ItemsControl.ItemTemplate>
-    <ItemsControl.ItemsPanel>
-        <ItemsPanelTemplate>
-            <controls:StaggeredPanel/>
-        </ItemsPanelTemplate>
-    </ItemsControl.ItemsPanel>
-</ItemsControl>
-```