From 59a887634b7dd75ca4bf007f3bd6efc3515d6559 Mon Sep 17 00:00:00 2001
From: David Britch <davidbritch@users.noreply.github.com>
Date: Wed, 27 Nov 2024 09:59:43 +0000
Subject: [PATCH] Replace Frame with Border (#542)

* Replace Frame with Border.

* Replace Frame with Border.

* Remove stray file.

* Replace Frame with Border

* Replace Frame with Border

* Fix height.

* Bump xcode.

* Fix build and some minor improvements

* Xcode

---------

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 .github/workflows/build-all.yml               |  10 +-
 .github/workflows/build-pr.yml                |  10 +-
 .../Animations/Resources/Styles/Styles.xaml   |  11 +-
 .../src/PointOfSale/Pages/SettingsPage.xaml   | 235 ++++++----
 .../WeatherTwentyOne/Pages/FavoritesPage.xaml | 269 ++++++------
 .../Pages/FavoritesPage.xaml.cs               |   6 +-
 .../WeatherTwentyOne/Pages/SettingsPage.xaml  | 401 +++++++++---------
 .../Platforms/Android/AndroidManifest.xml     |   2 +-
 .../Resources/Styles/DefaultTheme.xaml        |   7 +-
 .../BeginnersTask/MainPage.xaml               |   8 +-
 .../Controls/CardViewUI.xaml                  |  34 +-
 .../Views/BindToViewModelPage.xaml            |  20 +-
 .../Views/ControlTemplateStylePage.xaml       |  32 +-
 .../RelativeSourceBindingCardViewPage.xaml    |  30 +-
 .../Views/TemplateBindingCardViewPage.xaml    |  33 +-
 .../Views/RelativeSourceMultiBindingPage.xaml |  17 +-
 .../LocalizationDemo/SettingsPage.xaml        |  12 +-
 .../Views/CompareStateTriggerDemoPage.xaml    |  13 +-
 .../Views/StateTriggerDemoPage.xaml           |  13 +-
 .../Controls/GradientColorPicker.xaml         |   5 +-
 .../Views/LinearGradientBrushDemoPage.xaml    |  57 ++-
 .../Views/RadialGradientBrushDemoPage.xaml    |  55 ++-
 .../Views/SolidColorBrushDemoPage.xaml        |  54 ++-
 .../Views/UpdateBrushDemoPage.xaml            |  43 +-
 .../Views/UpdateBrushDemoPage.xaml.cs         |   6 +-
 .../ControlGallery/ControlGallery.csproj      |  13 +-
 .../Views/XAML/CarouselViewDemoPage.xaml      |  16 +-
 .../Views/XAML/FlexLayoutDemoPage.xaml        |  25 +-
 .../Views/XAML/FrameDemoPage.xaml             |  19 -
 .../Views/XAML/FrameDemoPage.xaml.cs          |  13 -
 .../Views/XAML/IndicatorViewDemoPage.xaml     |  20 +-
 .../ControlGallery/Views/XAML/MainPage.xaml   |   4 -
 .../Views/CatalogItemsPage.xaml               |  25 +-
 .../Views/Code/CombinedStackLayoutPage.cs     |  85 ++--
 .../Views/XAML/CombinedStackLayoutPage.xaml   |  36 +-
 .../Views/UserSummaryPage.xaml                |  15 +-
 .../ThemingDemo/Views/UserSummaryPage.xaml    |  15 +-
 .../EmptyViewDataTemplateSelectorPage.xaml    |  16 +-
 .../EmptyView/EmptyViewFilteredPage.xaml      |  16 +-
 .../EmptyViewLoadSimulationPage.xaml          |  16 +-
 .../Views/EmptyView/EmptyViewSwapPage.xaml    |  16 +-
 .../EmptyView/EmptyViewTemplatePage.xaml      |  16 +-
 .../EmptyViewWithViewsFilteredPage.xaml       |  16 +-
 .../HorizontalLayoutWithIndicatorsPage.xaml   |  16 +-
 .../CurrentItemAndPositionBindingsPage.xaml   |  16 +-
 .../CurrentItemAndPositionPage.xaml           |  16 +-
 .../SetCurrentItemAndPositionPage.xaml        |  16 +-
 .../Views/Interaction/VisualStatesPage.xaml   |  17 +-
 ...izontalLayoutDataTemplateSelectorPage.xaml |  36 +-
 .../Layout/HorizontalLayoutPeekAreaPage.xaml  |  17 +-
 .../Layout/HorizontalTemplateLayoutPage.xaml  |  16 +-
 .../HorizontalTemplateLayoutRTLPage.xaml      |  16 +-
 .../Layout/VerticalTemplateLayoutPage.xaml    |  20 +-
 .../HorizontalPullToRefreshPage.xaml          |  16 +-
 .../VerticalPullToRefreshPage.xaml            |  16 +-
 .../Scrolling/IncrementalLoadingPage.xaml     |  16 +-
 .../ItemsUpdatingScrollModePage.xaml          |  16 +-
 .../Views/Scrolling/ScrollToByIndexPage.xaml  |  16 +-
 .../Views/Scrolling/ScrollToByObjectPage.xaml |  16 +-
 .../Views/Scrolling/SnapPointsPage.xaml       |  15 +-
 .../Views/Sizing/DynamicSizeItemsPage.xaml    |  19 +-
 .../Views/Sizing/DynamicSizeItemsPage.xaml.cs |   4 +-
 .../Views/Spacing/HorizontalSpacingPage.xaml  |  16 +-
 .../Views/Spacing/VerticalSpacingPage.xaml    |  16 +-
 .../Views/Swipe/HorizontalSwipeItemsPage.xaml |  18 +-
 .../Views/BasicIndicatorViewPage.xaml         |  20 +-
 .../Views/ConfigurableIndicatorViewPage.xaml  |  18 +-
 .../Views/TemplatedIndicatorViewPage.xaml     |  16 +-
 .../Views/SwipeViewCustomItemPage.xaml        |  12 +-
 .../Views/TwoPaneView/MainPage.xaml           |   4 +-
 70 files changed, 1106 insertions(+), 1099 deletions(-)
 delete mode 100644 9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
 delete mode 100644 9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml.cs

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 65ae7932d..6b426ab7a 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -23,10 +23,9 @@ jobs:
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
-      # if: runner.os == 'macOS' # reenable when .NET 8 is default on hosted runners
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.app
+      run: sudo xcode-select -s /Applications/Xcode_16.1.app
       if: runner.os == 'macOS'
 
     - name: Find and build all C# projects
@@ -75,7 +74,12 @@ jobs:
 
                 $proj_dir = [System.IO.Path]::GetDirectoryName($csproj)
                 Write-Output "Cleaning up bin & obj in $proj_dir"
-                Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                
+                try {
+                  Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                } catch {
+                  Write-Output "::warning:: Failed to clean up bin & obj in $proj_dir"  
+                }
 
                 Write-Output "::endgroup::"
             }
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 3120e8da0..25f36d19b 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -27,10 +27,9 @@ jobs:
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
-      # if: runner.os == 'macOS' # reenable when .NET 8 is default on hosted runners
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.app
+      run: sudo xcode-select -s /Applications/Xcode_16.1.app
       if: runner.os == 'macOS'
 
     - name: Find and build changed projects
@@ -112,7 +111,12 @@ jobs:
 
                   $proj_dir = [System.IO.Path]::GetDirectoryName($projectToBuild)
                   Write-Output "Cleaning up bin & obj in $proj_dir"
-                  Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+
+                  try {
+                    Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                  } catch {
+                    Write-Output "::warning:: Failed to clean up bin & obj in $proj_dir"  
+                  }
 
                   Write-Output "::endgroup::"
                 }
diff --git a/9.0/Animations/Animations/Resources/Styles/Styles.xaml b/9.0/Animations/Animations/Resources/Styles/Styles.xaml
index 67fa3644e..b129f13f3 100644
--- a/9.0/Animations/Animations/Resources/Styles/Styles.xaml
+++ b/9.0/Animations/Animations/Resources/Styles/Styles.xaml
@@ -7,11 +7,10 @@
     
 
     <ControlTemplate x:Key="EasingBox">
-        <Frame HasShadow="False" 
-                   BorderColor="{AppThemeBinding Dark=#000000, Light=#f1f1f1}"
-                   BackgroundColor="{AppThemeBinding Dark=#000000, Light=#f1f1f1}"
-                   CornerRadius="0" 
-                   Margin="6">
+        <Border  Stroke="{AppThemeBinding Dark=#000000, Light=#f1f1f1}"
+                 BackgroundColor="{AppThemeBinding Dark=#000000, Light=#f1f1f1}" 
+                 Margin="6"
+                 Padding="6">
             <Grid RowDefinitions="*,40">
                 <Grid x:Name="AxisGrid" Opacity="0">
                     <Path Data="M1 0v84h124"
@@ -31,7 +30,7 @@
                            Grid.Row="1"
                            HorizontalOptions="Center" VerticalOptions="End"/>
             </Grid>
-        </Frame>
+        </Border>
     </ControlTemplate>
 
     <Style TargetType="controls:EasingCard">
diff --git a/9.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsPage.xaml b/9.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsPage.xaml
index 289f82bf4..0cfd27cc6 100644
--- a/9.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsPage.xaml
+++ b/9.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsPage.xaml
@@ -8,7 +8,7 @@
              Shell.NavBarIsVisible="False">
 
     <ContentPage.BindingContext>
-        <pages:SettingsViewModel/>
+        <pages:SettingsViewModel />
     </ContentPage.BindingContext>
 
     <VisualStateManager.VisualStateGroups>
@@ -16,13 +16,12 @@
             <VisualStateGroup x:Name="CommonStates">
                 <VisualState x:Name="Hidden">
                     <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0"/>
+                        <AdaptiveTrigger MinWindowWidth="0" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter
-                            TargetName="MainGrid"
-                            Property="Grid.ColumnDefinitions"
-                            Value="0,*" />
+                        <Setter TargetName="MainGrid"
+                                Property="Grid.ColumnDefinitions"
+                                Value="0,*" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Shown">
@@ -30,10 +29,9 @@
                         <AdaptiveTrigger MinWindowWidth="1250" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter
-                            TargetName="MainGrid"
-                            Property="Grid.ColumnDefinitions"
-                            Value="275,*" />
+                        <Setter TargetName="MainGrid"
+                                Property="Grid.ColumnDefinitions"
+                                Value="275,*" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -42,80 +40,122 @@
 
     <ContentPage.Resources>
         <Style TargetType="Image">
-            <Setter Property="HorizontalOptions" Value="Start"/>
-            <Setter Property="VerticalOptions" Value="Start"/>
-        </Style>               
+            <Setter Property="HorizontalOptions"
+                    Value="Start" />
+            <Setter Property="VerticalOptions"
+                    Value="Start" />
+        </Style>
     </ContentPage.Resources>
 
     <ScrollView>
-        <Grid RowDefinitions="70,*" 
+        <Grid RowDefinitions="70,*"
               ColumnDefinitions="275,*"
               ColumnSpacing="24"
               Padding="24"
               x:Name="MainGrid">
-            <Label Text="Settings" Style="{StaticResource LargeTitle}"
-                   Grid.ColumnSpan="2"
-                   />
+            <Label Text="Settings"
+                   Style="{StaticResource LargeTitle}"
+                   Grid.ColumnSpan="2" />
 
             <Border Background="{StaticResource DarkBg2Brush}"
                     Stroke="{StaticResource DarkBg2Brush}"
                     StrokeThickness="1"
-                    Grid.Row="1"
-                    >
+                    Grid.Row="1">
                 <Border.StrokeShape>
-                    <RoundRectangle CornerRadius="12"/>
+                    <RoundRectangle CornerRadius="12" />
                 </Border.StrokeShape>
                 <VerticalStackLayout Padding="0,12">
-                    
-                    <Grid ColumnDefinitions="Auto,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
-                          Padding="26"
-                          >
+
+                    <Grid ColumnDefinitions="Auto,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
+                          Padding="26">
                         <Image Source="heart.png" />
-                        <Label Text="Appearance" Grid.Column="1" Style="{StaticResource Headline}" />
-                        <Label Text="Dark and Light mode, Font size" Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                        <Label Text="Appearance"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}" />
+                        <Label Text="Dark and Light mode, Font size"
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
 
-                    <Grid ColumnDefinitions="20,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
+                    <Grid ColumnDefinitions="20,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
                           Padding="26">
-                        <Image Source="store.png"/>
-                        <Label Text="Your Restaurant" Grid.Column="1" Style="{StaticResource Headline}" />
-                        <Label Text="Lorem ipsum dolor sit amet" Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                        <Image Source="store.png" />
+                        <Label Text="Your Restaurant"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}" />
+                        <Label Text="Lorem ipsum dolor sit amet"
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
 
-                    <Grid ColumnDefinitions="20,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
+                    <Grid ColumnDefinitions="20,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
                           Padding="26"
-                          Background="{StaticResource TertiaryBrush}"
-                          >
-                        <Image Source="discount.png"/>
-                        <Label Text="Products Management" Grid.Column="1" Style="{StaticResource Headline}" TextColor="{StaticResource Primary}" />
-                        <Label Text="Manage your products, pricing..." Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                          Background="{StaticResource TertiaryBrush}">
+                        <Image Source="discount.png" />
+                        <Label Text="Products Management"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}"
+                               TextColor="{StaticResource Primary}" />
+                        <Label Text="Manage your products, pricing..."
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
 
