diff --git a/SkiaSharpAPI/SkiaSharp/SKCanvas.xml b/SkiaSharpAPI/SkiaSharp/SKCanvas.xml
index 70c4e31..42fbd77 100644
--- a/SkiaSharpAPI/SkiaSharp/SKCanvas.xml
+++ b/SkiaSharpAPI/SkiaSharp/SKCanvas.xml
@@ -2824,36 +2824,33 @@ using (var surface = SKSurface.Create(info)) {
     canvas.Clear(SKColors.White);
 
     // draw left-aligned text, solid
+    using (var font = new SKFont { Size = 64.0f })
     using (var paint = new SKPaint()) {
-        paint.TextSize = 64.0f;
         paint.IsAntialias = true;
         paint.Color = new SKColor(0x42, 0x81, 0xA4);
         paint.IsStroke = false;
 
-        canvas.DrawText("Skia", info.Width / 2f, 64.0f, paint);
+        canvas.DrawText("Skia", info.Width / 2f, 64.0f, SKTextAlign.Left, font, paint);
     }
 
     // draw centered text, stroked
+    using (var font = new SKFont { Size = 64.0f })
     using (var paint = new SKPaint()) {
-        paint.TextSize = 64.0f;
         paint.IsAntialias = true;
         paint.Color = new SKColor(0x9C, 0xAF, 0xB7);
         paint.IsStroke = true;
         paint.StrokeWidth = 3;
-        paint.TextAlign = SKTextAlign.Center;
 
-        canvas.DrawText("Skia", info.Width / 2f, 144.0f, paint);
+        canvas.DrawText("Skia", info.Width / 2f, 144.0f, SKTextAlign.Center, font, paint);
     }
 
     // draw right-aligned text, scaled
+    using (var font = new SKFont { Size = 64.0f, ScaleX = 1.5f })
     using (var paint = new SKPaint()) {
-        paint.TextSize = 64.0f;
         paint.IsAntialias = true;
         paint.Color = new SKColor(0xE6, 0xB8, 0x9C);
-        paint.TextScaleX = 1.5f;
-        paint.TextAlign = SKTextAlign.Right;
 
-        canvas.DrawText("Skia", info.Width / 2f, 224.0f, paint);
+        canvas.DrawText("Skia", info.Width / 2f, 224.0f, SKTextAlign.Right, font, paint);
     }
 }
 ```
diff --git a/SkiaSharpAPI/SkiaSharp/SKPaint.xml b/SkiaSharpAPI/SkiaSharp/SKPaint.xml
index c4712c9..023295c 100644
--- a/SkiaSharpAPI/SkiaSharp/SKPaint.xml
+++ b/SkiaSharpAPI/SkiaSharp/SKPaint.xml
@@ -62,32 +62,31 @@ using (var surface = SKSurface.Create(info)) {
 
     canvas.Clear(SKColors.White);
 
-    var paint1 = new SKPaint {
-        TextSize = 64.0f,
+    using var font = new SKFont { Size = 64.0f };
+    using var scaledFont = new SKFont { Size = 64.0f, ScaleX = 1.5f };
+
+    using var paint1 = new SKPaint {
         IsAntialias = true,
         Color = new SKColor(255, 0, 0),
         Style = SKPaintStyle.Fill
     };
 
-    var paint2 = new SKPaint {
-        TextSize = 64.0f,
+    using var paint2 = new SKPaint {
         IsAntialias = true,
         Color = new SKColor(0, 136, 0),
         Style = SKPaintStyle.Stroke,
         StrokeWidth = 3
     };
 
-    var paint3 = new SKPaint {
-        TextSize = 64.0f,
+    using var paint3 = new SKPaint {
         IsAntialias = true,
-        Color = new SKColor(136, 136, 136),
-        TextScaleX = 1.5f
+        Color = new SKColor(136, 136, 136)
     };
 
     var text = "Skia!";
-    canvas.DrawText(text, 20.0f, 64.0f, paint1);
-    canvas.DrawText(text, 20.0f, 144.0f, paint2);
-    canvas.DrawText(text, 20.0f, 224.0f, paint3);
+    canvas.DrawText(text, 20.0f, 64.0f, SKTextAlign.Left, font, paint1);
+    canvas.DrawText(text, 20.0f, 144.0f, SKTextAlign.Left, font, paint2);
+    canvas.DrawText(text, 20.0f, 224.0f, SKTextAlign.Left, scaledFont, paint3);
 }
 ```
 
diff --git a/SkiaSharpAPI/SkiaSharp/SKTypeface.xml b/SkiaSharpAPI/SkiaSharp/SKTypeface.xml
index 77d9333..09a33c1 100644
--- a/SkiaSharpAPI/SkiaSharp/SKTypeface.xml
+++ b/SkiaSharpAPI/SkiaSharp/SKTypeface.xml
@@ -715,16 +715,16 @@ using (var surface = SKSurface.Create(info)) {
     canvas.Clear(SKColors.White);
 
     // load the typeface
-    var tf = SKTypeface.FromFile("myfont.ttf");
+    using var tf = SKTypeface.FromFile("myfont.ttf");
 
-    // set the paint's typeface
-    var paint = new SKPaint {
-        TextSize = 50,
-        Typeface = tf
-    };
+    // create a font from the typeface
+    using var font = new SKFont(tf, size: 50);
 
-    // draw text using the typeface
-    canvas.DrawText("SkiaSharp", 50, 100, paint);
+    // create the paint
+    using var paint = new SKPaint { IsAntialias = true };
+
+    // draw text using the font
+    canvas.DrawText("SkiaSharp", 50, 100, SKTextAlign.Left, font, paint);
 }
 ```
 ]]></format>