diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index ae458f52c6..daa6ba69db 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -23,7 +23,7 @@ namespace ControlCatalog
         /// This method is needed for IDE previewer infrastructure
         /// </summary>
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>().LogToDebug().UsePlatformDetect().UseSkia();
+            => AppBuilder.Configure<App>().LogToDebug().UsePlatformDetect();
 
         private static void ConfigureAssetAssembly(AppBuilder builder)
         {
diff --git a/samples/ControlCatalog/Pages/BorderPage.xaml b/samples/ControlCatalog/Pages/BorderPage.xaml
index dc0b05686b..f0705362d7 100644
--- a/samples/ControlCatalog/Pages/BorderPage.xaml
+++ b/samples/ControlCatalog/Pages/BorderPage.xaml
@@ -1,36 +1,32 @@
 <UserControl xmlns="https://github.com/avaloniaui">
-    <StackPanel Orientation="Vertical" Gap="4">
-        <TextBlock Classes="h1">Border</TextBlock>
-        <TextBlock Classes="h2">A control which decorates a child with a border and background</TextBlock>
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">Border</TextBlock>
+    <TextBlock Classes="h2">A control which decorates a child with a border and background</TextBlock>
 
-        <StackPanel Orientation="Vertical"
+    <StackPanel Orientation="Vertical"
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Gap="16">
-            <Border BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="2" Padding="16">
-                <TextBlock>Border</TextBlock>
-            </Border>
-            <Border Background="{DynamicResource ThemeAccentBrush2}" 
-              BorderBrush="{DynamicResource ThemeAccentBrush}" 
-              BorderThickness="4" 
+      <Border BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="2" Padding="16">
+        <TextBlock>Border</TextBlock>
+      </Border>
+      <Border Background="{DynamicResource ThemeAccentBrush2}"
+              BorderBrush="{DynamicResource ThemeAccentBrush}"
+              BorderThickness="4"
               Padding="16">
-                <TextBlock>Border and Background</TextBlock>
-            </Border>
-            <Border BorderBrush="{DynamicResource ThemeAccentBrush}"
-              BorderThickness="4" 
+        <TextBlock>Border and Background</TextBlock>
+      </Border>
+      <Border BorderBrush="{DynamicResource ThemeAccentBrush}"
+              BorderThickness="4"
               CornerRadius="8"
               Padding="16">
-                <TextBlock>Rounded Corners</TextBlock>
-            </Border>
-            <Border Background="{DynamicResource ThemeAccentBrush2}"
+        <TextBlock>Rounded Corners</TextBlock>
+      </Border>
+      <Border Background="{DynamicResource ThemeAccentBrush2}"
               CornerRadius="8"
               Padding="16">
-                <StackPanel>
-                    <TextBlock FontSize="14">Rounded Corners</TextBlock>
-                    <TextBlock FontSize="14" FontFamily="resm:ControlCatalog.Assets.octin_stencil_free.ttf#Octin Stencil Free">Rounded Corners</TextBlock>
-                    <TextBlock FontSize="14" FontFamily="resm:ControlCatalog.Assets.kooten.ttf#Kootenay">Rounded Corners</TextBlock>
-                </StackPanel>
-            </Border>
-        </StackPanel>
+        <TextBlock>Rounded Corners</TextBlock>
+      </Border>
     </StackPanel>
+  </StackPanel>
 </UserControl>
\ No newline at end of file