-                    <Grid ColumnDefinitions="20,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
+                    <Grid ColumnDefinitions="20,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
                           Padding="26">
-                        <Image Source="notification.png"/>
-                        <Label Text="Notifications" Grid.Column="1" Style="{StaticResource Headline}" />
-                        <Label Text="Customize your notifications" Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                        <Image Source="notification.png" />
+                        <Label Text="Notifications"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}" />
+                        <Label Text="Customize your notifications"
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
 
-                    <Grid ColumnDefinitions="20,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
+                    <Grid ColumnDefinitions="20,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
                           Padding="26">
-                        <Image Source="unlock.png"/>
-                        <Label Text="Security" Grid.Column="1" Style="{StaticResource Headline}" />
-                        <Label Text="Configure password, PIN..." Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                        <Image Source="unlock.png" />
+                        <Label Text="Security"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}" />
+                        <Label Text="Configure password, PIN..."
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
 
-                    <Grid ColumnDefinitions="20,Auto" ColumnSpacing="8"
-                          RowDefinitions="Auto, Auto" RowSpacing="4"
+                    <Grid ColumnDefinitions="20,Auto"
+                          ColumnSpacing="8"
+                          RowDefinitions="Auto, Auto"
+                          RowSpacing="4"
                           Padding="26">
-                        <Image Source="info.png"/>
-                        <Label Text="About Us" Grid.Column="1" Style="{StaticResource Headline}" />
-                        <Label Text="Lorem ipsum dolor sit amet" Grid.Column="1" Grid.Row="1" Style="{StaticResource Subhead}"/>
+                        <Image Source="info.png" />
+                        <Label Text="About Us"
+                               Grid.Column="1"
+                               Style="{StaticResource Headline}" />
+                        <Label Text="Lorem ipsum dolor sit amet"
+                               Grid.Column="1"
+                               Grid.Row="1"
+                               Style="{StaticResource Subhead}" />
                     </Grid>
                 </VerticalStackLayout>
             </Border>
@@ -126,68 +166,83 @@
                     Grid.Row="1"
                     Grid.Column="1">
                 <Border.StrokeShape>
-                    <RoundRectangle CornerRadius="12"/>
+                    <RoundRectangle CornerRadius="12" />
                 </Border.StrokeShape>
                 <VerticalStackLayout Spacing="8">
-                    <Grid Margin="24" >
-                        <Label Text="Products Management" VerticalOptions="Center"/>
-                        <Button Text="Manage Categories" HorizontalOptions="End" VerticalOptions="Center"
-                                Command="{Binding NotImplementedCommand}"/>
+                    <Grid Margin="24">
+                        <Label Text="Products Management"
+                               VerticalOptions="Center" />
+                        <Button Text="Manage Categories"
+                                HorizontalOptions="End"
+                                VerticalOptions="Center"
+                                Command="{Binding NotImplementedCommand}" />
                     </Grid>
 
-                    <Label Margin="24,8"  Text="All Products" Style="{StaticResource Headline}" TextColor="{StaticResource Primary}"/>
-                    <BoxView Style="{StaticResource HRule}"/>
+                    <Label Margin="24,8"
+                           Text="All Products"
+                           Style="{StaticResource Headline}"
+                           TextColor="{StaticResource Primary}" />
+                    <BoxView Style="{StaticResource HRule}" />
                     <ScrollView>
-                        <cl:HorizontalWrapLayout
-                            Margin="24" 
-                            VerticalOptions="Fill" 
-                            HorizontalOptions="Fill"
-                            BindableLayout.ItemsSource="{Binding Products}"
-                            Spacing="24">
+                        <cl:HorizontalWrapLayout Margin="24"
+                                                 VerticalOptions="Fill"
+                                                 HorizontalOptions="Fill"
+                                                 BindableLayout.ItemsSource="{Binding Products}"
+                                                 Spacing="24">
 
                             <BindableLayout.ItemTemplate>
                                 <DataTemplate x:DataType="m:Item">
-                                    <Frame CornerRadius="12"
-                                           BorderColor="{StaticResource Neutral}"
-                                           BackgroundColor="Transparent" Padding="0"
-                                           HeightRequest="300"
-                                           WidthRequest="260">
-                                        <Grid RowDefinitions="2*,1*,44" RowSpacing="8" 
-                                              >
-                                            <Image Source="{Binding Image}" Margin="22"
+                                    <Border StrokeShape="RoundRectangle 12"
+                                            Stroke="{StaticResource Neutral}"
+                                            BackgroundColor="Transparent"
+                                            Padding="0"
+                                            HeightRequest="300"
+                                            WidthRequest="260">
+                                        <Grid RowDefinitions="2*,1*,44"
+                                              RowSpacing="8">
+                                            <Image Source="{Binding Image}"
+                                                   Margin="22"
+                                                   HorizontalOptions="Center"
+                                                   VerticalOptions="Center" />
+                                            <Label Grid.Row="1"
+                                                   Margin="22,0"
+                                                   Text="{Binding Title}"
                                                    HorizontalOptions="Center"
-                                                   VerticalOptions="Center"
-                                                   />
-                                            <Label 
-                                                Grid.Row="1"
-                                                Margin="22,0"
-                                                Text="{Binding Title}" HorizontalOptions="Center" VerticalOptions="End"/>
-                                            <Grid Background="{StaticResource TertiaryBrush}" 
+                                                   VerticalOptions="End" />
+                                            <Grid Background="{StaticResource TertiaryBrush}"
                                                   IsClippedToBounds="True"
-                                                                   Grid.Row="2">
-                                                <Label Text="Edit" TextColor="{StaticResource Primary}" HorizontalOptions="Center" VerticalOptions="Center"/>
+                                                  Grid.Row="2">
+                                                <Label Text="Edit"
+                                                       TextColor="{StaticResource Primary}"
+                                                       HorizontalOptions="Center"
+                                                       VerticalOptions="Center" />
                                             </Grid>
                                         </Grid>
-                                    </Frame>
+                                    </Border>
 
                                 </DataTemplate>
                             </BindableLayout.ItemTemplate>
 
                             <Border Stroke="{StaticResource PrimaryBrush}"
                                     StrokeThickness="1"
-                                    StrokeDashOffset="5" Background="Transparent"
+                                    StrokeDashOffset="5"
+                                    Background="Transparent"
                                     StrokeDashArray="5,5"
                                     HeightRequest="300"
                                     WidthRequest="260">
                                 <Border.StrokeShape>
-                                    <RoundRectangle CornerRadius="12"/>
+                                    <RoundRectangle CornerRadius="12" />
                                 </Border.StrokeShape>
-                                <Grid HeightRequest="300" VerticalOptions="Fill">
-                                    <Label Text="Add New" TextColor="{StaticResource Primary}" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                <Grid HeightRequest="300"
+                                      VerticalOptions="Fill">
+                                    <Label Text="Add New"
+                                           TextColor="{StaticResource Primary}"
+                                           VerticalOptions="Center"
+                                           HorizontalOptions="Center" />
                                 </Grid>
                             </Border>
 
-                        
+
                         </cl:HorizontalWrapLayout>
                     </ScrollView>
                 </VerticalStackLayout>
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
index 833cdf07f..6a0ab1503 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
@@ -7,179 +7,178 @@
              ios:Page.UseSafeArea="True"
              Title="Favorites"
              Shell.NavBarIsVisible="{OnIdiom True, Desktop=False}"
-             x:Class="WeatherTwentyOne.Pages.FavoritesPage"
-             >
+             x:Class="WeatherTwentyOne.Pages.FavoritesPage">
     <ContentPage.Resources>
         <DataTemplate x:Key="FavTemplate">
-            <Frame
-                Padding="0"
-                CornerRadius="20"
-                HasShadow="False"
-                x:DataType="c:Location"
-                BackgroundColor="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource Background_Mid}}">
-                <Grid
-                                RowDefinitions="42,40,*"
-                                Padding="20">
-                    <Image
-                                    Source="{Binding Icon}"
-                                    WidthRequest="36"
-                                    HeightRequest="36"
-                                    VerticalOptions="Start"
-                                    HorizontalOptions="End"/>
-
-                    <Label Text="{Binding Value}" class="LargeTitle"
-                                           />
-
-                    <VerticalStackLayout
-                                    Spacing="0"
-                                    Grid.RowSpan="3" 
-                                    VerticalOptions="Center">
-                        <Label Text="{Binding Name}" class="Subhead" />
-                        <Label Text="{Binding WeatherStation}" class="SubContent"/>
+            <Border Padding="0"
+                    StrokeShape="RoundRectangle 20"
+                    x:DataType="c:Location"
+                    BackgroundColor="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource Background_Mid}}">
+                <Grid RowDefinitions="42,40,*"
+                      Padding="20">
+                    <Image Source="{Binding Icon}"
+                           WidthRequest="36"
+                           HeightRequest="36"
+                           VerticalOptions="Start"
+                           HorizontalOptions="End" />
+
+                    <Label Text="{Binding Value}"
+                           class="LargeTitle" />
+
+                    <VerticalStackLayout Spacing="0"
+                                         Grid.RowSpan="3"
+                                         VerticalOptions="Center">
+                        <Label Text="{Binding Name}"
+                               class="Subhead" />
+                        <Label Text="{Binding WeatherStation}"
+                               class="SubContent" />
                     </VerticalStackLayout>
 
-                    <HorizontalStackLayout
-                                Grid.Row="2"
-                                Spacing="10"
-                                VerticalOptions="End">
-                        <Image Source="solid_umbrella.png" VerticalOptions="Center"
-                                       WidthRequest="20" HeightRequest="20"/>
-                        <Label Text="13%" class="Small" VerticalOptions="Center"/>
+                    <HorizontalStackLayout Grid.Row="2"
+                                           Spacing="10"
+                                           VerticalOptions="End">
+                        <Image Source="solid_umbrella.png"
+                               VerticalOptions="Center"
+                               WidthRequest="20"
+                               HeightRequest="20" />
+                        <Label Text="13%"
+                               class="Small"
+                               VerticalOptions="Center" />
                     </HorizontalStackLayout>
 
-                    <HorizontalStackLayout
-                                    Grid.Row="2"
-                                    Spacing="10"
-                                    HorizontalOptions="End"
-                                    VerticalOptions="End">
-                        <Image Source="solid_humidity.png" VerticalOptions="Center"
-                                       WidthRequest="20" HeightRequest="20"/>
-                        <Label Text="45%" class="Small" VerticalOptions="Center"/>
+                    <HorizontalStackLayout Grid.Row="2"
+                                           Spacing="10"
+                                           HorizontalOptions="End"
+                                           VerticalOptions="End">
+                        <Image Source="solid_humidity.png"
+                               VerticalOptions="Center"
+                               WidthRequest="20"
+                               HeightRequest="20" />
+                        <Label Text="45%"
+                               class="Small"
+                               VerticalOptions="Center" />
                     </HorizontalStackLayout>
                 </Grid>
-            </Frame>
+            </Border>
+
 
-            
 
         </DataTemplate>
 
         <DataTemplate x:Key="FavBorderTemplate">
-            <Border
-                            Margin="{OnIdiom Phone=15,Default=25}"
-                            Padding="0"
-                            HorizontalOptions="Start"
-                            HeightRequest="154"
-                            WidthRequest="154"
-                            Stroke="Transparent"
-                            StrokeThickness="1"
-                            BackgroundColor="{StaticResource Background_Mid}"
-                            x:DataType="c:Location"
-                            >
+            <Border Margin="{OnIdiom Phone=15,Default=25}"
+                    Padding="0"
+                    HorizontalOptions="Start"
+                    HeightRequest="154"
+                    WidthRequest="154"
+                    Stroke="Transparent"
+                    StrokeThickness="1"
+                    BackgroundColor="{StaticResource Background_Mid}"
+                    x:DataType="c:Location">
                 <Border.StrokeShape>
-                    <RoundRectangle CornerRadius="40"/>
+                    <RoundRectangle CornerRadius="40" />
                 </Border.StrokeShape>
-                <Grid
-                                RowDefinitions="42,40,*"
-                                Padding="20">
-                    <Image
-                                    Source="{Binding Icon}"
-                                    WidthRequest="36"
-                                    HeightRequest="36"
-                                    VerticalOptions="Start"
-                                    HorizontalOptions="End"/>
-
-                    <Label Text="{Binding Value}" class="LargeTitle"
-                                           />
-
-                    <VerticalStackLayout
-                                    Spacing="0"
-                                    Grid.RowSpan="3" 
-                                    VerticalOptions="Center">
-                        <Label Text="{Binding Name}" class="Subhead" />
-                        <Label Text="{Binding WeatherStation}" class="SubContent"/>
+                <Grid RowDefinitions="42,40,*"
+                      Padding="20">
+                    <Image Source="{Binding Icon}"
+                           WidthRequest="36"
+                           HeightRequest="36"
+                           VerticalOptions="Start"
+                           HorizontalOptions="End" />
+
+                    <Label Text="{Binding Value}"
+                           class="LargeTitle" />
+
+                    <VerticalStackLayout Spacing="0"
+                                         Grid.RowSpan="3"
+                                         VerticalOptions="Center">
+                        <Label Text="{Binding Name}"
+                               class="Subhead" />
+                        <Label Text="{Binding WeatherStation}"
+                               class="SubContent" />
                     </VerticalStackLayout>
 
-                    <HorizontalStackLayout
-                                Grid.Row="2"
-                                Spacing="10"
-                                VerticalOptions="End">
-                        <Image Source="solid_umbrella.png" VerticalOptions="Center"
-                                       WidthRequest="20" HeightRequest="20"/>
-                        <Label Text="13%" class="Small" VerticalOptions="Center"/>
+                    <HorizontalStackLayout Grid.Row="2"
+                                           Spacing="10"
+                                           VerticalOptions="End">
+                        <Image Source="solid_umbrella.png"
+                               VerticalOptions="Center"
+                               WidthRequest="20"
+                               HeightRequest="20" />
+                        <Label Text="13%"
+                               class="Small"
+                               VerticalOptions="Center" />
                     </HorizontalStackLayout>
 
-                    <HorizontalStackLayout
-                                    Grid.Row="2"
-                                    Spacing="10"
-                                    HorizontalOptions="End"
-                                    VerticalOptions="End">
-                        <Image Source="solid_humidity.png" VerticalOptions="Center"
-                                       WidthRequest="20" HeightRequest="20"/>
-                        <Label Text="45%" class="Small" VerticalOptions="Center"/>
+                    <HorizontalStackLayout Grid.Row="2"
+                                           Spacing="10"
+                                           HorizontalOptions="End"
+                                           VerticalOptions="End">
+                        <Image Source="solid_humidity.png"
+                               VerticalOptions="Center"
+                               WidthRequest="20"
+                               HeightRequest="20" />
+                        <Label Text="45%"
+                               class="Small"
+                               VerticalOptions="Center" />
                     </HorizontalStackLayout>
                 </Grid>
             </Border>
         </DataTemplate>
     </ContentPage.Resources>
-    
-    
-        <!-- Main Section -->
-        <ScrollView>
-            <VerticalStackLayout>
-
-                <!-- Search Box -->
-                <HorizontalStackLayout
-                    VerticalOptions="Start"
-                    Spacing="18"
-                    Padding="{OnIdiom Phone='15,15,15,15', Default='25,25,25,0'}"
-                    >
-                    <Image
-                        Source="search_icon.png"
-                        VerticalOptions="Center"
-                        HeightRequest="22"
-                        WidthRequest="22"/>
-                    <Label
-                        Text="Search"
-                        TextColor="#637989"
-                        FontSize="18"
-                        WidthRequest="240"
-                        VerticalOptions="Center"/>
-                </HorizontalStackLayout>
-
-                <!-- Actual Content -->
-            <CollectionView
-                Margin="15"
-                ItemsSource="{Binding Favorites}"
-                ItemTemplate="{StaticResource FavTemplate}">
+
+
+    <!-- Main Section -->
+    <ScrollView>
+        <VerticalStackLayout>
+
+            <!-- Search Box -->
+            <HorizontalStackLayout VerticalOptions="Start"
+                                   Spacing="18"
+                                   Padding="{OnIdiom Phone='15,15,15,15', Default='25,25,25,0'}">
+                <Image Source="search_icon.png"
+                       VerticalOptions="Center"
+                       HeightRequest="22"
+                       WidthRequest="22" />
+                <Label Text="Search"
+                       TextColor="#637989"
+                       FontSize="18"
+                       WidthRequest="240"
+                       VerticalOptions="Center" />
+            </HorizontalStackLayout>
+
+            <!-- Actual Content -->
+            <CollectionView Margin="15"
+                            ItemsSource="{Binding Favorites}"
+                            ItemTemplate="{StaticResource FavTemplate}">
                 <CollectionView.ItemsLayout>
                     <GridItemsLayout Orientation="Vertical"
                                      Span="2"
                                      VerticalItemSpacing="8"
-                                     HorizontalItemSpacing="8"/>
+                                     HorizontalItemSpacing="8" />
                 </CollectionView.ItemsLayout>
                 <CollectionView.FooterTemplate>
                     <DataTemplate>
-                        <Border
-                            HeightRequest="132"
-                            WidthRequest="132"
-                            HorizontalOptions="Start"
-                            Margin="{OnIdiom Phone=15,Default=25}"
-                            Stroke="Transparent"
-                            StrokeThickness="1"
-                            BackgroundColor="{StaticResource Background_Mid}">
+                        <Border HeightRequest="132"
+                                WidthRequest="132"
+                                HorizontalOptions="Start"
+                                Margin="{OnIdiom Phone=15,Default=25}"
+                                Stroke="Transparent"
+                                StrokeThickness="1"
+                                BackgroundColor="{StaticResource Background_Mid}">
                             <Border.StrokeShape>
-                                <RoundRectangle CornerRadius="60"/>
+                                <RoundRectangle CornerRadius="60" />
                             </Border.StrokeShape>
-                            <ImageButton
-                                BackgroundColor="Transparent"
-                                Source="add_icon.png"
-                                VerticalOptions="Center" HorizontalOptions="Center"/>
+                            <ImageButton BackgroundColor="Transparent"
+                                         Source="add_icon.png"
+                                         VerticalOptions="Center"
+                                         HorizontalOptions="Center" />
                         </Border>
                     </DataTemplate>
                 </CollectionView.FooterTemplate>
             </CollectionView>
 
         </VerticalStackLayout>
-        </ScrollView>
+    </ScrollView>
 
 </ContentPage>
\ No newline at end of file
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs
index 25352cd08..430d398ae 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs
@@ -29,11 +29,11 @@ async void TransitionIn()
     }
 
     int tileCount = 0;
-    List<Frame> tiles = new List<Frame>();
+    List<Border> tiles = new List<Border>();
     void OnHandlerChanged(object sender, EventArgs e)
     {
-        Frame f = (Frame)sender;
-        tiles.Add(f);
+        Border b = (Border)sender;
+        tiles.Add(b);
         tileCount++;
     }
 }
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
index 0ac07f65f..e719ead1c 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
@@ -11,44 +11,35 @@
 
     <ContentPage.Resources>
         <ControlTemplate x:Key="ThemeRadioTemplate">
-            <Frame
-                          BorderColor="{StaticResource Background_Mid}"
-                          BackgroundColor="Transparent"
-                          HasShadow="False"
-                          HeightRequest="120"
-                          WidthRequest="100"
-                          HorizontalOptions="Start"
-                          VerticalOptions="Start"
-                          Padding="0">
+            <Border Stroke="{StaticResource Background_Mid}"
+                    BackgroundColor="Transparent"
+                    HeightRequest="120"
+                    WidthRequest="100"
+                    HorizontalOptions="Start"
+                    VerticalOptions="Start"
+                    Padding="0">
 
                 <VisualStateManager.VisualStateGroups>
                     <VisualStateGroupList>
-                        <VisualStateGroup
-                                        x:Name="CheckedStates">
+                        <VisualStateGroup x:Name="CheckedStates">
 
-                            <VisualState
-                                            x:Name="Checked">
+                            <VisualState x:Name="Checked">
                                 <VisualState.Setters>
-                                    <Setter
-                                                  Property="BorderColor"
-                                                  Value="{StaticResource Primary}" />
-                                    <Setter
-                                                  TargetName="Check"
-                                                  Property="Opacity"
-                                                  Value="1" />
+                                    <Setter Property="Stroke"
+                                            Value="{StaticResource Primary}" />
+                                    <Setter TargetName="Check"
+                                            Property="Opacity"
+                                            Value="1" />
                                 </VisualState.Setters>
                             </VisualState>
 
-                            <VisualState
-                                            x:Name="Unchecked">
+                            <VisualState x:Name="Unchecked">
                                 <VisualState.Setters>
-                                    <Setter
-                                                    Property="BorderColor"
-                                                    Value="{StaticResource Background_Mid}" />
-                                    <Setter
-                                                    TargetName="Check"
-                                                    Property="Opacity"
-                                                    Value="0" />
+                                    <Setter Property="Stroke"
+                                            Value="{StaticResource Background_Mid}" />
+                                    <Setter TargetName="Check"
+                                            Property="Opacity"
+                                            Value="0" />
                                 </VisualState.Setters>
                             </VisualState>
 
@@ -56,184 +47,179 @@
                     </VisualStateGroupList>
                 </VisualStateManager.VisualStateGroups>
 
-                <Grid
-                                
-                                >
-                    <Grid
-                                      WidthRequest="18"
-                                      HeightRequest="18"
-                                      Margin="0,8,8,0"
-                                      HorizontalOptions="End"
-                                      VerticalOptions="Start">
-                        <Ellipse
-                                            Stroke="{StaticResource DarkGray}"
-                                            WidthRequest="16"
-                                            HeightRequest="16"
-                                            StrokeThickness="0.5"
-                                            VerticalOptions="Center"
-                                            HorizontalOptions="Center"
-                                            Fill="White" />
-                        <Ellipse
-                                            x:Name="Check"
-                                            WidthRequest="8"
-                                            HeightRequest="8"
-                                            Stroke="{StaticResource Primary}"
-                                            Fill="{StaticResource Primary}"
-                                            VerticalOptions="Center"
-                                            HorizontalOptions="Center" />
+                <Grid>
+                    <Grid WidthRequest="18"
+                          HeightRequest="18"
+                          Margin="0,8,8,0"
+                          HorizontalOptions="End"
+                          VerticalOptions="Start">
+                        <Ellipse Stroke="{StaticResource DarkGray}"
+                                 WidthRequest="16"
+                                 HeightRequest="16"
+                                 StrokeThickness="0.5"
+                                 VerticalOptions="Center"
+                                 HorizontalOptions="Center"
+                                 Fill="White" />
+                        <Ellipse x:Name="Check"
+                                 WidthRequest="8"
+                                 HeightRequest="8"
+                                 Stroke="{StaticResource Primary}"
+                                 Fill="{StaticResource Primary}"
+                                 VerticalOptions="Center"
+                                 HorizontalOptions="Center" />
                     </Grid>
                     <ContentPresenter></ContentPresenter>
                 </Grid>
-            </Frame>
+            </Border>
         </ControlTemplate>
 
-        
+
     </ContentPage.Resources>
 
-    
-        <Grid
-            ColumnDefinitions="*"
-            RowDefinitions="{OnIdiom Phone='100,*', Default='100,*,0'}"
-            >
-            <ScrollView Grid.Row="1"
-                        Margin="{OnIdiom Phone=15, Default=25}"
-                        >
+
+    <Grid ColumnDefinitions="*"
+          RowDefinitions="{OnIdiom Phone='100,*', Default='100,*,0'}">
+        <ScrollView Grid.Row="1"
+                    Margin="{OnIdiom Phone=15, Default=25}">
+            <VerticalStackLayout Spacing="8">
                 <VerticalStackLayout Spacing="8">
-                    <VerticalStackLayout Spacing="8">
-                        <Image 
-                            HeightRequest="115"
-                            Aspect="AspectFit"
-                            Source="fluent_weather_moon_16_filled.png"/>
-                        <Label Text="{Binding Temperature}" 
-                                HorizontalOptions="Center"
-                                class="Title1"/>
-                        <Border
-                            HeightRequest="30"
+                    <Image HeightRequest="115"
+                           Aspect="AspectFit"
+                           Source="fluent_weather_moon_16_filled.png" />
+                    <Label Text="{Binding Temperature}"
+                           HorizontalOptions="Center"
+                           class="Title1" />
+                    <Border HeightRequest="30"
                             VerticalOptions="Start"
                             HorizontalOptions="Center"
                             Padding="15,0"
                             Stroke="Transparent"
-                            
                             BackgroundColor="{StaticResource Primary}">
                         <Border.StrokeShape>
-                            <RoundRectangle CornerRadius="60"/>
+                            <RoundRectangle CornerRadius="60" />
                         </Border.StrokeShape>
-                            <Label Text="Clear"
-                                   HorizontalOptions="Center"
-                                VerticalOptions="Center"
-                                TextColor="{StaticResource White}"
-                            />
-                        </Border>
-                    </VerticalStackLayout>
-                    
-                    <Label Text="Units" class="SectionTitle"/>
+                        <Label Text="Clear"
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"
+                               TextColor="{StaticResource White}" />
+                    </Border>
+                </VerticalStackLayout>
 
-                    <Grid RowDefinitions="30,30">
-                        <Grid.GestureRecognizers>
-                            <TapGestureRecognizer Command="{Binding SelectUnits}"
-                                                  CommandParameter="imperial"/>
-                        </Grid.GestureRecognizers>
-                        <Label Grid.Row="0" Text="Imperial" class="Subhead"/>
-                        <Label Grid.Row="1"
-                            Text="˚F / mph / miles / inches" class="SubContent"/>
-                        <Image
-                            x:Name="Imperial"
-                            Grid.RowSpan="2"
-                            Aspect="Center"
-                            IsVisible="{Binding IsImperial}"
-                            Source="checkmark_icon.png"
-                            HorizontalOptions="End"
-                            VerticalOptions="Center"/>
-                        
-                    </Grid>
-                    <BoxView class="HRule"/>
+                <Label Text="Units"
+                       class="SectionTitle" />
 
                 <Grid RowDefinitions="30,30">
                     <Grid.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding SelectUnits}"
-                                              CommandParameter="metric"/>
+                                              CommandParameter="imperial" />
                     </Grid.GestureRecognizers>
                     <Label Grid.Row="0"
-                            Text="Metric" class="Subhead"/>
-                        <Label Grid.Row="1"
-                            Text="˚C / kmh / km / millimeters / milibars" class="SubContent"/>
+                           Text="Imperial"
+                           class="Subhead" />
+                    <Label Grid.Row="1"
+                           Text="˚F / mph / miles / inches"
+                           class="SubContent" />
+                    <Image x:Name="Imperial"
+                           Grid.RowSpan="2"
+                           Aspect="Center"
+                           IsVisible="{Binding IsImperial}"
+                           Source="checkmark_icon.png"
+                           HorizontalOptions="End"
+                           VerticalOptions="Center" />
+
+                </Grid>
+                <BoxView class="HRule" />
+
+                <Grid RowDefinitions="30,30">
+                    <Grid.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding SelectUnits}"
+                                              CommandParameter="metric" />
+                    </Grid.GestureRecognizers>
+                    <Label Grid.Row="0"
+                           Text="Metric"
+                           class="Subhead" />
+                    <Label Grid.Row="1"
+                           Text="˚C / kmh / km / millimeters / milibars"
+                           class="SubContent" />
                     <Image x:Name="Metric"
-                            Grid.RowSpan="2"
+                           Grid.RowSpan="2"
                            Aspect="Center"
-                            IsVisible="{Binding IsMetric}"
-                            Source="checkmark_icon.png"
-                            HorizontalOptions="End"
-                            VerticalOptions="Center"/>
+                           IsVisible="{Binding IsMetric}"
+                           Source="checkmark_icon.png"
+                           HorizontalOptions="End"
+                           VerticalOptions="Center" />
                 </Grid>
-                    <BoxView class="HRule"/>
+                <BoxView class="HRule" />
 
                 <Grid RowDefinitions="30,30">
                     <Grid.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding SelectUnits}"
-                                              CommandParameter="hybrid"/>
+                                              CommandParameter="hybrid" />
                     </Grid.GestureRecognizers>
                     <Label Grid.Row="0"
-                            Text="Hybrid" class="Subhead"/>
-                        <Label Grid.Row="1"
-                            Text="˚C / mph / miles / millimeters / millibars" class="SubContent"/>
+                           Text="Hybrid"
+                           class="Subhead" />
+                    <Label Grid.Row="1"
+                           Text="˚C / mph / miles / millimeters / millibars"
+                           class="SubContent" />
                     <Image x:Name="Hybrid"
-                            Grid.RowSpan="2"
+                           Grid.RowSpan="2"
                            Aspect="Center"
-                            IsVisible="{Binding IsHybrid}"
-                            Source="checkmark_icon.png"
-                            HorizontalOptions="End"
-                            VerticalOptions="Center"/>
+                           IsVisible="{Binding IsHybrid}"
+                           Source="checkmark_icon.png"
+                           HorizontalOptions="End"
+                           VerticalOptions="Center" />
                 </Grid>
-                <BoxView class="HRule"/>
+                <BoxView class="HRule" />
 
-                <Label Text="More" class="SectionTitle"/>
+                <Label Text="More"
+                       class="SectionTitle" />
 
                 <Label Grid.Row="0"
-                                Text="Support" class="Subhead">
+                       Text="Support"
+                       class="Subhead">
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Tapped="OnSupportTapped"/>
+                        <TapGestureRecognizer Tapped="OnSupportTapped" />
                     </Label.GestureRecognizers>
                 </Label>
 
 
-                <BoxView class="HRule"/>
+                <BoxView class="HRule" />
 
                 <Grid>
-                    <Label Text="Theme" class="Subhead"/>
-                    <StackLayout
-                        HorizontalOptions="End"
-                        Spacing="12"
-                        Orientation="Horizontal"
-                         RadioButtonGroup.GroupName="AppTheme"
-                         RadioButtonGroup.SelectedValue="{Binding SelectedTheme}">
+                    <Label Text="Theme"
+                           class="Subhead" />
+                    <StackLayout HorizontalOptions="End"
+                                 Spacing="12"
+                                 Orientation="Horizontal"
+                                 RadioButtonGroup.GroupName="AppTheme"
+                                 RadioButtonGroup.SelectedValue="{Binding SelectedTheme}">
                         <StackLayout.Resources>
                             <Style TargetType="RadioButton">
-                                <Setter Property="ControlTemplate" Value="{StaticResource ThemeRadioTemplate}"/>
+                                <Setter Property="ControlTemplate"
+                                        Value="{StaticResource ThemeRadioTemplate}" />
                             </Style>
                         </StackLayout.Resources>
                         <RadioButton Value="{x:Static am:AppTheme.Unspecified}"
                                      IsChecked="True"
-                                     CheckedChanged="RadioButton_CheckedChanged"
-                                     >
+                                     CheckedChanged="RadioButton_CheckedChanged">
                             <RadioButton.Content>
                                 <Grid RowDefinitions="*">
-                                    <Image
-                                        VerticalOptions="Center"
-                                        HorizontalOptions="Center"
-                                        WidthRequest="50"
-                                        HeightRequest="50"
-                                        Margin="0,-8,0,0"
-                                        Source="{FontImage
+                                    <Image VerticalOptions="Center"
+                                           HorizontalOptions="Center"
+                                           WidthRequest="50"
+                                           HeightRequest="50"
+                                           Margin="0,-8,0,0"
+                                           Source="{FontImage
                                         FontFamily=FontAwesome,
                                         Glyph={x:Static local:IconFont.Mobile},
                                         Color={StaticResource MidGray},
-                                        Size=42}"/>
-                                    <Label
-                                        Text="Default"
-                                        VerticalOptions="End"
-                                        HorizontalOptions="Center"
-                                        FontSize="12"
-                                        Margin="0,0,0,10"/>
+                                        Size=42}" />
+                                    <Label Text="Default"
+                                           VerticalOptions="End"
+                                           HorizontalOptions="Center"
+                                           FontSize="12"
+                                           Margin="0,0,0,10" />
                                 </Grid>
                             </RadioButton.Content>
                         </RadioButton>
@@ -241,63 +227,55 @@
                                      CheckedChanged="RadioButton_CheckedChanged">
                             <RadioButton.Content>
                                 <Grid RowDefinitions="*">
-                                    <Image
-                                        VerticalOptions="Center"
-                                        HorizontalOptions="Center"
-                                        WidthRequest="50"
-                                        HeightRequest="50"
-                                        Margin="0,-8,0,0"
-                                        Source="{FontImage
+                                    <Image VerticalOptions="Center"
+                                           HorizontalOptions="Center"
+                                           WidthRequest="50"
+                                           HeightRequest="50"
+                                           Margin="0,-8,0,0"
+                                           Source="{FontImage
                                         FontFamily=FontAwesome,
                                         Glyph={x:Static local:IconFont.Lightbulb},
                                         Color=Black,
-                                        Size=42}"/>
-                                    <Label
-                                        Text="Dark"
-                                        VerticalOptions="End"
-                                        Margin="0,0,0,10"
-                                        HorizontalOptions="Center"
-                                        FontSize="12"
-                                        />
+                                        Size=42}" />
+                                    <Label Text="Dark"
+                                           VerticalOptions="End"
+                                           Margin="0,0,0,10"
+                                           HorizontalOptions="Center"
+                                           FontSize="12" />
                                 </Grid>
                             </RadioButton.Content>
                         </RadioButton>
                         <RadioButton Value="{x:Static am:AppTheme.Light}"
-                                     CheckedChanged="RadioButton_CheckedChanged"
-                                     >
+                                     CheckedChanged="RadioButton_CheckedChanged">
                             <RadioButton.Content>
                                 <Grid RowDefinitions="*">
-                                    <Image
-                                        VerticalOptions="Center"
-                                        HorizontalOptions="Center"
-                                        WidthRequest="50"
-                                        HeightRequest="50"
-                                        Margin="0,-8,0,0"
-                                        Source="{FontImage
+                                    <Image VerticalOptions="Center"
+                                           HorizontalOptions="Center"
+                                           WidthRequest="50"
+                                           HeightRequest="50"
+                                           Margin="0,-8,0,0"
+                                           Source="{FontImage
                                         FontFamily=FontAwesome,
                                         Glyph={x:Static local:IconFont.Lightbulb},
                                         Color=White,
-                                        Size=42}"/>
-                                    <Label
-                                        Text="Light"
-                                        FontSize="12"
-                                        VerticalOptions="End"
-                                        HorizontalOptions="Center"
-                                        Margin="0,0,0,10"/>
+                                        Size=42}" />
+                                    <Label Text="Light"
+                                           FontSize="12"
+                                           VerticalOptions="End"
+                                           HorizontalOptions="Center"
+                                           Margin="0,0,0,10" />
                                 </Grid>
                             </RadioButton.Content>
                         </RadioButton>
                     </StackLayout>
                 </Grid>
 
-                </VerticalStackLayout>
+            </VerticalStackLayout>
 
-            </ScrollView>
+        </ScrollView>
 
-            <Grid 
-                Grid.Row="0" 
-                Grid.ColumnDefinitions="16,75,16,*,100,16"
-                >
+        <Grid Grid.Row="0"
+              Grid.ColumnDefinitions="16,75,16,*,100,16">
 
             <!--<BoxView Color="Red" 
                      HorizontalOptions="Center"
@@ -314,27 +292,36 @@
             </BoxView>-->
 
             <Image  HorizontalOptions="Center"
-                        VerticalOptions="Center"
-                        Grid.Column="1"
-                        WidthRequest="75"
-                        HeightRequest="75"
-                        Aspect="AspectFill"
-                        Source="https://devblogs.microsoft.com/xamarin/wp-content/uploads/sites/44/2019/03/Screen-Shot-2017-01-03-at-3.35.53-PM-150x150.png">
-                    <Image.Clip>
-                        <EllipseGeometry 
-                                Center="36,36"
-                                RadiusX="36"
-                                RadiusY="36"/>
-                    </Image.Clip>
-                </Image>
+                    VerticalOptions="Center"
+                    Grid.Column="1"
+                    WidthRequest="75"
+                    HeightRequest="75"
+                    Aspect="AspectFill"
+                    Source="https://devblogs.microsoft.com/xamarin/wp-content/uploads/sites/44/2019/03/Screen-Shot-2017-01-03-at-3.35.53-PM-150x150.png">
+                <Image.Clip>
+                    <EllipseGeometry Center="36,36"
+                                     RadiusX="36"
+                                     RadiusY="36" />
+                </Image.Clip>
+            </Image>
 
-            <Label Text="David Ortinau" Grid.Column="3" LineBreakMode="WordWrap" VerticalOptions="Center" />
+            <Label Text="David Ortinau"
+                   Grid.Column="3"
+                   LineBreakMode="WordWrap"
+                   VerticalOptions="Center" />
 
-                <Button Text="Sign Out" Clicked="OnSignOut" Grid.Column="4" HorizontalOptions="End" VerticalOptions="Center"/>
+            <Button Text="Sign Out"
+                    Clicked="OnSignOut"
+                    Grid.Column="4"
+                    HorizontalOptions="End"
+                    VerticalOptions="Center" />
 
-                <BoxView Grid.ColumnSpan="6" Color="{StaticResource NeutralDarker}" HeightRequest="1" VerticalOptions="End"/>
-            </Grid>
+            <BoxView Grid.ColumnSpan="6"
+                     Color="{StaticResource NeutralDarker}"
+                     HeightRequest="1"
+                     VerticalOptions="End" />
         </Grid>
-    
+    </Grid>
+
 
 </ContentPage>
\ No newline at end of file
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
index 48b9e6aa4..68d8df73b 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
\ No newline at end of file
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
index 402e690e4..f3a88b19e 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
@@ -339,13 +339,12 @@
     
     <!-- data templates -->
     <DataTemplate x:Key="WeatherWidgetTemplate">
-        <Frame
+        <Border
             HorizontalOptions="Start"
             HeightRequest="164"
             WidthRequest="164"
             Padding="0"
-            CornerRadius="20"
-            HasShadow="False"
+            StrokeShape="RoundRectangle 20"
             BackgroundColor="{StaticResource Background_Mid}">
             <Grid HeightRequest="144"
                   WidthRequest="144"
@@ -362,7 +361,7 @@
                     <Label Text="Pond Elementary" class="SubContent"/>
                 </StackLayout>
             </Grid>
-        </Frame>
+        </Border>
     </DataTemplate>
 
     <converter:ImageByStateConverter x:Key="ImageByStateConverter"/>
diff --git a/9.0/Beginners-Series/BeginnersTask/MainPage.xaml b/9.0/Beginners-Series/BeginnersTask/MainPage.xaml
index 7e0beeffe..fd2a87262 100644
--- a/9.0/Beginners-Series/BeginnersTask/MainPage.xaml
+++ b/9.0/Beginners-Series/BeginnersTask/MainPage.xaml
@@ -40,16 +40,16 @@
                             </SwipeItems>
                         </SwipeView.RightItems>
                         <Grid Padding="0,5">
-                            <Frame>
-                                <Frame.GestureRecognizers>
+                            <Border>
+                                <Border.GestureRecognizers>
                                     <TapGestureRecognizer 
                                            x:DataType="{x:Null}"
                                            Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodel:MainViewModel}}, Path=TapCommand}"
                                            CommandParameter="{Binding .}"/>
-                                </Frame.GestureRecognizers>
+                                </Border.GestureRecognizers>
                                 <Label Text="{Binding .}"
                                        FontSize="24"/>
-                            </Frame>
+                            </Border>
                         </Grid>
                     </SwipeView>
                 </DataTemplate>
diff --git a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Controls/CardViewUI.xaml b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Controls/CardViewUI.xaml
index 21ee53d38..ef8ef2532 100644
--- a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Controls/CardViewUI.xaml
+++ b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Controls/CardViewUI.xaml
@@ -3,14 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlTemplateDemos.Controls.CardViewUI"
              x:Name="this">
-    <Frame BindingContext="{x:Reference this}"
-           BackgroundColor="{Binding CardColor}"
-           BorderColor="{Binding BorderColor}"
-           CornerRadius="5"
-           HasShadow="True"
-           Padding="8"
-           HorizontalOptions="Center"
-           VerticalOptions="Center">
+    <Border BindingContext="{x:Reference this}"
+            BackgroundColor="{Binding CardColor}"
+            Stroke="{Binding BorderColor}"
+            StrokeShape="RoundRectangle 5"
+            Padding="8"
+            HorizontalOptions="Center"
+            VerticalOptions="Center">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="75" />
@@ -21,20 +20,19 @@
                 <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="200" />
             </Grid.ColumnDefinitions>
-            <Frame IsClippedToBounds="True"
-                   BorderColor="{Binding BorderColor, FallbackValue='Black'}"
-                   BackgroundColor="{Binding IconBackgroundColor, FallbackValue='Gray'}"
-                   CornerRadius="38"
-                   HeightRequest="60"
-                   WidthRequest="60"
-                   HorizontalOptions="Center"
-                   VerticalOptions="Center">
+            <Border Stroke="{Binding BorderColor, FallbackValue='Black'}"
+                    BackgroundColor="{Binding IconBackgroundColor, FallbackValue='Gray'}"
+                    StrokeShape="RoundRectangle 38"
+                    HeightRequest="60"
+                    WidthRequest="60"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center">
                 <Image Source="{Binding IconImageSource}"
                        Margin="-20"
                        WidthRequest="100"
                        HeightRequest="100"
                        Aspect="AspectFill" />
-            </Frame>
+            </Border>
             <Label Grid.Column="1"
                    Text="{Binding CardTitle, FallbackValue='Card title'}"
                    FontAttributes="Bold"
@@ -53,5 +51,5 @@
                    VerticalOptions="Fill"
                    HorizontalOptions="Fill" />
         </Grid>
-    </Frame>
+    </Border>
 </ContentView>
diff --git a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/BindToViewModelPage.xaml b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/BindToViewModelPage.xaml
index 90de76f9b..3de805461 100644
--- a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/BindToViewModelPage.xaml
+++ b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/BindToViewModelPage.xaml
@@ -13,19 +13,20 @@
         <ControlTemplate x:Key="CardViewControlTemplate">
             <Border BindingContext="{Binding Source={RelativeSource TemplatedParent}}"
                     Background="{Binding CardColor}"
-                   Stroke="{Binding BorderColor}"
+                    Stroke="{Binding BorderColor}"
                     StrokeThickness="1"
-                    StrokeShape="RoundRectangle 12,12,12,12"                    
-                   Padding="8"
-                   HorizontalOptions="Center"
-                   VerticalOptions="Center">
+                    StrokeShape="RoundRectangle 12,12,12,12"
+                    Padding="8"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center">
                 <Border.Shadow>
                     <Shadow Brush="Black"
                             Offset="10,10"
                             Radius="14"
                             Opacity="0.8" />
                 </Border.Shadow>
-                <Grid RowDefinitions="75,4,Auto" ColumnDefinitions="275">
+                <Grid RowDefinitions="75,4,Auto"
+                      ColumnDefinitions="275">
                     <Label Text="{Binding CardTitle}"
                            FontAttributes="Bold"
                            FontSize="20"
@@ -56,7 +57,8 @@
         </DataTemplate>
     </ContentPage.Resources>
 
-    <VerticalStackLayout Margin="30" Spacing="30"
-                 BindableLayout.ItemsSource="{Binding People}"
-                 BindableLayout.ItemTemplate="{StaticResource PersonTemplate}" />
+    <VerticalStackLayout Margin="30"
+                         Spacing="30"
+                         BindableLayout.ItemsSource="{Binding People}"
+                         BindableLayout.ItemTemplate="{StaticResource PersonTemplate}" />
 </ContentPage>
diff --git a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ControlTemplateStylePage.xaml b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ControlTemplateStylePage.xaml
index adbf96a3d..f0e5aec10 100644
--- a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ControlTemplateStylePage.xaml
+++ b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ControlTemplateStylePage.xaml
@@ -7,12 +7,12 @@
     <ContentPage.Resources>
         <ControlTemplate x:Key="CardViewControlTemplate">
             <Border Background="{TemplateBinding CardColor}"
-                   Stroke="{TemplateBinding BorderColor}"
+                    Stroke="{TemplateBinding BorderColor}"
                     StrokeThickness="1"
-                    StrokeShape="RoundRectangle 12,12,12,12"                    
-                   Padding="8"
-                   HorizontalOptions="Center"
-                   VerticalOptions="Center">
+                    StrokeShape="RoundRectangle 12,12,12,12"
+                    Padding="8"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="75" />
@@ -23,15 +23,14 @@
                         <ColumnDefinition Width="75" />
                         <ColumnDefinition Width="200" />
                     </Grid.ColumnDefinitions>
-                    <Border 
-                           Stroke="{TemplateBinding BorderColor}"
-                           StrokeThickness="1"
-                           Background="{TemplateBinding IconBackgroundColor}"
-                           StrokeShape="RoundRectangle 30,30,30,30"  
-                           HeightRequest="60"
-                           WidthRequest="60"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="{TemplateBinding BorderColor}"
+                            StrokeThickness="1"
+                            Background="{TemplateBinding IconBackgroundColor}"
+                            StrokeShape="RoundRectangle 30,30,30,30"
+                            HeightRequest="60"
+                            WidthRequest="60"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <Image Source="{TemplateBinding IconImageSource}"
                                Margin="-20"
                                WidthRequest="60"
@@ -65,7 +64,8 @@
         </Style>
 
     </ContentPage.Resources>
-    <VerticalStackLayout Margin="30" Spacing="30">
+    <VerticalStackLayout Margin="30"
+                         Spacing="30">
         <controls:CardView BorderColor="DarkGray"
                            CardTitle="John Doe"
                            CardDescription="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla elit dolor, convallis non interdum."
@@ -75,7 +75,7 @@
                            CardTitle="Jane Doe"
                            CardDescription="Phasellus eu convallis mi. In tempus augue eu dignissim fermentum. Morbi ut lacus vitae eros lacinia."
                            IconBackgroundColor="SlateGray"
-                           IconImageSource="user.png"/>
+                           IconImageSource="user.png" />
         <controls:CardView BorderColor="DarkGray"
                            CardTitle=".NET Bot"
                            CardDescription="Aliquam sagittis, odio lacinia fermentum dictum, mi erat scelerisque erat, quis aliquet arcu."
diff --git a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/RelativeSourceBindingCardViewPage.xaml b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/RelativeSourceBindingCardViewPage.xaml
index a89e1d2a5..77260a519 100644
--- a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/RelativeSourceBindingCardViewPage.xaml
+++ b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/RelativeSourceBindingCardViewPage.xaml
@@ -12,12 +12,12 @@
             -->
             <Border BindingContext="{Binding Source={RelativeSource TemplatedParent}}"
                     Background="{Binding CardColor}"
-                   Stroke="{Binding BorderColor}"
+                    Stroke="{Binding BorderColor}"
                     StrokeThickness="1"
-                    StrokeShape="RoundRectangle 12,12,12,12"                    
-                   Padding="8"
-                   HorizontalOptions="Center"
-                   VerticalOptions="Center">
+                    StrokeShape="RoundRectangle 12,12,12,12"
+                    Padding="8"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center">
                 <Border.Shadow>
                     <Shadow Brush="Black"
                             Offset="10,10"
@@ -34,15 +34,14 @@
                         <ColumnDefinition Width="75" />
                         <ColumnDefinition Width="200" />
                     </Grid.ColumnDefinitions>
-                    <Border 
-                           Stroke="{Binding BorderColor}"
-                           StrokeThickness="1"
-                           Background="{Binding IconBackgroundColor}"
-                           StrokeShape="RoundRectangle 30,30,30,30"  
-                           HeightRequest="60"
-                           WidthRequest="60"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="{Binding BorderColor}"
+                            StrokeThickness="1"
+                            Background="{Binding IconBackgroundColor}"
+                            StrokeShape="RoundRectangle 30,30,30,30"
+                            HeightRequest="60"
+                            WidthRequest="60"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <Image Source="{Binding IconImageSource}"
                                Margin="-20"
                                WidthRequest="60"
@@ -70,7 +69,8 @@
             </Border>
         </ControlTemplate>
     </ContentPage.Resources>
-    <VerticalStackLayout Margin="30" Spacing="30">
+    <VerticalStackLayout Margin="30"
+                         Spacing="30">
         <controls:CardView BorderColor="DarkGray"
                            CardTitle="John Doe"
                            CardDescription="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla elit dolor, convallis non interdum."
diff --git a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/TemplateBindingCardViewPage.xaml b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/TemplateBindingCardViewPage.xaml
index 8c49a4909..d0d9240b3 100644
--- a/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/TemplateBindingCardViewPage.xaml
+++ b/9.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/TemplateBindingCardViewPage.xaml
@@ -10,28 +10,28 @@
             In this example, the TemplateBinding markup extension resolves binding expressions against the properties of each CardView object.
             -->
             <Border Background="{TemplateBinding CardColor}"
-                   Stroke="{TemplateBinding BorderColor}"
+                    Stroke="{TemplateBinding BorderColor}"
                     StrokeThickness="1"
-                    StrokeShape="RoundRectangle 12,12,12,12"                    
-                   Padding="8"
-                   HorizontalOptions="Center"
-                   VerticalOptions="Center">
+                    StrokeShape="RoundRectangle 12,12,12,12"
+                    Padding="8"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center">
                 <Border.Shadow>
                     <Shadow Brush="Black"
                             Offset="10,10"
                             Radius="14"
                             Opacity="0.8" />
                 </Border.Shadow>
-                <Grid RowDefinitions="75,4,Auto" ColumnDefinitions="75,200">
-                    <Border 
-                           Stroke="{TemplateBinding BorderColor}"
-                           StrokeThickness="1"
-                           Background="{TemplateBinding IconBackgroundColor}"
-                           StrokeShape="RoundRectangle 30,30,30,30"  
-                           HeightRequest="60"
-                           WidthRequest="60"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                <Grid RowDefinitions="75,4,Auto"
+                      ColumnDefinitions="75,200">
+                    <Border Stroke="{TemplateBinding BorderColor}"
+                            StrokeThickness="1"
+                            Background="{TemplateBinding IconBackgroundColor}"
+                            StrokeShape="RoundRectangle 30,30,30,30"
+                            HeightRequest="60"
+                            WidthRequest="60"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <Image Source="{TemplateBinding IconImageSource}"
                                Margin="-20"
                                WidthRequest="60"
@@ -59,7 +59,8 @@
             </Border>
         </ControlTemplate>
     </ContentPage.Resources>
-    <VerticalStackLayout Margin="30" Spacing="30">
+    <VerticalStackLayout Margin="30"
+                         Spacing="30">
         <controls:CardView BorderColor="DarkGray"
                            CardTitle="John Doe"
                            CardDescription="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla elit dolor, convallis non interdum."
diff --git a/9.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml b/9.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
index 65d0f62f3..4e539d9a3 100644
--- a/9.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
+++ b/9.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
@@ -52,20 +52,19 @@
                         <ColumnDefinition Width="75" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <Frame IsClippedToBounds="True"
-                           BorderColor="{Binding BorderColor}"
-                           BackgroundColor="{Binding IconBackgroundColor}"
-                           CornerRadius="38"
-                           HeightRequest="60"
-                           WidthRequest="60"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="{Binding BorderColor}"
+                            BackgroundColor="{Binding IconBackgroundColor}"
+                            StrokeShape="RoundRectangle 38"
+                            HeightRequest="60"
+                            WidthRequest="60"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <Image Source="{Binding IconImageSource}"
                                Margin="-20"
                                WidthRequest="100"
                                HeightRequest="100"
                                Aspect="AspectFill" />
-                    </Frame>
+                    </Border>
                     <Label Grid.Column="2"
                            Grid.RowSpan="2"
                            Text="{Binding CardDescription}"
diff --git a/9.0/Fundamentals/Localization/LocalizationDemo/SettingsPage.xaml b/9.0/Fundamentals/Localization/LocalizationDemo/SettingsPage.xaml
index 9c9ec460b..52a4cbc97 100644
--- a/9.0/Fundamentals/Localization/LocalizationDemo/SettingsPage.xaml
+++ b/9.0/Fundamentals/Localization/LocalizationDemo/SettingsPage.xaml
@@ -8,11 +8,11 @@
 
         <Color x:Key="SectionBorderColor">#C8C8C8</Color>
 
-        <Style x:Key="SectionBorderStyle" TargetType="Frame">
-            <Setter Property="BorderColor" Value="{StaticResource SectionBorderColor}" />
-            <Setter Property="CornerRadius" Value="10" />
-            <Setter Property="HasShadow" Value="False" />
+        <Style x:Key="SectionBorderStyle" TargetType="Border">
+            <Setter Property="Stroke" Value="{StaticResource SectionBorderColor}" />
+            <Setter Property="StrokeShape" Value="RoundRectangle 10" />
             <Setter Property="Margin" Value="0,20,0,0" />
+            <Setter Property="Padding" Value="20" />
         </Style>     
 
     </ContentPage.Resources>
@@ -24,13 +24,13 @@
                    Text="Ad dignissimos itaque qui voluptatibus adipisci cum voluptatum aliquam. Non exercitationem ipsum eos quidem nemo non rerum molestiae ut veritatis aperiam eum quia laudantium. Eum voluptatibus reprehenderit ut quam quia id reprehenderit praesentium." />
             <Label Margin="0,20,0,0"
                    Text="Sed earum quisquam hic adipisci rerum et dolore assumenda ut autem voluptatum et nihil sint. Sed maxime quis qui distinctio tenetur aut provident cupiditate hic reprehenderit similique et Quis dolorum. Ut sunt vitae aut iste velit eos distinctio explicabo ea nihil aperiam." />
-            <Frame Style="{StaticResource SectionBorderStyle}">
+            <Border Style="{StaticResource SectionBorderStyle}">
                 <HorizontalStackLayout>
                     <Label Text="Right to left" />
                     <Switch Margin="20,-5,0,0"
                             Toggled="OnRTLToggled" />
                 </HorizontalStackLayout>
-            </Frame>
+            </Border>
         </VerticalStackLayout>
     </ScrollView>
 
diff --git a/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml b/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
index 880b0531e..16539156e 100644
--- a/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
+++ b/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
@@ -34,17 +34,18 @@
         </Style>
     </ContentPage.Resources>
     <Grid>
-        <Frame BackgroundColor="White"
-               CornerRadius="12"
-               Margin="24"
-               HorizontalOptions="Center"
-               VerticalOptions="Center">
+        <Border BackgroundColor="White"
+                StrokeShape="RoundRectangle 12"
+                Margin="24"
+                Padding="24"
+                HorizontalOptions="Center"
+                VerticalOptions="Center">
             <StackLayout Orientation="Horizontal">
                 <CheckBox x:Name="checkBox"
                           VerticalOptions="Center" />
                 <Label Text="Check the CheckBox to modify the Grid background color."
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
+        </Border>
     </Grid>
 </ContentPage>
diff --git a/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml b/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
index 54dc55bca..2aa8d3a8c 100644
--- a/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
+++ b/9.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
@@ -39,17 +39,18 @@
         </Style>
     </ContentPage.Resources>
     <Grid>
-        <Frame BackgroundColor="White"
-               CornerRadius="12"
-               Margin="24"
-               HorizontalOptions="Center"
-               VerticalOptions="Center">
+        <Border BackgroundColor="White"
+                StrokeShape="RoundRectangle 12"
+                Margin="24"
+                Padding="24"
+                HorizontalOptions="Center"
+                VerticalOptions="Center">
             <StackLayout Orientation="Horizontal">
                 <CheckBox IsChecked="{Binding IsToggled, Mode=TwoWay}"
                           VerticalOptions="Center" />
                 <Label Text="Check the CheckBox to modify the Grid background color."
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
+        </Border>
     </Grid>
 </ContentPage>
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml b/9.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
index 7d68ac1a2..dabc9ed7a 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
@@ -8,8 +8,7 @@
               BackgroundColor="Black"
               ColumnSpacing="6"
               RowSpacing="6" />
-        <Frame CornerRadius="12"
-               HasShadow="false"
+        <Border StrokeShape="RoundRectangle 12"
                Margin="35,25"
                Padding="12"
                BackgroundColor="White"
@@ -60,6 +59,6 @@
                             Clicked="OnOKButtonClicked" />
                 </StackLayout>
             </StackLayout>
-        </Frame>
+        </Border>
     </Grid>
 </ContentView>
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
index fb52a6628..41479f278 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
@@ -7,32 +7,30 @@
         <StackLayout Margin="20">
             <Label Text="LinearGradientBrush (Horizontal)"
                    FontAttributes="Bold" />
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">                
-                <Frame.Background>
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- StartPoint defaults to (0,0) -->
                     <LinearGradientBrush EndPoint="1,0">
                         <GradientStop Color="Yellow"
                                       Offset="0.1" />
                         <GradientStop Color="Green"
-                                      Offset="1.0" />                                                        
+                                      Offset="1.0" />
                     </LinearGradientBrush>
-                </Frame.Background>
-            </Frame>    
+                </Border.Background>
+            </Border>
             <Label Margin="0,20,0,0"
                    Text="LinearGradientBrush (Vertical)"
-                   FontAttributes="Bold" />        
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+                   FontAttributes="Bold" />
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- StartPoint defaults to (0,0) -->
                     <LinearGradientBrush EndPoint="0,1">
                         <GradientStop Color="Yellow"
@@ -40,18 +38,17 @@
                         <GradientStop Color="Green"
                                       Offset="1.0" />
                     </LinearGradientBrush>
-                </Frame.Background>
-            </Frame>                    
+                </Border.Background>
+            </Border>
             <Label Margin="0,20,0,0"
                    Text="LinearGradientBrush (Diagonal)"
-                   FontAttributes="Bold" />        
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+                   FontAttributes="Bold" />
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- StartPoint defaults to (0,0)      
                          Endpoint defaults to (1,1) -->
                     <LinearGradientBrush>
@@ -60,8 +57,8 @@
                         <GradientStop Color="Green"
                                       Offset="1.0" />
                     </LinearGradientBrush>
-                </Frame.Background>
-            </Frame>                           
+                </Border.Background>
+            </Border>
         </StackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
index 52fe4c136..e50878797 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
@@ -7,13 +7,12 @@
         <StackLayout Margin="20">
             <Label Text="RadialGradientBrush (Upper left)"
                    FontAttributes="Bold" />
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- Radius defaults to (0.5) -->
                     <RadialGradientBrush Center="0.0,0.0">
                         <GradientStop Color="Red"
@@ -21,18 +20,17 @@
                         <GradientStop Color="DarkBlue"
                                       Offset="1.0" />
                     </RadialGradientBrush>
-                </Frame.Background>
-            </Frame>    
+                </Border.Background>
+            </Border>
             <Label Margin="0,20,0,0"
                    Text="RadialGradientBrush (Center)"
-                   FontAttributes="Bold" />        
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+                   FontAttributes="Bold" />
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- Center defaults to (0.5,0.5)
                          Radius defaults to (0.5) -->
                     <RadialGradientBrush>
@@ -41,18 +39,17 @@
                         <GradientStop Color="DarkBlue"
                                       Offset="1.0" />
                     </RadialGradientBrush>
-                </Frame.Background>
-            </Frame>                    
+                </Border.Background>
+            </Border>
             <Label Margin="0,20,0,0"
                    Text="RadialGradientBrush (Lower right)"
-                   FontAttributes="Bold" />        
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+                   FontAttributes="Bold" />
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 15"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <!-- Radius defaults to (0.5) -->
                     <RadialGradientBrush Center="1.0,1.0">
                         <GradientStop Color="Red"
@@ -60,8 +57,8 @@
                         <GradientStop Color="DarkBlue"
                                       Offset="1.0" />
                     </RadialGradientBrush>
-                </Frame.Background>
-            </Frame>                           
+                </Border.Background>
+            </Border>
         </StackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
index fbf43084a..bbd4aa15d 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
@@ -8,45 +8,41 @@
                      Spacing="6">
             <Label Text="SolidColorBrush (Predefined Brush)"
                    FontAttributes="Bold" />
-             <Frame Margin="0,20,0,0"
+            <Border Margin="0,20,0,0"
                     Background="{x:Static Brush.Indigo}"
-                    BorderColor="LightGray"
-                    HasShadow="True"
-                    CornerRadius="12"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 12"
                     HeightRequest="120"
-                    WidthRequest="120" />                   
+                    WidthRequest="120" />
             <Label Text="SolidColorBrush (Color)"
                    FontAttributes="Bold" />
-            <Frame Margin="0,20,0,0"
-                   Background="DarkBlue"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120" /> 
+            <Border Margin="0,20,0,0"
+                    Background="DarkBlue"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 12"
+                    HeightRequest="120"
+                    WidthRequest="120" />
             <Label Margin="0,20,0,0"
                    Text="SolidColorBrush (Hex)"
-                   FontAttributes="Bold" />        
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   Background="#FF9988"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120" />      
+                   FontAttributes="Bold" />
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    Background="#FF9988"
+                    StrokeShape="RoundRectangle 12"
+                    HeightRequest="120"
+                    WidthRequest="120" />
             <Label Margin="0,20,0,0"
                    Text="SolidColorBrush (Property Tag Syntax)"
                    FontAttributes="Bold" />
-            <Frame Margin="0,20,0,0"
-                   BorderColor="LightGray"
-                   HasShadow="True"
-                   CornerRadius="12"
-                   HeightRequest="120"
-                   WidthRequest="120">
-                <Frame.Background>
+            <Border Margin="0,20,0,0"
+                    Stroke="LightGray"
+                    StrokeShape="RoundRectangle 12"
+                    HeightRequest="120"
+                    WidthRequest="120">
+                <Border.Background>
                     <SolidColorBrush Color="LightSteelBlue" />
-                </Frame.Background>
-            </Frame>
+                </Border.Background>
+            </Border>
         </StackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
index eeb971569..e512b0b11 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
@@ -6,33 +6,30 @@
     <StackLayout Margin="20">
         <Label Text="SolidColorBrush"
                FontAttributes="Bold" />
-        <Frame x:Name="solidColorFrame"
-               Margin="0,20,0,0"
-               BorderColor="LightGray"
-               HasShadow="True"
-               CornerRadius="12"
-               HeightRequest="120"
-               WidthRequest="120" />
+        <Border x:Name="solidColorBorder"
+                Margin="0,20,0,0"
+                Stroke="LightGray"
+                StrokeShape="RoundRectangle 12"
+                HeightRequest="120"
+                WidthRequest="120" />
         <Label Margin="0,20,0,0"
                Text="LinearGradientBrush"
-               FontAttributes="Bold" />        
-        <Frame x:Name="linearGradientFrame"
-               Margin="0,20,0,0"
-               BorderColor="LightGray"
-               HasShadow="True"
-               CornerRadius="12"
-               HeightRequest="120"
-               WidthRequest="120" />
+               FontAttributes="Bold" />
+        <Border x:Name="linearGradientBorder"
+                Margin="0,20,0,0"
+                Stroke="LightGray"
+                StrokeShape="RoundRectangle 12"
+                HeightRequest="120"
+                WidthRequest="120" />
         <Label Margin="0,20,0,0"
                Text="RadialGradientBrush"
-               FontAttributes="Bold" />        
-        <Frame x:Name="radialGradientFrame"
-               Margin="0,20,0,0"
-               BorderColor="LightGray"
-               HasShadow="True"
-               CornerRadius="12"
-               HeightRequest="120"
-               WidthRequest="120" />
+               FontAttributes="Bold" />
+        <Border x:Name="radialGradientBorder"
+                Margin="0,20,0,0"
+                Stroke="LightGray"
+                StrokeShape="RoundRectangle 12"
+                HeightRequest="120"
+                WidthRequest="120" />
         <Label Margin="0,40,0,0"
                Text="Brushes are updated every second."
                HorizontalOptions="Center" />
diff --git a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml.cs b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml.cs
index 19268ddf4..163c79d38 100644
--- a/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml.cs
+++ b/9.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml.cs
@@ -54,9 +54,9 @@ void UpdateBrushes()
                 }
             };
 
-            solidColorFrame.Background = solidColorBrush;
-            linearGradientFrame.Background = linearGradientBrush;
-            radialGradientFrame.Background = radialGradientBrush;
+            solidColorBorder.Background = solidColorBrush;
+            linearGradientBorder.Background = linearGradientBrush;
+            radialGradientBorder.Background = radialGradientBrush;
         }
 
         Color GetRandomColor()
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj b/9.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
index 718e1715e..d8e560f14 100644
--- a/9.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
+++ b/9.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
@@ -59,6 +59,16 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Update="Views\XAML\.xaml.cs">
+	    <DependentUpon>.xaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
 	<ItemGroup>
 	  <MauiXaml Update="Views\XAML\AbsoluteLayoutDemoPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -114,9 +124,6 @@
 	  <MauiXaml Update="Views\XAML\FlyoutPageDemoPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\FrameDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="Views\XAML\GraphicsViewDemoPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
index fdc01a116..411d49383 100644
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
+++ b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
@@ -12,13 +12,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="CenterAndExpand">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="300"
+                                HorizontalOptions="Center"
+                                VerticalOptions="CenterAndExpand">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -38,7 +38,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlexLayoutDemoPage.xaml b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlexLayoutDemoPage.xaml
index 69468f8a5..3a441a85c 100644
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlexLayoutDemoPage.xaml
+++ b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlexLayoutDemoPage.xaml
@@ -4,11 +4,12 @@
              x:Class="ControlGallery.Views.XAML.FlexLayoutDemoPage"
              Title="FlexLayout Demo">
     <ContentPage.Resources>
-        <Style TargetType="Frame">
+        <Style TargetType="Border">
             <Setter Property="BackgroundColor" Value="LightYellow" />
-            <Setter Property="BorderColor" Value="Blue" />
+            <Setter Property="Stroke" Value="Blue" />
             <Setter Property="Margin" Value="10" />
-            <Setter Property="CornerRadius" Value="15" />
+            <Setter Property="Padding" Value="10" />
+            <Setter Property="StrokeShape" Value="RoundRectangle 15" />
         </Style>
 
         <Style TargetType="Label">
@@ -37,8 +38,8 @@
 
     <ScrollView Orientation="Both">
         <FlexLayout>
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Seated Monkey"
@@ -53,10 +54,10 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
 
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Banana Monkey"
@@ -70,10 +71,10 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
 
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Face-Palm Monkey"
@@ -88,7 +89,7 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
         </FlexLayout>
     </ScrollView>
 </ContentPage>
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
deleted file mode 100644
index 340189cd0..000000000
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ControlGallery.Views.XAML.FrameDemoPage"
-             Title="Frame Demo">
-    <StackLayout>
-        <Label Text="Frame"
-               FontSize="50"
-               FontAttributes="Bold"
-               HorizontalOptions="Center" />
-
-        <Frame BorderColor="Silver"
-               HasShadow="True"
-               HorizontalOptions="Center"
-               VerticalOptions="CenterAndExpand">
-            <Label Text="I've been framed!" />
-        </Frame>
-    </StackLayout>
-</ContentPage>
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml.cs b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml.cs
deleted file mode 100644
index 0c880e1cb..000000000
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-
-namespace ControlGallery.Views.XAML
-{
-    public partial class FrameDemoPage : ContentPage
-    {
-        public FrameDemoPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
index f906705cf..4803a4f27 100644
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
+++ b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
@@ -13,20 +13,20 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="CenterAndExpand">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="300"
+                                HorizontalOptions="Center"
+                                VerticalOptions="CenterAndExpand">
                             <StackLayout>
-                                <Label Text="{Binding Name}" 
+                                <Label Text="{Binding Name}"
                                        FontAttributes="Bold"
                                        FontSize="20"
                                        HorizontalOptions="Center"
                                        VerticalOptions="Center" />
-                                <Image Source="{Binding ImageUrl}" 
+                                <Image Source="{Binding ImageUrl}"
                                        Aspect="AspectFill"
                                        HeightRequest="150"
                                        WidthRequest="150"
@@ -39,7 +39,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/MainPage.xaml b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/MainPage.xaml
index 8d6c2a2ab..9979cd94b 100644
--- a/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/MainPage.xaml
+++ b/9.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/MainPage.xaml
@@ -79,10 +79,6 @@
                           Detail="Present two pages with a list and an item"
                           Command="{Binding NavigateCommand}"
                           CommandParameter="{x:Type views:FlyoutPageDemoPage}" />
-                <TextCell Text="Frame"
-                          Detail="Show a rectangle around a single child"
-                          Command="{Binding NavigateCommand}"
-                          CommandParameter="{x:Type views:FrameDemoPage}" />
                 <TextCell Text="GraphicsView"
                           Detail="Draw 2D graphics on a canvas"
                           Command="{Binding NavigateCommand}"
diff --git a/9.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/CatalogItemsPage.xaml b/9.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/CatalogItemsPage.xaml
index 488072a31..d35449e0f 100644
--- a/9.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/CatalogItemsPage.xaml
+++ b/9.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/CatalogItemsPage.xaml
@@ -4,11 +4,12 @@
              x:Class="FlexLayoutDemos.Views.CatalogItemsPage"
              Title="Catalog Items">
     <ContentPage.Resources>
-        <Style TargetType="Frame">
+        <Style TargetType="Border">
             <Setter Property="BackgroundColor" Value="LightYellow" />
-            <Setter Property="BorderColor" Value="Blue" />
+            <Setter Property="Stroke" Value="Blue" />
             <Setter Property="Margin" Value="10" />
-            <Setter Property="CornerRadius" Value="15" />
+            <Setter Property="Padding" Value="10" />
+            <Setter Property="StrokeShape" Value="RoundRectangle 15" />
         </Style>
 
         <Style TargetType="Label">
@@ -37,8 +38,8 @@
 
     <ScrollView Orientation="Both">
         <FlexLayout>
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Seated Monkey"
@@ -53,10 +54,10 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
 
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Banana Monkey"
@@ -70,10 +71,10 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
 
-            <Frame WidthRequest="300"
-                   HeightRequest="480">
+            <Border WidthRequest="300"
+                    HeightRequest="480">
 
                 <FlexLayout Direction="Column">
                     <Label Text="Face-Palm Monkey"
@@ -88,7 +89,7 @@
                     <Label FlexLayout.Grow="1" />
                     <Button />
                 </FlexLayout>
-            </Frame>
+            </Border>
         </FlexLayout>
     </ScrollView>
 </ContentPage>
diff --git a/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/Code/CombinedStackLayoutPage.cs b/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/Code/CombinedStackLayoutPage.cs
index 00b8ce029..490e969ea 100644
--- a/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/Code/CombinedStackLayoutPage.cs
+++ b/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/Code/CombinedStackLayoutPage.cs
@@ -6,99 +6,100 @@ public CombinedStackLayoutPage()
         {
             Title = "Combined StackLayouts demo";
 
-            Frame frame1 = new Frame
+            Border border1 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame1StackLayout = new StackLayout
+
+            StackLayout border1StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame1StackLayout.Add(new BoxView { Color = Colors.Red, WidthRequest = 40 });
-            frame1StackLayout.Add(new Label { Text = "Red", FontSize = 20, VerticalOptions = LayoutOptions.Center });
-            frame1.Content = frame1StackLayout;
+            border1StackLayout.Add(new BoxView { Color = Colors.Red, WidthRequest = 40 });
+            border1StackLayout.Add(new Label { Text = "Red", FontSize = 20, VerticalOptions = LayoutOptions.Center });
+            border1.Content = border1StackLayout;
 
-            Frame frame2 = new Frame
+            Border border2 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame2StackLayout = new StackLayout
+            StackLayout border2StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame2StackLayout.Add(new BoxView { Color = Colors.Yellow, WidthRequest = 40 });
-            frame2StackLayout.Add(new Label { Text = "Yellow", FontSize =  20, VerticalOptions = LayoutOptions.Center });
-            frame2.Content = frame2StackLayout;
+            border2StackLayout.Add(new BoxView { Color = Colors.Yellow, WidthRequest = 40 });
+            border2StackLayout.Add(new Label { Text = "Yellow", FontSize =  20, VerticalOptions = LayoutOptions.Center });
+            border2.Content = border2StackLayout;
 
-            Frame frame3 = new Frame
+            Border border3 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame3StackLayout = new StackLayout
+            StackLayout border3StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame3StackLayout.Add(new BoxView { Color = Colors.Blue, WidthRequest = 40 });
-            frame3StackLayout.Add(new Label { Text = "Blue", FontSize = 20, VerticalOptions = LayoutOptions.Center });
-            frame3.Content = frame3StackLayout;
+            border3StackLayout.Add(new BoxView { Color = Colors.Blue, WidthRequest = 40 });
+            border3StackLayout.Add(new Label { Text = "Blue", FontSize = 20, VerticalOptions = LayoutOptions.Center });
+            border3.Content = border3StackLayout;
 
-            Frame frame4 = new Frame
+            Border border4 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame4StackLayout = new StackLayout
+            StackLayout border4StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame4StackLayout.Add(new BoxView { Color = Colors.Green, WidthRequest = 40 });
-            frame4StackLayout.Add(new Label { Text = "Green", FontSize = 20, VerticalOptions = LayoutOptions.Center });
-            frame4.Content = frame4StackLayout;
+            border4StackLayout.Add(new BoxView { Color = Colors.Green, WidthRequest = 40 });
+            border4StackLayout.Add(new Label { Text = "Green", FontSize = 20, VerticalOptions = LayoutOptions.Center });
+            border4.Content = border4StackLayout;
 
-            Frame frame5 = new Frame
+            Border border5 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame5StackLayout = new StackLayout
+            StackLayout border5StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame5StackLayout.Add(new BoxView { Color = Colors.Orange, WidthRequest = 40 });
-            frame5StackLayout.Add(new Label { Text = "Orange", FontSize = 20, VerticalOptions = LayoutOptions.Center });
-            frame5.Content = frame5StackLayout;
+            border5StackLayout.Add(new BoxView { Color = Colors.Orange, WidthRequest = 40 });
+            border5StackLayout.Add(new Label { Text = "Orange", FontSize = 20, VerticalOptions = LayoutOptions.Center });
+            border5.Content = border5StackLayout;
 
-            Frame frame6 = new Frame
+            Border border6 = new Border
             {
-                BorderColor = Colors.Black,
+                Stroke = Colors.Black,
                 Padding = new Thickness(5)
             };
-            StackLayout frame6StackLayout = new StackLayout
+            StackLayout border6StackLayout = new StackLayout
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = 15
             };
-            frame6StackLayout.Add(new BoxView { Color = Colors.Purple, WidthRequest = 40 });
-            frame6StackLayout.Add(new Label { Text = "Purple", FontSize = 20, VerticalOptions = LayoutOptions.Center });
-            frame6.Content = frame6StackLayout;
+            border6StackLayout.Add(new BoxView { Color = Colors.Purple, WidthRequest = 40 });
+            border6StackLayout.Add(new Label { Text = "Purple", FontSize = 20, VerticalOptions = LayoutOptions.Center });
+            border6.Content = border6StackLayout;
 
             StackLayout stackLayout = new StackLayout { Margin = new Thickness(20) };
             stackLayout.Add(new Label { Text = "Primary colors" });
-            stackLayout.Add(frame1);
-            stackLayout.Add(frame2);
-            stackLayout.Add(frame3);
+            stackLayout.Add(border1);
+            stackLayout.Add(border2);
+            stackLayout.Add(border3);
             stackLayout.Add(new Label { Text = "Secondary colors" });
-            stackLayout.Add(frame4);
-            stackLayout.Add(frame5);
-            stackLayout.Add(frame6);
+            stackLayout.Add(border4);
+            stackLayout.Add(border5);
+            stackLayout.Add(border6);
 
             Content = stackLayout;
         }
diff --git a/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml b/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
index 5969a6717..9697843fd 100644
--- a/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
+++ b/9.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
@@ -5,8 +5,8 @@
              Title="Combined StackLayouts demo">
     <StackLayout Margin="20">
         <Label Text="Primary colors" />
-        <Frame BorderColor="Black"
-               Padding="5">
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Red"
@@ -15,9 +15,9 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
-        <Frame BorderColor="Black"
-               Padding="5">
+        </Border>
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Yellow"
@@ -26,9 +26,9 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
-        <Frame BorderColor="Black"
-               Padding="5">
+        </Border>
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Blue"
@@ -37,10 +37,10 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
+        </Border>
         <Label Text="Secondary colors" />
-        <Frame BorderColor="Black"
-               Padding="5">
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Green"
@@ -49,9 +49,9 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
-        <Frame BorderColor="Black"
-               Padding="5">
+        </Border>
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Orange"
@@ -60,9 +60,9 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
-        <Frame BorderColor="Black"
-               Padding="5">
+        </Border>
+        <Border Stroke="Black"
+                Padding="5">
             <StackLayout Orientation="Horizontal"
                          Spacing="15">
                 <BoxView Color="Purple"
@@ -71,6 +71,6 @@
                        FontSize="20"
                        VerticalOptions="Center" />
             </StackLayout>
-        </Frame>
+        </Border>
     </StackLayout>
 </ContentPage>
diff --git a/9.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml b/9.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
index 3c5d246b6..87bf6d0ad 100644
--- a/9.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
+++ b/9.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
@@ -17,19 +17,18 @@
                        VerticalOptions="Center"
                        Margin="15"
                        Style="{StaticResource MediumLabelStyle}" />
-                <Frame Margin="10"
-                       CornerRadius="50"
-                       HeightRequest="60"
-                       WidthRequest="60"
-                       IsClippedToBounds="True"
-                       HorizontalOptions="End"
-                       VerticalOptions="Center">
+                <Border Margin="10"
+                        StrokeShape="RoundRectangle 50"
+                        HeightRequest="60"
+                        WidthRequest="60"
+                        HorizontalOptions="End"
+                        VerticalOptions="Center">
                     <Image Grid.Column="1"
                            Margin="-40"
                            Source="monkey.png"
                            HeightRequest="100"
                            WidthRequest="100" />
-                </Frame>
+                </Border>
             </Grid>
             <StackLayout Grid.Row="1"
                          Margin="10">
diff --git a/9.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml b/9.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
index 8e5acd4cd..2ad86b66c 100644
--- a/9.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
+++ b/9.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
@@ -20,19 +20,18 @@
                        VerticalOptions="Center"
                        Margin="15"
                        Style="{StaticResource MediumLabelStyle}" />
-                <Frame Margin="10"
-                       CornerRadius="50"
-                       HeightRequest="60"
-                       WidthRequest="60"
-                       IsClippedToBounds="True"
-                       HorizontalOptions="End"
-                       VerticalOptions="Center">
+                <Border Margin="10"
+                        StrokeShape="RoundRectangle 50"
+                        HeightRequest="60"
+                        WidthRequest="60"
+                        HorizontalOptions="End"
+                        VerticalOptions="Center">
                     <Image Grid.Column="1"
                            Margin="-40"
                            Source="monkey.png"
                            HeightRequest="100"
                            WidthRequest="100" />
-                </Frame>
+                </Border>
             </Grid>
             <StackLayout Grid.Row="1"
                          Margin="10">
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
index 05c39ac46..a7c211cfd 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
@@ -51,13 +51,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -77,7 +77,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
index a67de8be7..cde7e36fd 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
@@ -16,13 +16,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -42,7 +42,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
index 4b4222a2e..da0577b9f 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
@@ -12,13 +12,13 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="300"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
@@ -38,7 +38,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
index 76a3bf566..852d8fe21 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
@@ -49,13 +49,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -75,7 +75,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
index 43916aaef..f96eef06e 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
@@ -30,13 +30,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -56,7 +56,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
index 89f79b7e5..fc605f464 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
@@ -33,13 +33,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -59,7 +59,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
index 1533714fc..607733199 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
@@ -13,13 +13,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -39,7 +39,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
index e1b3d3a0a..646acd65f 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
@@ -20,13 +20,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -46,7 +46,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
index 37574b97c..e9aa431b4 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
@@ -18,13 +18,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -44,7 +44,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
index 1e0e18a18..40abe2510 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
@@ -17,13 +17,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -43,7 +43,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
index 0a93f552d..2667f0a15 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
@@ -41,14 +41,13 @@
                             </VisualState>
                         </VisualStateGroup>
                     </VisualStateManager.VisualStateGroups>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="350"
-                           WidthRequest="150"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
@@ -68,7 +67,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
index bdac58473..f0abc5ea3 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
@@ -8,20 +8,20 @@
     <ContentPage.Resources>
         <DataTemplate x:Key="AmericanMonkeyTemplate">
             <StackLayout>
-                <Frame HasShadow="True"
-                       BorderColor="DarkGray"
-                       CornerRadius="5"
-                       Margin="20"
-                       HeightRequest="300"
-                       HorizontalOptions="Center"
-                       VerticalOptions="Center">
+                <Border Stroke="DarkGray"
+                        StrokeShape="RoundRectangle 5"
+                        Margin="20"
+                        Padding="20"
+                        HeightRequest="360"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center">
                     <StackLayout>
-                        <Label Text="{Binding Name}" 
+                        <Label Text="{Binding Name}"
                                FontAttributes="Bold"
                                FontSize="20"
                                HorizontalOptions="Center"
                                VerticalOptions="Center" />
-                        <Image Source="{Binding ImageUrl}" 
+                        <Image Source="{Binding ImageUrl}"
                                Aspect="AspectFill"
                                HeightRequest="150"
                                WidthRequest="150"
@@ -34,19 +34,19 @@
                                MaxLines="5"
                                LineBreakMode="TailTruncation" />
                     </StackLayout>
-                </Frame>
+                </Border>
             </StackLayout>
         </DataTemplate>
 
         <DataTemplate x:Key="OtherMonkeyTemplate">
             <StackLayout>
-                <Frame HasShadow="True"
-                       BorderColor="DarkGray"
-                       CornerRadius="5"
-                       Margin="20"
-                       HeightRequest="300"
-                       HorizontalOptions="Center"
-                       VerticalOptions="Center">
+                <Border Stroke="DarkGray"
+                        StrokeShape="RoundRectangle 5"
+                        Margin="20"
+                        Padding="20"
+                        HeightRequest="360"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center">
                     <StackLayout>
                         <Label Text="{Binding Name}"
                                TextColor="Silver"
@@ -70,7 +70,7 @@
                                MaxLines="5"
                                LineBreakMode="TailTruncation" />
                     </StackLayout>
-                </Frame>
+                </Border>
             </StackLayout>
         </DataTemplate>
 
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
index 8f7fa7a06..aa5d46ef5 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
@@ -12,14 +12,13 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="350"
-                           WidthRequest="150"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
@@ -39,7 +38,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
index cd1ed22f7..07490f32b 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
@@ -11,13 +11,13 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="300"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
@@ -37,7 +37,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
index f4b3922a6..57ddc9e4a 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
@@ -12,13 +12,13 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="300"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
@@ -38,7 +38,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
index 3307355c3..14673f6c1 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
@@ -14,20 +14,20 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                    <Frame HasShadow="True"
-                           BorderColor="DarkGray"
-                           CornerRadius="5"
-                           Margin="20"
-                           HeightRequest="300"
-                           HorizontalOptions="Center"
-                           VerticalOptions="Center">
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
                         <StackLayout>
-                            <Label Text="{Binding Name}" 
+                            <Label Text="{Binding Name}"
                                    FontAttributes="Bold"
                                    FontSize="20"
                                    HorizontalOptions="Center"
                                    VerticalOptions="Center" />
-                            <Image Source="{Binding ImageUrl}" 
+                            <Image Source="{Binding ImageUrl}"
                                    Aspect="AspectFill"
                                    HeightRequest="150"
                                    WidthRequest="150"
@@ -40,7 +40,7 @@
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
                         </StackLayout>
-                    </Frame>
+                    </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
index e2bd9b8ae..67ba416fc 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
@@ -16,13 +16,13 @@
                 <CarouselView.ItemTemplate>
                     <DataTemplate>
                         <StackLayout>
-                            <Frame HasShadow="True"
-                                   BorderColor="DarkGray"
-                                   CornerRadius="5"
-                                   Margin="20"
-                                   HeightRequest="300"
-                                   HorizontalOptions="Center"
-                                   VerticalOptions="Center">
+                            <Border Stroke="DarkGray"
+                                    StrokeShape="RoundRectangle 5"
+                                    Margin="20"
+                                    Padding="20"
+                                    HeightRequest="360"
+                                    HorizontalOptions="Center"
+                                    VerticalOptions="Center">
                                 <StackLayout>
                                     <Label Text="{Binding Name}" 
                                            FontAttributes="Bold"
@@ -42,7 +42,7 @@
                                            MaxLines="5"
                                            LineBreakMode="TailTruncation" />
                                 </StackLayout>
-                            </Frame>
+                            </Border>
                         </StackLayout>
                     </DataTemplate>
                 </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
index 3c2bc1ce0..8e94d2b32 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
@@ -19,13 +19,13 @@
                 <CarouselView.ItemTemplate>
                     <DataTemplate>
                         <StackLayout>
-                            <Frame HasShadow="True"
-                                   BorderColor="DarkGray"
-                                   CornerRadius="5"
-                                   Margin="20"
-                                   HeightRequest="300"
-                                   HorizontalOptions="Center"
-                                   VerticalOptions="Center">
+                            <Border Stroke="DarkGray"
+                                    StrokeShape="RoundRectangle 5"
+                                    Margin="20"
+                                    Padding="20"
+                                    HeightRequest="360"
+                                    HorizontalOptions="Center"
+                                    VerticalOptions="Center">
                                 <StackLayout>
                                     <Label Text="{Binding Name}" 
                                            FontAttributes="Bold"
@@ -45,7 +45,7 @@
                                            MaxLines="5"
                                            LineBreakMode="TailTruncation" />
                                 </StackLayout>
-                            </Frame>
+                            </Border>
                         </StackLayout>
                     </DataTemplate>
                 </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
index e87f8292a..ff2b6eb4e 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
@@ -16,13 +16,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -42,7 +42,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
index 63765df19..8d3e98f5d 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
@@ -25,13 +25,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                         FontAttributes="Bold"
@@ -51,7 +51,7 @@
                                         MaxLines="5"
                                         LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
index 78423b2ba..112eaf373 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
@@ -32,13 +32,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -58,7 +58,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
index 257d36bcc..5a7d70da7 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
@@ -32,13 +32,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -58,7 +58,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
index 0c27817fc..4750b9702 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
@@ -34,18 +34,19 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Start">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <Image Source="{Binding ImageUrl}" 
                                    Aspect="AspectFit"
                                    HeightRequest="100"
                                    WidthRequest="100"
                                    HorizontalOptions="Center" />
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
index a9c108c1a..687b019aa 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
@@ -9,17 +9,18 @@
     </ContentPage.BindingContext>
     <StackLayout Margin="20">
         <Label Text="Tap each image to dynamically change its size." />
-        <CarouselView ItemsSource="{Binding Monkeys}">
+        <CarouselView ItemsSource="{Binding Monkeys}"
+                      Grid.Row="1">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -43,7 +44,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml.cs b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml.cs
index 84596a427..faca07ad3 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml.cs
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml.cs
@@ -11,8 +11,8 @@ void OnImageTapped(object sender, EventArgs e)
         {
             Image image = sender as Image;
             image.HeightRequest = image.WidthRequest = image.HeightRequest.Equals(150) ? 200 : 150;
-            Frame frame = ((Frame)image.Parent.Parent);
-            frame.HeightRequest = frame.HeightRequest.Equals(300) ? 350 : 300;
+            Border border = ((Border)image.Parent.Parent);
+            border.HeightRequest = border.HeightRequest.Equals(360) ? 410 : 360;
         }
     }
 }
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
index 788f8e4d7..27fc31555 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
@@ -16,13 +16,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -42,7 +42,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
index 5966f5c11..97d94893c 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
@@ -19,13 +19,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGray"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="20"
+                                Padding="20"
+                                HeightRequest="360"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -45,7 +45,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
index 00bbc3421..74400150a 100644
--- a/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
+++ b/9.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
@@ -12,14 +12,14 @@
         <CarouselView.ItemTemplate>
             <DataTemplate>
                 <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="20"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
-                            <SwipeView>
+                    <Border Stroke="DarkGray"
+                            StrokeShape="RoundRectangle 5"
+                            Margin="20"
+                            Padding="20"
+                            HeightRequest="360"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
+                        <SwipeView>
                                 <SwipeView.TopItems>
                                     <SwipeItems>
                                         <SwipeItem Text="Favorite"
@@ -58,7 +58,7 @@
                                            LineBreakMode="TailTruncation" />
                                 </StackLayout>
                             </SwipeView>
-                        </Frame>
+                        </Border>
                 </StackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
index bfe6ed82f..e405d4aca 100644
--- a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
+++ b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
@@ -14,20 +14,20 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="50"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGrey"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="50"
+                                Padding="20"
+                                HeightRequest="340"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
-                                <Label Text="{Binding Name}" 
+                                <Label Text="{Binding Name}"
                                        FontAttributes="Bold"
                                        FontSize="20"
                                        HorizontalOptions="Center"
                                        VerticalOptions="Center" />
-                                <Image Source="{Binding ImageUrl}" 
+                                <Image Source="{Binding ImageUrl}"
                                        Aspect="AspectFill"
                                        HeightRequest="150"
                                        WidthRequest="150"
@@ -40,7 +40,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
index b91edb61c..f44b6fee5 100644
--- a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
+++ b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
@@ -73,19 +73,19 @@
         </Picker>
         <CarouselView Grid.Row="5"
                       Grid.ColumnSpan="2"
-                      HeightRequest="320"
+                      HeightRequest="360"
                       ItemsSource="{Binding Monkeys}"
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="10"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGrey"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="10"
+                                Padding="20"
+                                HeightRequest="340"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -105,7 +105,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
index 71c9420f1..41e3beff1 100644
--- a/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
+++ b/9.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
@@ -39,13 +39,13 @@
             <CarouselView.ItemTemplate>
                 <DataTemplate>
                     <StackLayout>
-                        <Frame HasShadow="True"
-                               BorderColor="DarkGray"
-                               CornerRadius="5"
-                               Margin="50"
-                               HeightRequest="300"
-                               HorizontalOptions="Center"
-                               VerticalOptions="Center">
+                        <Border Stroke="DarkGrey"
+                                StrokeShape="RoundRectangle 5"
+                                Margin="50"
+                                Padding="20"
+                                HeightRequest="340"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
                             <StackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
@@ -65,7 +65,7 @@
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
                             </StackLayout>
-                        </Frame>
+                        </Border>
                     </StackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
diff --git a/9.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml b/9.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
index 8b3568d6b..445961fef 100644
--- a/9.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
+++ b/9.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
@@ -13,22 +13,22 @@
                 <SwipeItems>
                     <SwipeItemView Invoked="OnIncorrectAnswerInvoked">
                         <Grid WidthRequest="100">
-                            <Frame BackgroundColor="DarkGray"
-                                   CornerRadius="30">
+                            <Border Stroke="DarkGray"
+                                    StrokeShape="RoundRectangle 30">
                                 <Label Text="1"
                                        HorizontalOptions="Center"
                                        VerticalOptions="Center" />
-                            </Frame>
+                            </Border>
                         </Grid>
                     </SwipeItemView>
                     <SwipeItemView Invoked="OnCorrectAnswerInvoked">
                         <Grid WidthRequest="100">
-                            <Frame BackgroundColor="DarkGray"
-                                   CornerRadius="30">
+                            <Border Stroke="DarkGray"
+                                    StrokeShape="RoundRectangle 30">
                                 <Label Text="2"
                                        HorizontalOptions="Center"
                                        VerticalOptions="Center" />
-                            </Frame>
+                            </Border>
                         </Grid>
                     </SwipeItemView>
                 </SwipeItems>
diff --git a/9.0/UserInterface/Views/TwoPaneView/MainPage.xaml b/9.0/UserInterface/Views/TwoPaneView/MainPage.xaml
index fd6c33978..b2db008de 100644
--- a/9.0/UserInterface/Views/TwoPaneView/MainPage.xaml
+++ b/9.0/UserInterface/Views/TwoPaneView/MainPage.xaml
@@ -13,7 +13,7 @@
         >
         <foldable:TwoPaneView.Pane1
             BackgroundColor="#dddddd">
-            <Frame BorderColor="Red">
+            <Border Stroke="Red">
                 <StackLayout BackgroundColor="Blue"
                                  Orientation="Vertical"
                                  VerticalOptions="StartAndExpand"
@@ -45,7 +45,7 @@
                     <Label Text="Jetpack Window Manager 1.0.0"/>
                     <Button Text="Reset TwoPaneView" Clicked="OnReset" HorizontalOptions="Center"/>
                 </StackLayout>
-            </Frame>
+            </Border>
         </foldable:TwoPaneView.Pane1>
         <foldable:TwoPaneView.Pane2>
             <ScrollView>