From 828e89d414f15e55bb929261f147a2e5c33edde7 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:21:06 +0100
Subject: [PATCH 1/6] Using DPs

---
 .../MarkdownTextBlockCustomThemeSample.xaml   |  32 +-
 ...MarkdownTextBlockCustomThemeSample.xaml.cs |  34 +-
 .../MarkdownTextBlockCustomThemeSampleBase.cs |  65 +-
 .../MarkdownTextBlockExampleSample.xaml       |   1 -
 .../MarkdownTextBlockExampleSample.xaml.cs    |   8 -
 .../samples/ThemeOptionsPane.xaml             |   3 -
 .../samples/ThemeOptionsPane.xaml.cs          |   8 -
 .../MarkdownTextBlock/src/HtmlWriter.cs       |   8 +-
 .../MarkdownTextBlock/src/MarkdownConfig.cs   |  15 -
 .../src/MarkdownTextBlock.Properties.cs       | 656 +++++++++++++++++-
 .../src/MarkdownTextBlock.xaml                | 229 +++++-
 .../src/MarkdownTextBlock.xaml.cs             |  95 ++-
 .../MarkdownTextBlock/src/MarkdownThemes.cs   | 133 ----
 .../ObjectRenderers/CodeBlockRenderer.cs      |   2 +-
 .../Extensions/TableRenderer.cs               |   6 +-
 .../ObjectRenderers/HeadingRenderer.cs        |   2 +-
 .../Inlines/AutoLinkInlineRenderer.cs         |   2 +-
 .../Inlines/CodeInlineRenderer.cs             |   2 +-
 .../Inlines/EmphasisInlineRenderer.cs         |   2 +-
 .../Inlines/LinkInlineRenderer.cs             |   6 +-
 .../ObjectRenderers/QuoteBlockRenderer.cs     |   2 +-
 .../ObjectRenderers/ThematicBreakRenderer.cs  |   2 +-
 .../src/Renderers/WinUIRenderer.cs            |   9 +-
 .../src/TextElements/MyAutolinkInline.cs      |   9 +-
 .../src/TextElements/MyCodeBlock.cs           |  23 +-
 .../src/TextElements/MyFlowDocument.cs        |  12 +-
 .../src/TextElements/MyHeading.cs             |  59 +-
 .../src/TextElements/MyHyperlink.cs           |  23 +-
 .../src/TextElements/MyHyperlinkButton.cs     |  17 +-
 .../src/TextElements/MyImage.cs               |  33 +-
 .../src/TextElements/MyInlineCode.cs          |  23 +-
 .../src/TextElements/MyParagraph.cs           |  14 +-
 .../src/TextElements/MyQuote.cs               |  23 +-
 .../src/TextElements/MyTable.cs               |  12 +-
 .../src/TextElements/MyTableCell.cs           |   5 +-
 .../src/TextElements/MyThematicBreak.cs       |  10 +-
 .../tests/ImageProviderConstraintTest.cs      |  45 +-
 37 files changed, 1141 insertions(+), 489 deletions(-)
 delete mode 100644 components/MarkdownTextBlock/src/MarkdownConfig.cs
 delete mode 100644 components/MarkdownTextBlock/src/MarkdownThemes.cs

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
index 326987686..e5455d3a8 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
@@ -11,7 +11,37 @@
     <ScrollViewer>
         <controls:MarkdownTextBlock x:Name="MarkdownTextBlock"
                                     Margin="12"
-                                    Config="{x:Bind MarkdownConfig, Mode=OneWay}"
+                                    H1FontSize="{x:Bind H1FontSize, Mode=OneWay}"
+                                    H1Foreground="{x:Bind GetHeadingBrush(H1ColorIndex), Mode=OneWay}"
+                                    H2FontSize="{x:Bind H2FontSize, Mode=OneWay}"
+                                    H3FontSize="{x:Bind H3FontSize, Mode=OneWay}"
+                                    InlineCodeFontSize="{x:Bind InlineCodeFontSize, Mode=OneWay}"
+                                    InlineCodePadding="{x:Bind GetHorizontalPadding(InlineCodePadding), Mode=OneWay}"
+                                    InlineCodeCornerRadius="{x:Bind GetUniformCornerRadius(InlineCodeCornerRadius), Mode=OneWay}"
+                                    InlineCodeBorderThickness="{x:Bind GetUniformThickness(InlineCodeBorderThickness), Mode=OneWay}"
+                                    InlineCodeForeground="{x:Bind GetInlineCodeBrush(InlineCodeColorIndex), Mode=OneWay}"
+                                    InlineCodeBackground="{x:Bind GetCodeBackgroundBrush(InlineCodeBackgroundColorIndex), Mode=OneWay}"
+                                    InlineCodeBorderBrush="{x:Bind GetCodeBorderBrush(InlineCodeBorderColorIndex), Mode=OneWay}"
+                                    CodeBlockPadding="{x:Bind GetUniformThickness(CodeBlockPadding), Mode=OneWay}"
+                                    CodeBlockCornerRadius="{x:Bind GetUniformCornerRadius(CodeBlockCornerRadius), Mode=OneWay}"
+                                    CodeBlockBorderThickness="{x:Bind GetUniformThickness(CodeBlockBorderThickness), Mode=OneWay}"
+                                    CodeBlockFontFamily="{x:Bind GetCodeFont(CodeBlockFontIndex), Mode=OneWay}"
+                                    CodeBlockBackground="{x:Bind GetCodeBackgroundBrush(CodeBlockBackgroundColorIndex), Mode=OneWay}"
+                                    CodeBlockBorderBrush="{x:Bind GetCodeBorderBrush(CodeBlockBorderColorIndex), Mode=OneWay}"
+                                    QuoteBorderThickness="{x:Bind GetLeftBorderThickness(QuoteBorderWidth), Mode=OneWay}"
+                                    QuotePadding="{x:Bind GetHorizontalPadding(QuotePadding), Mode=OneWay}"
+                                    QuoteCornerRadius="{x:Bind GetRightCornerRadius(QuoteCornerRadius), Mode=OneWay}"
+                                    QuoteBorderBrush="{x:Bind GetQuoteBrush(QuoteColorIndex), Mode=OneWay}"
+                                    TableCellPadding="{x:Bind GetHorizontalPadding(TableCellPadding), Mode=OneWay}"
+                                    TableBorderThickness="{x:Bind TableBorderThickness, Mode=OneWay}"
+                                    HorizontalRuleThickness="{x:Bind HorizontalRuleThickness, Mode=OneWay}"
+                                    HorizontalRuleMargin="{x:Bind GetVerticalMargin(HorizontalRuleMargin), Mode=OneWay}"
+                                    ImageMaxWidth="{x:Bind ImageMaxWidth, Mode=OneWay}"
+                                    ImageMaxHeight="{x:Bind ImageMaxHeight, Mode=OneWay}"
+                                    ImageStretch="{x:Bind GetImageStretch(ImageStretchIndex), Mode=OneWay}"
+                                    BoldFontWeight="{x:Bind GetBoldFontWeight(BoldFontWeightIndex), Mode=OneWay}"
+                                    ListBulletSpacing="{x:Bind ListBulletSpacing, Mode=OneWay}"
+                                    ListGutterWidth="{x:Bind ListGutterWidth, Mode=OneWay}"
                                     Text="{x:Bind MarkdownText, Mode=OneWay}" />
     </ScrollViewer>
 </local:MarkdownTextBlockCustomThemeSampleBase>
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
index 127efbee0..eb83d7024 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.WinUI.Controls;
-
 namespace MarkdownTextBlockExperiment.Samples;
 
 /// <summary>
@@ -12,8 +10,6 @@ namespace MarkdownTextBlockExperiment.Samples;
 [ToolkitSample(id: nameof(MarkdownTextBlockCustomThemeSample), "Custom Theme", description: "A sample showcasing custom theming options with live editing for headings, code blocks, quotes, tables, and more.")]
 public sealed partial class MarkdownTextBlockCustomThemeSample : MarkdownTextBlockCustomThemeSampleBase
 {
-    public MarkdownConfig MarkdownConfig { get; private set; }
-
     public string MarkdownText { get; } = @"
 # Custom Theme Demo
 
@@ -96,7 +92,7 @@ Try adjusting the **Bullet Spacing** and **Gutter Width** settings to see how li
 - Adjust the theme settings in the options panel
   - The gutter width controls how much each level is indented
   - The bullet spacing controls space after the bullet character
-- Click **Apply Changes** to see updates
+- Changes apply live via bindings
 - Use **Reset to Defaults** to start over
 
 Numbered lists work too:
@@ -109,20 +105,24 @@ 1. Deep nesting works
 3. Third item
 ";
 
+    // Converter methods for x:Bind function bindings (must be on the x:Class type, not the base)
+    public Brush GetHeadingBrush(int index) => HeadingColors[Math.Clamp(index, 0, HeadingColors.Length - 1)];
+    public Brush GetInlineCodeBrush(int index) => InlineCodeColors[Math.Clamp(index, 0, InlineCodeColors.Length - 1)];
+    public Brush GetCodeBackgroundBrush(int index) => CodeBackgroundColors[Math.Clamp(index, 0, CodeBackgroundColors.Length - 1)];
+    public Brush GetCodeBorderBrush(int index) => CodeBorderColors[Math.Clamp(index, 0, CodeBorderColors.Length - 1)];
+    public Brush GetQuoteBrush(int index) => QuoteColors[Math.Clamp(index, 0, QuoteColors.Length - 1)];
+    public FontFamily GetCodeFont(int index) => CodeFonts[Math.Clamp(index, 0, CodeFonts.Length - 1)];
+    public Stretch GetImageStretch(int index) => ImageStretchOptions[Math.Clamp(index, 0, ImageStretchOptions.Length - 1)];
+    public Windows.UI.Text.FontWeight GetBoldFontWeight(int index) => BoldFontWeights[Math.Clamp(index, 0, BoldFontWeights.Length - 1)];
+    public Thickness GetUniformThickness(double value) => new Thickness(value);
+    public CornerRadius GetUniformCornerRadius(double value) => new CornerRadius(value);
+    public Thickness GetHorizontalPadding(double value) => new Thickness(value, value / 2, value, value / 2);
+    public Thickness GetLeftBorderThickness(double value) => new Thickness(value, 0, 0, 0);
+    public CornerRadius GetRightCornerRadius(double value) => new CornerRadius(0, value, value, 0);
+    public Thickness GetVerticalMargin(double value) => new Thickness(0, value, 0, value);
+
     public MarkdownTextBlockCustomThemeSample()
     {
-        MarkdownConfig = new MarkdownConfig { Themes = CreateThemes() };
         this.InitializeComponent();
     }
-
-    public override void ApplyTheme()
-    {
-        MarkdownConfig = new MarkdownConfig { Themes = CreateThemes() };
-
-        // Force re-render by toggling text
-        MarkdownTextBlock.Config = MarkdownConfig;
-        var text = MarkdownTextBlock.Text;
-        MarkdownTextBlock.Text = "";
-        MarkdownTextBlock.Text = text;
-    }
 }
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
index c1c49e5d2..4768e7a90 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI;
 using Windows.UI;
 
@@ -14,7 +13,7 @@
 
 namespace MarkdownTextBlockExperiment.Samples;
 
-public abstract partial class MarkdownTextBlockCustomThemeSampleBase : Page
+public partial class MarkdownTextBlockCustomThemeSampleBase : Page
 {
     // Dependency properties for theme customization
     public static readonly DependencyProperty H1FontSizeProperty =
@@ -372,67 +371,7 @@ public double ListGutterWidth
         FontWeights.ExtraBold
     };
 
-    public MarkdownThemes CreateThemes()
-    {
-        return new MarkdownThemes
-        {
-            H1FontSize = H1FontSize,
-            H1FontWeight = FontWeights.Bold,
-            H1Foreground = HeadingColors[H1ColorIndex],
-            H1Margin = new Thickness(0, 20, 0, 10),
-
-            H2FontSize = H2FontSize,
-            H2FontWeight = FontWeights.SemiBold,
-            H2Foreground = new SolidColorBrush(Colors.MediumSlateBlue),
-
-            H3FontSize = H3FontSize,
-            H3FontWeight = FontWeights.SemiBold,
-            H3Foreground = new SolidColorBrush(Colors.MediumPurple),
-
-            InlineCodeFontSize = InlineCodeFontSize,
-            InlineCodePadding = new Thickness(InlineCodePadding, InlineCodePadding / 2, InlineCodePadding, InlineCodePadding / 2),
-            InlineCodeCornerRadius = new CornerRadius(InlineCodeCornerRadius),
-            InlineCodeBorderThickness = new Thickness(InlineCodeBorderThickness),
-            InlineCodeForeground = InlineCodeColors[InlineCodeColorIndex],
-            InlineCodeBackground = CodeBackgroundColors[InlineCodeBackgroundColorIndex],
-            InlineCodeBorderBrush = CodeBorderColors[InlineCodeBorderColorIndex],
-
-            CodeBlockPadding = new Thickness(CodeBlockPadding),
-            CodeBlockCornerRadius = new CornerRadius(CodeBlockCornerRadius),
-            CodeBlockBorderThickness = new Thickness(CodeBlockBorderThickness),
-            CodeBlockFontFamily = CodeFonts[CodeBlockFontIndex],
-            CodeBlockBackground = CodeBackgroundColors[CodeBlockBackgroundColorIndex],
-            CodeBlockForeground = new SolidColorBrush(Colors.LightGreen),
-            CodeBlockBorderBrush = CodeBorderColors[CodeBlockBorderColorIndex],
-
-            QuoteBorderThickness = new Thickness(QuoteBorderWidth, 0, 0, 0),
-            QuotePadding = new Thickness(QuotePadding, QuotePadding / 2, QuotePadding, QuotePadding / 2),
-            QuoteCornerRadius = new CornerRadius(0, QuoteCornerRadius, QuoteCornerRadius, 0),
-            QuoteBorderBrush = QuoteColors[QuoteColorIndex],
-            QuoteBackground = new SolidColorBrush(Color.FromArgb(20, 100, 149, 237)),
-            QuoteForeground = new SolidColorBrush(Colors.CornflowerBlue),
-
-            TableCellPadding = new Thickness(TableCellPadding, TableCellPadding / 2, TableCellPadding, TableCellPadding / 2),
-            TableBorderThickness = TableBorderThickness,
-            TableBorderBrush = new SolidColorBrush(Colors.SlateGray),
-            TableHeadingBackground = new SolidColorBrush(Color.FromArgb(40, 100, 149, 237)),
 
-            HorizontalRuleThickness = HorizontalRuleThickness,
-            HorizontalRuleMargin = new Thickness(0, HorizontalRuleMargin, 0, HorizontalRuleMargin),
-            HorizontalRuleBrush = new SolidColorBrush(Colors.MediumSlateBlue),
-
-            LinkForeground = new SolidColorBrush(Colors.DeepSkyBlue),
-
-            ImageMaxWidth = ImageMaxWidth,
-            ImageMaxHeight = ImageMaxHeight,
-            ImageStretch = ImageStretchOptions[ImageStretchIndex],
-
-            BoldFontWeight = BoldFontWeights[BoldFontWeightIndex],
-
-            ListBulletSpacing = ListBulletSpacing,
-            ListGutterWidth = ListGutterWidth,
-        };
-    }
 
     public void ResetToDefaults()
     {
@@ -476,6 +415,4 @@ public void ResetToDefaults()
         ListBulletSpacing = 4;
         ListGutterWidth = 30;
     }
-
-    public abstract void ApplyTheme();
 }
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml
index 043e52c46..ad89fdf6f 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml
@@ -11,7 +11,6 @@
     <ScrollViewer>
         <controls:MarkdownTextBlock x:Name="MarkdownTextBlock"
                                     Margin="12"
-                                    Config="{x:Bind MarkdownConfig, Mode=OneTime}"
                                     DisableHtml="{x:Bind DisableHtml, Mode=OneWay}"
                                     Text="{x:Bind Text, Mode=OneTime}"
                                     UseAutoLinks="{x:Bind UseAutoLinks, Mode=OneWay}"
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml.cs
index 0e5019958..9fc39fcde 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml.cs
@@ -20,7 +20,6 @@ namespace MarkdownTextBlockExperiment.Samples;
 [ToolkitSample(id: nameof(MarkdownTextBlockExampleSample), "Full Example", description: $"A comprehensive example showcasing all the features and capabilities of the {nameof(CommunityToolkit.WinUI.Controls.MarkdownTextBlock)} control with various markdown syntax.")]
 public sealed partial class MarkdownTextBlockExampleSample : Page
 {
-    private MarkdownConfig _config;
     private string _text;
     private const string _markdown = @"
 This control was originally written by [Nero Cui](https://github.com/nerocui) for [JitHub](https://github.com/JitHubApp/JitHubV2). The control is powered by the popular [Markdig](https://github.com/xoofx/markdig) markdown parsing library and *almost* supports the full markdown syntax, with a focus on super-efficient parsing and rendering.
@@ -585,12 +584,6 @@ results in
 Source: https://www.reddit.com/r/reddit.com/comments/6ewgt/reddit_markdown_primer_or_how_do_you_do_all_that/c03nik6
 ";
 
-    public MarkdownConfig MarkdownConfig
-    {
-        get => _config;
-        set => _config = value;
-    }
-
     public string Text
     {
         get => _text;
@@ -600,7 +593,6 @@ public string Text
     public MarkdownTextBlockExampleSample()
     {
         this.InitializeComponent();
-        _config = new MarkdownConfig();
         _text = _markdown;
         MarkdownTextBlock.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;
     }
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
index 4946ef686..99f2f1c44 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
@@ -15,9 +15,6 @@
                         Spacing="8">
                 <Button Click="ResetTheme_Click"
                         Content="Reset to Defaults" />
-                <Button Click="ApplyTheme_Click"
-                        Content="Apply Changes"
-                        Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
 
             <!--  Headings Section  -->
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
index ab3c798dc..57fd101e8 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
@@ -140,12 +140,6 @@ private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         SyncValuesToSample();
     }
 
-    private void ApplyTheme_Click(object sender, RoutedEventArgs e)
-    {
-        SyncValuesToSample();
-        _sample.ApplyTheme();
-    }
-
     private void ResetTheme_Click(object sender, RoutedEventArgs e)
     {
         _sample.ResetToDefaults();
@@ -153,7 +147,5 @@ private void ResetTheme_Click(object sender, RoutedEventArgs e)
         _isInitializing = true;
         LoadValuesFromSample();
         _isInitializing = false;
-
-        _sample.ApplyTheme();
     }
 }
diff --git a/components/MarkdownTextBlock/src/HtmlWriter.cs b/components/MarkdownTextBlock/src/HtmlWriter.cs
index a094b506c..8cf56c7ba 100644
--- a/components/MarkdownTextBlock/src/HtmlWriter.cs
+++ b/components/MarkdownTextBlock/src/HtmlWriter.cs
@@ -33,7 +33,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                     IAddChild hyperLink;
                     if (node.ChildNodes.Any(n => n.Name != "#text"))
                     {
-                        var myHyperlinkButton = new MyHyperlinkButton(node, renderer.Config.BaseUrl, renderer.Config.Themes);
+                        var myHyperlinkButton = new MyHyperlinkButton(node, renderer.MarkdownTextBlock);
                         myHyperlinkButton.ClickEvent += (sender, e) =>
                         {
                             var button = (HyperlinkButton)sender;
@@ -48,7 +48,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                     }
                     else
                     {
-                        var myHyperlink = new MyHyperlink(node, renderer.Config.BaseUrl, renderer.Config.Themes);
+                        var myHyperlink = new MyHyperlink(node, renderer.MarkdownTextBlock);
                         myHyperlink.ClickEvent += (sender, e) =>
                         {
                             var uri = sender.NavigateUri;
@@ -66,7 +66,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                 }
                 else if (inlineTagName == "img")
                 {
-                    var image = new MyImage(node, renderer.Config);
+                    var image = new MyImage(node, renderer.MarkdownTextBlock);
                     renderer.WriteInline(image);
                 }
                 else
@@ -90,7 +90,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                 }
                 else if (tag.IsHeading())
                 {
-                    var heading = new MyHeading(node, renderer.Config);
+                    var heading = new MyHeading(node, renderer.MarkdownTextBlock);
                     renderer.Push(heading);
                     WriteHtml(renderer, node.ChildNodes);
                 }
diff --git a/components/MarkdownTextBlock/src/MarkdownConfig.cs b/components/MarkdownTextBlock/src/MarkdownConfig.cs
deleted file mode 100644
index d04187c2d..000000000
--- a/components/MarkdownTextBlock/src/MarkdownConfig.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace CommunityToolkit.WinUI.Controls;
-
-public record MarkdownConfig
-{
-    public string? BaseUrl { get; set; }
-    public IImageProvider? ImageProvider { get; set; }
-    public ISVGRenderer? SVGRenderer { get; set; }
-    public MarkdownThemes Themes { get; set; } = MarkdownThemes.Default;
-
-    public static MarkdownConfig Default = new();
-}
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
index 06ad510cc..efad7561c 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
@@ -4,18 +4,46 @@
 
 using Markdig.Syntax;
 
+#if !WINAPPSDK
+using FontWeight = Windows.UI.Text.FontWeight;
+using FontWeights = Windows.UI.Text.FontWeights;
+#else
+using FontWeight = Windows.UI.Text.FontWeight;
+using FontWeights = Microsoft.UI.Text.FontWeights;
+#endif
+
 namespace CommunityToolkit.WinUI.Controls;
 
 public partial class MarkdownTextBlock
 {
     /// <summary>
-    /// Identifies the <see cref="Config"/> dependency property.
+    /// Identifies the <see cref="BaseUrl"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BaseUrlProperty = DependencyProperty.Register(
+        nameof(BaseUrl),
+        typeof(string),
+        typeof(MarkdownTextBlock),
+        new PropertyMetadata(null)
+    );
+
+    /// <summary>
+    /// Identifies the <see cref="ImageProvider"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ImageProviderProperty = DependencyProperty.Register(
+        nameof(ImageProvider),
+        typeof(IImageProvider),
+        typeof(MarkdownTextBlock),
+        new PropertyMetadata(null)
+    );
+
+    /// <summary>
+    /// Identifies the <see cref="SVGRenderer"/> dependency property.
     /// </summary>
-    private static readonly DependencyProperty ConfigProperty = DependencyProperty.Register(
-        nameof(Config),
-        typeof(MarkdownConfig),
+    public static readonly DependencyProperty SVGRendererProperty = DependencyProperty.Register(
+        nameof(SVGRenderer),
+        typeof(ISVGRenderer),
         typeof(MarkdownTextBlock),
-        new PropertyMetadata(new MarkdownConfig(), OnConfigChanged)
+        new PropertyMetadata(null)
     );
 
     /// <summary>
@@ -125,10 +153,473 @@ private static void OnIsTextSelectionEnabledChanged(DependencyObject d, Dependen
         }
     }
 
-    public MarkdownConfig Config
+    // ── Theme DPs ───────────────────────────────────────────────────────
+    // Defaults come from the XAML style. C# defaults are type-appropriate
+    // fallbacks only. The shared property-changed callback batches multiple
+    // simultaneous DP updates (e.g. theme switch) into a single re-render.
+
+    private static void OnThemePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        get => (MarkdownConfig)GetValue(ConfigProperty);
-        set => SetValue(ConfigProperty, value);
+        if (d is MarkdownTextBlock self && !self._themePropertyChangeQueued)
+        {
+            self._themePropertyChangeQueued = true;
+            self.DispatcherQueue.TryEnqueue(() =>
+            {
+                self._themePropertyChangeQueued = false;
+                self.ApplyText(true);
+            });
+        }
+    }
+
+    // ── Heading font sizes ──────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="H1FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H1FontSizeProperty =
+        DependencyProperty.Register(nameof(H1FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H2FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H2FontSizeProperty =
+        DependencyProperty.Register(nameof(H2FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H3FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H3FontSizeProperty =
+        DependencyProperty.Register(nameof(H3FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H4FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H4FontSizeProperty =
+        DependencyProperty.Register(nameof(H4FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H5FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H5FontSizeProperty =
+        DependencyProperty.Register(nameof(H5FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H6FontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H6FontSizeProperty =
+        DependencyProperty.Register(nameof(H6FontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    // ── Heading foregrounds ─────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="H1Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H1ForegroundProperty =
+        DependencyProperty.Register(nameof(H1Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H2Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H2ForegroundProperty =
+        DependencyProperty.Register(nameof(H2Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H3Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H3ForegroundProperty =
+        DependencyProperty.Register(nameof(H3Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H4Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H4ForegroundProperty =
+        DependencyProperty.Register(nameof(H4Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H5Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H5ForegroundProperty =
+        DependencyProperty.Register(nameof(H5Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H6Foreground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H6ForegroundProperty =
+        DependencyProperty.Register(nameof(H6Foreground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    // ── Heading font weights ────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="H1FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H1FontWeightProperty =
+        DependencyProperty.Register(nameof(H1FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H2FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H2FontWeightProperty =
+        DependencyProperty.Register(nameof(H2FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H3FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H3FontWeightProperty =
+        DependencyProperty.Register(nameof(H3FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H4FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H4FontWeightProperty =
+        DependencyProperty.Register(nameof(H4FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H5FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H5FontWeightProperty =
+        DependencyProperty.Register(nameof(H5FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H6FontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H6FontWeightProperty =
+        DependencyProperty.Register(nameof(H6FontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    // ── Heading margins ─────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="H1Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H1MarginProperty =
+        DependencyProperty.Register(nameof(H1Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H2Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H2MarginProperty =
+        DependencyProperty.Register(nameof(H2Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H3Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H3MarginProperty =
+        DependencyProperty.Register(nameof(H3Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H4Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H4MarginProperty =
+        DependencyProperty.Register(nameof(H4Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H5Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H5MarginProperty =
+        DependencyProperty.Register(nameof(H5Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="H6Margin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty H6MarginProperty =
+        DependencyProperty.Register(nameof(H6Margin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    // ── Inline code ─────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeBackground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeBackgroundProperty =
+        DependencyProperty.Register(nameof(InlineCodeBackground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeForeground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeForegroundProperty =
+        DependencyProperty.Register(nameof(InlineCodeForeground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeBorderBrush"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeBorderBrushProperty =
+        DependencyProperty.Register(nameof(InlineCodeBorderBrush), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeBorderThickness"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeBorderThicknessProperty =
+        DependencyProperty.Register(nameof(InlineCodeBorderThickness), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeCornerRadius"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeCornerRadiusProperty =
+        DependencyProperty.Register(nameof(InlineCodeCornerRadius), typeof(CornerRadius), typeof(MarkdownTextBlock), new PropertyMetadata(default(CornerRadius), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodePadding"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodePaddingProperty =
+        DependencyProperty.Register(nameof(InlineCodePadding), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeFontSize"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeFontSizeProperty =
+        DependencyProperty.Register(nameof(InlineCodeFontSize), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="InlineCodeFontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty InlineCodeFontWeightProperty =
+        DependencyProperty.Register(nameof(InlineCodeFontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    // ── Bold ────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="BoldFontWeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BoldFontWeightProperty =
+        DependencyProperty.Register(nameof(BoldFontWeight), typeof(FontWeight), typeof(MarkdownTextBlock), new PropertyMetadata(default(FontWeight), OnThemePropertyChanged));
+
+    // ── Code block ──────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockBackground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockBackgroundProperty =
+        DependencyProperty.Register(nameof(CodeBlockBackground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockBorderBrush"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockBorderBrushProperty =
+        DependencyProperty.Register(nameof(CodeBlockBorderBrush), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockForeground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockForegroundProperty =
+        DependencyProperty.Register(nameof(CodeBlockForeground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockBorderThickness"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockBorderThicknessProperty =
+        DependencyProperty.Register(nameof(CodeBlockBorderThickness), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockPadding"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockPaddingProperty =
+        DependencyProperty.Register(nameof(CodeBlockPadding), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockMarginProperty =
+        DependencyProperty.Register(nameof(CodeBlockMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockFontFamily"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockFontFamilyProperty =
+        DependencyProperty.Register(nameof(CodeBlockFontFamily), typeof(FontFamily), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="CodeBlockCornerRadius"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CodeBlockCornerRadiusProperty =
+        DependencyProperty.Register(nameof(CodeBlockCornerRadius), typeof(CornerRadius), typeof(MarkdownTextBlock), new PropertyMetadata(default(CornerRadius), OnThemePropertyChanged));
+
+    // ── Horizontal rule ─────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="HorizontalRuleBrush"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HorizontalRuleBrushProperty =
+        DependencyProperty.Register(nameof(HorizontalRuleBrush), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="HorizontalRuleThickness"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HorizontalRuleThicknessProperty =
+        DependencyProperty.Register(nameof(HorizontalRuleThickness), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="HorizontalRuleMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HorizontalRuleMarginProperty =
+        DependencyProperty.Register(nameof(HorizontalRuleMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="HorizontalRuleX2"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty HorizontalRuleX2Property =
+        DependencyProperty.Register(nameof(HorizontalRuleX2), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    // ── Link ────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="LinkForeground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty LinkForegroundProperty =
+        DependencyProperty.Register(nameof(LinkForeground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    // ── Paragraph / list ────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="ParagraphMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ParagraphMarginProperty =
+        DependencyProperty.Register(nameof(ParagraphMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="ParagraphLineHeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ParagraphLineHeightProperty =
+        DependencyProperty.Register(nameof(ParagraphLineHeight), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="ListBulletSpacing"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ListBulletSpacingProperty =
+        DependencyProperty.Register(nameof(ListBulletSpacing), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="ListGutterWidth"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ListGutterWidthProperty =
+        DependencyProperty.Register(nameof(ListGutterWidth), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    // ── Quote ───────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteBackground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteBackgroundProperty =
+        DependencyProperty.Register(nameof(QuoteBackground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteBorderBrush"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteBorderBrushProperty =
+        DependencyProperty.Register(nameof(QuoteBorderBrush), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteForeground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteForegroundProperty =
+        DependencyProperty.Register(nameof(QuoteForeground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteBorderThickness"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteBorderThicknessProperty =
+        DependencyProperty.Register(nameof(QuoteBorderThickness), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteMarginProperty =
+        DependencyProperty.Register(nameof(QuoteMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuotePadding"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuotePaddingProperty =
+        DependencyProperty.Register(nameof(QuotePadding), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteBarMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteBarMarginProperty =
+        DependencyProperty.Register(nameof(QuoteBarMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="QuoteCornerRadius"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty QuoteCornerRadiusProperty =
+        DependencyProperty.Register(nameof(QuoteCornerRadius), typeof(CornerRadius), typeof(MarkdownTextBlock), new PropertyMetadata(default(CornerRadius), OnThemePropertyChanged));
+
+    // ── Image ───────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="ImageMaxWidth"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ImageMaxWidthProperty =
+        DependencyProperty.Register(nameof(ImageMaxWidth), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="ImageMaxHeight"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ImageMaxHeightProperty =
+        DependencyProperty.Register(nameof(ImageMaxHeight), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="ImageStretch"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ImageStretchProperty =
+        DependencyProperty.Register(nameof(ImageStretch), typeof(Stretch), typeof(MarkdownTextBlock), new PropertyMetadata(default(Stretch), OnThemePropertyChanged));
+
+    // ── Table ───────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Identifies the <see cref="TableHeadingBackground"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableHeadingBackgroundProperty =
+        DependencyProperty.Register(nameof(TableHeadingBackground), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="TableBorderBrush"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableBorderBrushProperty =
+        DependencyProperty.Register(nameof(TableBorderBrush), typeof(Brush), typeof(MarkdownTextBlock), new PropertyMetadata(null, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="TableBorderThickness"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableBorderThicknessProperty =
+        DependencyProperty.Register(nameof(TableBorderThickness), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="TableCellPadding"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableCellPaddingProperty =
+        DependencyProperty.Register(nameof(TableCellPadding), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="TableMargin"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableMarginProperty =
+        DependencyProperty.Register(nameof(TableMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
+
+    /// <summary>
+    /// Identifies the <see cref="TableCornerRadius"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TableCornerRadiusProperty =
+        DependencyProperty.Register(nameof(TableCornerRadius), typeof(CornerRadius), typeof(MarkdownTextBlock), new PropertyMetadata(default(CornerRadius), OnThemePropertyChanged));
+
+    // ── CLR property wrappers ───────────────────────────────────────────
+
+    /// <summary>Gets or sets the base URL for resolving relative links.</summary>
+    public string? BaseUrl
+    {
+        get => (string?)GetValue(BaseUrlProperty);
+        set => SetValue(BaseUrlProperty, value);
+    }
+
+    /// <summary>Gets or sets the custom image provider.</summary>
+    public IImageProvider? ImageProvider
+    {
+        get => (IImageProvider?)GetValue(ImageProviderProperty);
+        set => SetValue(ImageProviderProperty, value);
+    }
+
+    /// <summary>Gets or sets the SVG renderer.</summary>
+    public ISVGRenderer? SVGRenderer
+    {
+        get => (ISVGRenderer?)GetValue(SVGRendererProperty);
+        set => SetValue(SVGRendererProperty, value);
     }
 
     /// <summary>
@@ -229,4 +720,153 @@ public bool IsTextSelectionEnabled
         get => (bool)GetValue(IsTextSelectionEnabledProperty);
         set => SetValue(IsTextSelectionEnabledProperty, value);
     }
+
+    // ── Theme property CLR wrappers ─────────────────────────────────────
+
+    /// <summary>Gets or sets the font size for H1 headings.</summary>
+    public double H1FontSize { get => (double)GetValue(H1FontSizeProperty); set => SetValue(H1FontSizeProperty, value); }
+    /// <summary>Gets or sets the font size for H2 headings.</summary>
+    public double H2FontSize { get => (double)GetValue(H2FontSizeProperty); set => SetValue(H2FontSizeProperty, value); }
+    /// <summary>Gets or sets the font size for H3 headings.</summary>
+    public double H3FontSize { get => (double)GetValue(H3FontSizeProperty); set => SetValue(H3FontSizeProperty, value); }
+    /// <summary>Gets or sets the font size for H4 headings.</summary>
+    public double H4FontSize { get => (double)GetValue(H4FontSizeProperty); set => SetValue(H4FontSizeProperty, value); }
+    /// <summary>Gets or sets the font size for H5 headings.</summary>
+    public double H5FontSize { get => (double)GetValue(H5FontSizeProperty); set => SetValue(H5FontSizeProperty, value); }
+    /// <summary>Gets or sets the font size for H6 headings.</summary>
+    public double H6FontSize { get => (double)GetValue(H6FontSizeProperty); set => SetValue(H6FontSizeProperty, value); }
+
+    /// <summary>Gets or sets the foreground brush for H1 headings.</summary>
+    public Brush H1Foreground { get => (Brush)GetValue(H1ForegroundProperty); set => SetValue(H1ForegroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for H2 headings.</summary>
+    public Brush H2Foreground { get => (Brush)GetValue(H2ForegroundProperty); set => SetValue(H2ForegroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for H3 headings.</summary>
+    public Brush H3Foreground { get => (Brush)GetValue(H3ForegroundProperty); set => SetValue(H3ForegroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for H4 headings.</summary>
+    public Brush H4Foreground { get => (Brush)GetValue(H4ForegroundProperty); set => SetValue(H4ForegroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for H5 headings.</summary>
+    public Brush H5Foreground { get => (Brush)GetValue(H5ForegroundProperty); set => SetValue(H5ForegroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for H6 headings.</summary>
+    public Brush H6Foreground { get => (Brush)GetValue(H6ForegroundProperty); set => SetValue(H6ForegroundProperty, value); }
+
+    /// <summary>Gets or sets the font weight for H1 headings.</summary>
+    public FontWeight H1FontWeight { get => (FontWeight)GetValue(H1FontWeightProperty); set => SetValue(H1FontWeightProperty, value); }
+    /// <summary>Gets or sets the font weight for H2 headings.</summary>
+    public FontWeight H2FontWeight { get => (FontWeight)GetValue(H2FontWeightProperty); set => SetValue(H2FontWeightProperty, value); }
+    /// <summary>Gets or sets the font weight for H3 headings.</summary>
+    public FontWeight H3FontWeight { get => (FontWeight)GetValue(H3FontWeightProperty); set => SetValue(H3FontWeightProperty, value); }
+    /// <summary>Gets or sets the font weight for H4 headings.</summary>
+    public FontWeight H4FontWeight { get => (FontWeight)GetValue(H4FontWeightProperty); set => SetValue(H4FontWeightProperty, value); }
+    /// <summary>Gets or sets the font weight for H5 headings.</summary>
+    public FontWeight H5FontWeight { get => (FontWeight)GetValue(H5FontWeightProperty); set => SetValue(H5FontWeightProperty, value); }
+    /// <summary>Gets or sets the font weight for H6 headings.</summary>
+    public FontWeight H6FontWeight { get => (FontWeight)GetValue(H6FontWeightProperty); set => SetValue(H6FontWeightProperty, value); }
+
+    /// <summary>Gets or sets the margin for H1 headings.</summary>
+    public Thickness H1Margin { get => (Thickness)GetValue(H1MarginProperty); set => SetValue(H1MarginProperty, value); }
+    /// <summary>Gets or sets the margin for H2 headings.</summary>
+    public Thickness H2Margin { get => (Thickness)GetValue(H2MarginProperty); set => SetValue(H2MarginProperty, value); }
+    /// <summary>Gets or sets the margin for H3 headings.</summary>
+    public Thickness H3Margin { get => (Thickness)GetValue(H3MarginProperty); set => SetValue(H3MarginProperty, value); }
+    /// <summary>Gets or sets the margin for H4 headings.</summary>
+    public Thickness H4Margin { get => (Thickness)GetValue(H4MarginProperty); set => SetValue(H4MarginProperty, value); }
+    /// <summary>Gets or sets the margin for H5 headings.</summary>
+    public Thickness H5Margin { get => (Thickness)GetValue(H5MarginProperty); set => SetValue(H5MarginProperty, value); }
+    /// <summary>Gets or sets the margin for H6 headings.</summary>
+    public Thickness H6Margin { get => (Thickness)GetValue(H6MarginProperty); set => SetValue(H6MarginProperty, value); }
+
+    /// <summary>Gets or sets the background brush for inline code.</summary>
+    public Brush InlineCodeBackground { get => (Brush)GetValue(InlineCodeBackgroundProperty); set => SetValue(InlineCodeBackgroundProperty, value); }
+    /// <summary>Gets or sets the foreground brush for inline code.</summary>
+    public Brush InlineCodeForeground { get => (Brush)GetValue(InlineCodeForegroundProperty); set => SetValue(InlineCodeForegroundProperty, value); }
+    /// <summary>Gets or sets the border brush for inline code.</summary>
+    public Brush InlineCodeBorderBrush { get => (Brush)GetValue(InlineCodeBorderBrushProperty); set => SetValue(InlineCodeBorderBrushProperty, value); }
+    /// <summary>Gets or sets the border thickness for inline code.</summary>
+    public Thickness InlineCodeBorderThickness { get => (Thickness)GetValue(InlineCodeBorderThicknessProperty); set => SetValue(InlineCodeBorderThicknessProperty, value); }
+    /// <summary>Gets or sets the corner radius for inline code.</summary>
+    public CornerRadius InlineCodeCornerRadius { get => (CornerRadius)GetValue(InlineCodeCornerRadiusProperty); set => SetValue(InlineCodeCornerRadiusProperty, value); }
+    /// <summary>Gets or sets the padding for inline code.</summary>
+    public Thickness InlineCodePadding { get => (Thickness)GetValue(InlineCodePaddingProperty); set => SetValue(InlineCodePaddingProperty, value); }
+    /// <summary>Gets or sets the font size for inline code.</summary>
+    public double InlineCodeFontSize { get => (double)GetValue(InlineCodeFontSizeProperty); set => SetValue(InlineCodeFontSizeProperty, value); }
+    /// <summary>Gets or sets the font weight for inline code.</summary>
+    public FontWeight InlineCodeFontWeight { get => (FontWeight)GetValue(InlineCodeFontWeightProperty); set => SetValue(InlineCodeFontWeightProperty, value); }
+
+    /// <summary>Gets or sets the font weight used for bold text.</summary>
+    public FontWeight BoldFontWeight { get => (FontWeight)GetValue(BoldFontWeightProperty); set => SetValue(BoldFontWeightProperty, value); }
+
+    /// <summary>Gets or sets the background brush for code blocks.</summary>
+    public Brush CodeBlockBackground { get => (Brush)GetValue(CodeBlockBackgroundProperty); set => SetValue(CodeBlockBackgroundProperty, value); }
+    /// <summary>Gets or sets the border brush for code blocks.</summary>
+    public Brush CodeBlockBorderBrush { get => (Brush)GetValue(CodeBlockBorderBrushProperty); set => SetValue(CodeBlockBorderBrushProperty, value); }
+    /// <summary>Gets or sets the foreground brush for code blocks.</summary>
+    public Brush CodeBlockForeground { get => (Brush)GetValue(CodeBlockForegroundProperty); set => SetValue(CodeBlockForegroundProperty, value); }
+    /// <summary>Gets or sets the border thickness for code blocks.</summary>
+    public Thickness CodeBlockBorderThickness { get => (Thickness)GetValue(CodeBlockBorderThicknessProperty); set => SetValue(CodeBlockBorderThicknessProperty, value); }
+    /// <summary>Gets or sets the padding for code blocks.</summary>
+    public Thickness CodeBlockPadding { get => (Thickness)GetValue(CodeBlockPaddingProperty); set => SetValue(CodeBlockPaddingProperty, value); }
+    /// <summary>Gets or sets the margin for code blocks.</summary>
+    public Thickness CodeBlockMargin { get => (Thickness)GetValue(CodeBlockMarginProperty); set => SetValue(CodeBlockMarginProperty, value); }
+    /// <summary>Gets or sets the font family for code blocks.</summary>
+    public FontFamily CodeBlockFontFamily { get => (FontFamily)GetValue(CodeBlockFontFamilyProperty); set => SetValue(CodeBlockFontFamilyProperty, value); }
+    /// <summary>Gets or sets the corner radius for code blocks.</summary>
+    public CornerRadius CodeBlockCornerRadius { get => (CornerRadius)GetValue(CodeBlockCornerRadiusProperty); set => SetValue(CodeBlockCornerRadiusProperty, value); }
+
+    /// <summary>Gets or sets the brush for horizontal rules.</summary>
+    public Brush HorizontalRuleBrush { get => (Brush)GetValue(HorizontalRuleBrushProperty); set => SetValue(HorizontalRuleBrushProperty, value); }
+    /// <summary>Gets or sets the thickness of horizontal rules.</summary>
+    public double HorizontalRuleThickness { get => (double)GetValue(HorizontalRuleThicknessProperty); set => SetValue(HorizontalRuleThicknessProperty, value); }
+    /// <summary>Gets or sets the margin around horizontal rules.</summary>
+    public Thickness HorizontalRuleMargin { get => (Thickness)GetValue(HorizontalRuleMarginProperty); set => SetValue(HorizontalRuleMarginProperty, value); }
+    /// <summary>Gets or sets the X2 endpoint coordinate for horizontal rules.</summary>
+    public double HorizontalRuleX2 { get => (double)GetValue(HorizontalRuleX2Property); set => SetValue(HorizontalRuleX2Property, value); }
+
+    /// <summary>Gets or sets the foreground brush for hyperlinks.</summary>
+    public Brush LinkForeground { get => (Brush)GetValue(LinkForegroundProperty); set => SetValue(LinkForegroundProperty, value); }
+
+    /// <summary>Gets or sets the margin for paragraphs.</summary>
+    public Thickness ParagraphMargin { get => (Thickness)GetValue(ParagraphMarginProperty); set => SetValue(ParagraphMarginProperty, value); }
+    /// <summary>Gets or sets the line height for paragraphs.</summary>
+    public double ParagraphLineHeight { get => (double)GetValue(ParagraphLineHeightProperty); set => SetValue(ParagraphLineHeightProperty, value); }
+    /// <summary>Gets or sets the spacing after list bullets.</summary>
+    public double ListBulletSpacing { get => (double)GetValue(ListBulletSpacingProperty); set => SetValue(ListBulletSpacingProperty, value); }
+    /// <summary>Gets or sets the gutter width for list indentation.</summary>
+    public double ListGutterWidth { get => (double)GetValue(ListGutterWidthProperty); set => SetValue(ListGutterWidthProperty, value); }
+
+    /// <summary>Gets or sets the background brush for block quotes.</summary>
+    public Brush QuoteBackground { get => (Brush)GetValue(QuoteBackgroundProperty); set => SetValue(QuoteBackgroundProperty, value); }
+    /// <summary>Gets or sets the border brush for block quotes.</summary>
+    public Brush QuoteBorderBrush { get => (Brush)GetValue(QuoteBorderBrushProperty); set => SetValue(QuoteBorderBrushProperty, value); }
+    /// <summary>Gets or sets the foreground brush for block quotes.</summary>
+    public Brush QuoteForeground { get => (Brush)GetValue(QuoteForegroundProperty); set => SetValue(QuoteForegroundProperty, value); }
+    /// <summary>Gets or sets the border thickness for block quotes.</summary>
+    public Thickness QuoteBorderThickness { get => (Thickness)GetValue(QuoteBorderThicknessProperty); set => SetValue(QuoteBorderThicknessProperty, value); }
+    /// <summary>Gets or sets the margin for block quotes.</summary>
+    public Thickness QuoteMargin { get => (Thickness)GetValue(QuoteMarginProperty); set => SetValue(QuoteMarginProperty, value); }
+    /// <summary>Gets or sets the padding for block quotes.</summary>
+    public Thickness QuotePadding { get => (Thickness)GetValue(QuotePaddingProperty); set => SetValue(QuotePaddingProperty, value); }
+    /// <summary>Gets or sets the corner radius for block quotes.</summary>
+    public CornerRadius QuoteCornerRadius { get => (CornerRadius)GetValue(QuoteCornerRadiusProperty); set => SetValue(QuoteCornerRadiusProperty, value); }
+    /// <summary>Gets or sets the margin for the quote bar indicator.</summary>
+    public Thickness QuoteBarMargin { get => (Thickness)GetValue(QuoteBarMarginProperty); set => SetValue(QuoteBarMarginProperty, value); }
+
+    /// <summary>Gets or sets the maximum width for images.</summary>
+    public double ImageMaxWidth { get => (double)GetValue(ImageMaxWidthProperty); set => SetValue(ImageMaxWidthProperty, value); }
+    /// <summary>Gets or sets the maximum height for images.</summary>
+    public double ImageMaxHeight { get => (double)GetValue(ImageMaxHeightProperty); set => SetValue(ImageMaxHeightProperty, value); }
+    /// <summary>Gets or sets the stretch mode for images.</summary>
+    public Stretch ImageStretch { get => (Stretch)GetValue(ImageStretchProperty); set => SetValue(ImageStretchProperty, value); }
+
+    /// <summary>Gets or sets the background brush for table headings.</summary>
+    public Brush TableHeadingBackground { get => (Brush)GetValue(TableHeadingBackgroundProperty); set => SetValue(TableHeadingBackgroundProperty, value); }
+    /// <summary>Gets or sets the border brush for tables.</summary>
+    public Brush TableBorderBrush { get => (Brush)GetValue(TableBorderBrushProperty); set => SetValue(TableBorderBrushProperty, value); }
+    /// <summary>Gets or sets the border thickness for tables.</summary>
+    public double TableBorderThickness { get => (double)GetValue(TableBorderThicknessProperty); set => SetValue(TableBorderThicknessProperty, value); }
+    /// <summary>Gets or sets the cell padding for tables.</summary>
+    public Thickness TableCellPadding { get => (Thickness)GetValue(TableCellPaddingProperty); set => SetValue(TableCellPaddingProperty, value); }
+    /// <summary>Gets or sets the margin for tables.</summary>
+    public Thickness TableMargin { get => (Thickness)GetValue(TableMarginProperty); set => SetValue(TableMarginProperty, value); }
+    /// <summary>Gets or sets the corner radius for tables.</summary>
+    public CornerRadius TableCornerRadius { get => (CornerRadius)GetValue(TableCornerRadiusProperty); set => SetValue(TableCornerRadiusProperty, value); }
 }
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
index 8b187a5ac..22dc251e2 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
@@ -1,12 +1,239 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <!--  Heading foregrounds  -->
+            <StaticResource x:Key="MarkdownTextBlockH1Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH2Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH3Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH4Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH5Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH6Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+
+            <!--  Inline code  -->
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBackground"
+                            ResourceKey="CardBackgroundFillColorSecondaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+
+            <!--  Code block  -->
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBackground"
+                            ResourceKey="CardBackgroundFillColorSecondaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+
+            <!--  Horizontal rule  -->
+            <StaticResource x:Key="MarkdownTextBlockHorizontalRuleBrush"
+                            ResourceKey="DividerStrokeColorDefaultBrush" />
+
+            <!--  Link  -->
+            <StaticResource x:Key="MarkdownTextBlockLinkForeground"
+                            ResourceKey="AccentTextFillColorPrimaryBrush" />
+
+            <!--  Quote  -->
+            <SolidColorBrush x:Key="MarkdownTextBlockQuoteBackground"
+                             Color="Transparent" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+
+            <!--  Table  -->
+            <StaticResource x:Key="MarkdownTextBlockTableHeadingBackground"
+                            ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockTableBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="MarkdownTextBlockH1Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH2Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH3Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH4Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH5Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH6Foreground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBackground"
+                            ResourceKey="CardBackgroundFillColorSecondaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBackground"
+                            ResourceKey="CardBackgroundFillColorSecondaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockHorizontalRuleBrush"
+                            ResourceKey="DividerStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockLinkForeground"
+                            ResourceKey="AccentTextFillColorPrimaryBrush" />
+            <SolidColorBrush x:Key="MarkdownTextBlockQuoteBackground"
+                             Color="Transparent" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="MarkdownTextBlockTableHeadingBackground"
+                            ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="MarkdownTextBlockTableBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="MarkdownTextBlockH1Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH2Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH3Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH4Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH5Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockH6Foreground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBackground"
+                            ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeForeground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockInlineCodeBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBackground"
+                            ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockCodeBlockForeground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockHorizontalRuleBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockLinkForeground"
+                            ResourceKey="SystemColorHotlightColorBrush" />
+            <SolidColorBrush x:Key="MarkdownTextBlockQuoteBackground"
+                             Color="Transparent" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockQuoteForeground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockTableHeadingBackground"
+                            ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="MarkdownTextBlockTableBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
     <Style BasedOn="{StaticResource DefaultMarkdownTextBlockStyle}"
            TargetType="controls:MarkdownTextBlock" />
 
     <Style x:Key="DefaultMarkdownTextBlockStyle"
            TargetType="controls:MarkdownTextBlock">
+
+        <!--  Heading properties  -->
+        <Setter Property="H1Foreground" Value="{ThemeResource MarkdownTextBlockH1Foreground}" />
+        <Setter Property="H2Foreground" Value="{ThemeResource MarkdownTextBlockH2Foreground}" />
+        <Setter Property="H3Foreground" Value="{ThemeResource MarkdownTextBlockH3Foreground}" />
+        <Setter Property="H4Foreground" Value="{ThemeResource MarkdownTextBlockH4Foreground}" />
+        <Setter Property="H5Foreground" Value="{ThemeResource MarkdownTextBlockH5Foreground}" />
+        <Setter Property="H6Foreground" Value="{ThemeResource MarkdownTextBlockH6Foreground}" />
+        <Setter Property="H1FontSize" Value="22" />
+        <Setter Property="H2FontSize" Value="20" />
+        <Setter Property="H3FontSize" Value="18" />
+        <Setter Property="H4FontSize" Value="16" />
+        <Setter Property="H5FontSize" Value="14" />
+        <Setter Property="H6FontSize" Value="12" />
+        <Setter Property="H1FontWeight" Value="SemiBold" />
+        <Setter Property="H2FontWeight" Value="SemiBold" />
+        <Setter Property="H3FontWeight" Value="SemiBold" />
+        <Setter Property="H4FontWeight" Value="SemiBold" />
+        <Setter Property="H5FontWeight" Value="SemiBold" />
+        <Setter Property="H6FontWeight" Value="SemiBold" />
+        <Setter Property="H1Margin" Value="0,16,0,0" />
+        <Setter Property="H2Margin" Value="0,16,0,0" />
+        <Setter Property="H3Margin" Value="0,16,0,0" />
+        <Setter Property="H4Margin" Value="0,16,0,0" />
+        <Setter Property="H5Margin" Value="0,8,0,0" />
+        <Setter Property="H6Margin" Value="0,8,0,0" />
+
+        <!--  Inline code properties  -->
+        <Setter Property="InlineCodeBackground" Value="{ThemeResource MarkdownTextBlockInlineCodeBackground}" />
+        <Setter Property="InlineCodeForeground" Value="{ThemeResource MarkdownTextBlockInlineCodeForeground}" />
+        <Setter Property="InlineCodeBorderBrush" Value="{ThemeResource MarkdownTextBlockInlineCodeBorderBrush}" />
+        <Setter Property="InlineCodeBorderThickness" Value="1" />
+        <Setter Property="InlineCodeCornerRadius" Value="2" />
+        <Setter Property="InlineCodePadding" Value="0" />
+        <Setter Property="InlineCodeFontSize" Value="10" />
+        <Setter Property="InlineCodeFontWeight" Value="Normal" />
+
+        <!--  Bold  -->
+        <Setter Property="BoldFontWeight" Value="SemiBold" />
+
+        <!--  Code block properties  -->
+        <Setter Property="CodeBlockBackground" Value="{ThemeResource MarkdownTextBlockCodeBlockBackground}" />
+        <Setter Property="CodeBlockBorderBrush" Value="{ThemeResource MarkdownTextBlockCodeBlockBorderBrush}" />
+        <Setter Property="CodeBlockForeground" Value="{ThemeResource MarkdownTextBlockCodeBlockForeground}" />
+        <Setter Property="CodeBlockBorderThickness" Value="1" />
+        <Setter Property="CodeBlockPadding" Value="8" />
+        <Setter Property="CodeBlockMargin" Value="0,8,0,8" />
+        <Setter Property="CodeBlockFontFamily" Value="Consolas" />
+        <Setter Property="CodeBlockCornerRadius" Value="4" />
+
+        <!--  Horizontal rule properties  -->
+        <Setter Property="HorizontalRuleBrush" Value="{ThemeResource MarkdownTextBlockHorizontalRuleBrush}" />
+        <Setter Property="HorizontalRuleThickness" Value="1" />
+        <Setter Property="HorizontalRuleMargin" Value="0,12,0,12" />
+        <Setter Property="HorizontalRuleX2" Value="1" />
+
+        <!--  Link properties  -->
+        <Setter Property="LinkForeground" Value="{ThemeResource MarkdownTextBlockLinkForeground}" />
+
+        <!--  Paragraph / list properties  -->
+        <Setter Property="ParagraphMargin" Value="0,8,0,8" />
+        <Setter Property="ParagraphLineHeight" Value="0" />
+        <Setter Property="ListBulletSpacing" Value="4" />
+        <Setter Property="ListGutterWidth" Value="32" />
+
+        <!--  Quote properties  -->
+        <Setter Property="QuoteBackground" Value="{ThemeResource MarkdownTextBlockQuoteBackground}" />
+        <Setter Property="QuoteBorderBrush" Value="{ThemeResource MarkdownTextBlockQuoteBorderBrush}" />
+        <Setter Property="QuoteForeground" Value="{ThemeResource MarkdownTextBlockQuoteForeground}" />
+        <Setter Property="QuoteBorderThickness" Value="4,0,0,0" />
+        <Setter Property="QuoteMargin" Value="0,4,0,4" />
+        <Setter Property="QuotePadding" Value="4" />
+        <Setter Property="QuoteCornerRadius" Value="4" />
+        <Setter Property="QuoteBarMargin" Value="0,0,4,0" />
+
+        <!--  Image properties  -->
+        <Setter Property="ImageMaxWidth" Value="0" />
+        <Setter Property="ImageMaxHeight" Value="0" />
+        <Setter Property="ImageStretch" Value="Uniform" />
+
+        <!--  Table properties  -->
+        <Setter Property="TableHeadingBackground" Value="{ThemeResource MarkdownTextBlockTableHeadingBackground}" />
+        <Setter Property="TableBorderBrush" Value="{ThemeResource MarkdownTextBlockTableBorderBrush}" />
+        <Setter Property="TableBorderThickness" Value="1" />
+        <Setter Property="TableCellPadding" Value="4" />
+        <Setter Property="TableMargin" Value="0,8,0,8" />
+        <Setter Property="TableCornerRadius" Value="4" />
+
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:MarkdownTextBlock">
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
index d3a55829b..657a31d9a 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
@@ -20,6 +20,7 @@ public partial class MarkdownTextBlock : Control
     private MarkdownPipeline _pipeline = null!;
     private MyFlowDocument _document;
     private WinUIRenderer? _renderer;
+    private bool _themePropertyChangeQueued;
 
     public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;
 
@@ -34,14 +35,6 @@ internal bool RaiseLinkClickedEvent(Uri uri)
         return args.Handled;
     }
 
-    private static void OnConfigChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is MarkdownTextBlock self && e.NewValue != null)
-        {
-            self.ApplyConfig(self.Config);
-        }
-    }
-
     private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is MarkdownTextBlock self && e.NewValue != null)
@@ -54,6 +47,20 @@ public MarkdownTextBlock()
     {
         this.DefaultStyleKey = typeof(MarkdownTextBlock);
         _document = new MyFlowDocument();
+        this.ActualThemeChanged += OnActualThemeChanged;
+    }
+
+    private void OnActualThemeChanged(FrameworkElement sender, object args)
+    {
+        if (!_themePropertyChangeQueued)
+        {
+            _themePropertyChangeQueued = true;
+            DispatcherQueue.TryEnqueue(() =>
+            {
+                _themePropertyChangeQueued = false;
+                ApplyText(true);
+            });
+        }
     }
 
     protected override void OnApplyTemplate()
@@ -79,14 +86,6 @@ protected override void OnApplyTemplate()
         Build();
     }
 
-    private void ApplyConfig(MarkdownConfig config)
-    {
-        if (_renderer != null)
-        {
-            _renderer.Config = config;
-        }
-    }
-
     private void ApplyText(bool rerender)
     {
         if (_renderer != null)
@@ -107,40 +106,38 @@ private void ApplyText(bool rerender)
 
     private void Build()
     {
-        if (Config != null)
+        if (_renderer == null)
         {
-            if (_renderer == null)
-            {
-                _renderer = new WinUIRenderer(_document, Config, this);
-
-                // Default block renderers
-                _renderer.ObjectRenderers.Add(new CodeBlockRenderer());
-                _renderer.ObjectRenderers.Add(new ListRenderer());
-                _renderer.ObjectRenderers.Add(new ListItemRenderer());
-                _renderer.ObjectRenderers.Add(new HeadingRenderer());
-                _renderer.ObjectRenderers.Add(new ParagraphRenderer());
-                _renderer.ObjectRenderers.Add(new QuoteBlockRenderer());
-                _renderer.ObjectRenderers.Add(new ThematicBreakRenderer());
-                if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlBlockRenderer());
-
-                // Default inline renderers
-                if (UseAutoLinks) _renderer.ObjectRenderers.Add(new AutoLinkInlineRenderer());
-                _renderer.ObjectRenderers.Add(new CodeInlineRenderer());
-                _renderer.ObjectRenderers.Add(new DelimiterInlineRenderer());
-                _renderer.ObjectRenderers.Add(new EmphasisInlineRenderer());
-                if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlEntityInlineRenderer());
-                _renderer.ObjectRenderers.Add(new LineBreakInlineRenderer());
-                if (!DisableLinks) _renderer.ObjectRenderers.Add(new LinkInlineRenderer());
-                _renderer.ObjectRenderers.Add(new LiteralInlineRenderer());
-                if (!DisableLinks) _renderer.ObjectRenderers.Add(new ContainerInlineRenderer());
-
-                // Extension renderers
-                if (UsePipeTables) _renderer.ObjectRenderers.Add(new TableRenderer());
-                if (UseTaskLists) _renderer.ObjectRenderers.Add(new TaskListRenderer());
-                if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlInlineRenderer());
-            }
-            _pipeline.Setup(_renderer);
-            ApplyText(false);
+            _renderer = new WinUIRenderer(_document, this);
+
+            // Default block renderers
+            _renderer.ObjectRenderers.Add(new CodeBlockRenderer());
+            _renderer.ObjectRenderers.Add(new ListRenderer());
+            _renderer.ObjectRenderers.Add(new ListItemRenderer());
+            _renderer.ObjectRenderers.Add(new HeadingRenderer());
+            _renderer.ObjectRenderers.Add(new ParagraphRenderer());
+            _renderer.ObjectRenderers.Add(new QuoteBlockRenderer());
+            _renderer.ObjectRenderers.Add(new ThematicBreakRenderer());
+            if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlBlockRenderer());
+
+            // Default inline renderers
+            if (UseAutoLinks) _renderer.ObjectRenderers.Add(new AutoLinkInlineRenderer());
+            _renderer.ObjectRenderers.Add(new CodeInlineRenderer());
+            _renderer.ObjectRenderers.Add(new DelimiterInlineRenderer());
+            _renderer.ObjectRenderers.Add(new EmphasisInlineRenderer());
+            if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlEntityInlineRenderer());
+            _renderer.ObjectRenderers.Add(new LineBreakInlineRenderer());
+            if (!DisableLinks) _renderer.ObjectRenderers.Add(new LinkInlineRenderer());
+            _renderer.ObjectRenderers.Add(new LiteralInlineRenderer());
+            if (!DisableLinks) _renderer.ObjectRenderers.Add(new ContainerInlineRenderer());
+
+            // Extension renderers
+            if (UsePipeTables) _renderer.ObjectRenderers.Add(new TableRenderer());
+            if (UseTaskLists) _renderer.ObjectRenderers.Add(new TaskListRenderer());
+            if (!DisableHtml) _renderer.ObjectRenderers.Add(new HtmlInlineRenderer());
         }
+        _pipeline.Setup(_renderer);
+
+        ApplyText(true);
     }
 }
diff --git a/components/MarkdownTextBlock/src/MarkdownThemes.cs b/components/MarkdownTextBlock/src/MarkdownThemes.cs
deleted file mode 100644
index 21393cf21..000000000
--- a/components/MarkdownTextBlock/src/MarkdownThemes.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if !WINAPPSDK
-using FontWeight = Windows.UI.Text.FontWeight;
-using FontWeights = Windows.UI.Text.FontWeights;
-#else
-using FontWeight = Windows.UI.Text.FontWeight;
-using FontWeights = Microsoft.UI.Text.FontWeights;
-#endif
-
-namespace CommunityToolkit.WinUI.Controls;
-
-public sealed class MarkdownThemes : DependencyObject
-{
-    internal static MarkdownThemes Default { get; } = new();
-
-    public Thickness Padding { get; set; } = new(8);
-
-    public Thickness InternalMargin { get; set; } = new(4);
-
-    public CornerRadius CornerRadius { get; set; } = new(4);
-
-    public double H1FontSize { get; set; } = 22;
-
-    public double H2FontSize { get; set; } = 20;
-
-    public double H3FontSize { get; set; } = 18;
-
-    public double H4FontSize { get; set; } = 16;
-
-    public double H5FontSize { get; set; } = 14;
-
-    public double H6FontSize { get; set; } = 12;
-
-    public Brush H1Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Brush H2Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Brush H3Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Brush H4Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Brush H5Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Brush H6Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-
-    public FontWeight H1FontWeight { get; set; } = FontWeights.SemiBold;
-
-    public FontWeight H2FontWeight { get; set; } = FontWeights.SemiBold;
-
-    public FontWeight H3FontWeight { get; set; } = FontWeights.SemiBold;
-
-    public FontWeight H4FontWeight { get; set;} = FontWeights.SemiBold;
-
-    public FontWeight H5FontWeight { get; set; } = FontWeights.SemiBold;
-
-    public FontWeight H6FontWeight { get; set; } = FontWeights.SemiBold;
-
-    public Thickness H1Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
-    public Thickness H2Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
-    public Thickness H3Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
-    public Thickness H4Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
-    public Thickness H5Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
-    public Thickness H6Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
-
-    public Brush BorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-
-    public Brush TableHeadingBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorDefaultBrush"];
-
-    public Brush InlineCodeBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"];
-    public Brush InlineCodeForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-
-    public Brush InlineCodeBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-
-    public Thickness InlineCodeBorderThickness { get; set; } = new (1);
-
-    public CornerRadius InlineCodeCornerRadius { get; set; } = new (2);
-
-    public Thickness InlineCodePadding { get; set; } = new(0);
-
-    public double InlineCodeFontSize { get; set; } = 10;
-
-    public FontWeight InlineCodeFontWeight { get; set; } = FontWeights.Normal;
-
-    public FontWeight BoldFontWeight { get; set; } = FontWeights.SemiBold;
-
-    // Legacy parity properties (new)
-    // Code block styling
-    public Brush CodeBlockBackground { get; set; } = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"];
-    public Brush CodeBlockBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-    public Thickness CodeBlockBorderThickness { get; set; } = new Thickness(1);
-    public Thickness CodeBlockPadding { get; set; } = new Thickness(8);
-    public Thickness CodeBlockMargin { get; set; } = new Thickness(0, 8, 0, 8);
-    public FontFamily CodeBlockFontFamily { get; set; } = new FontFamily("Consolas");
-    public Brush CodeBlockForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public CornerRadius CodeBlockCornerRadius { get; set; } = new CornerRadius(4);
-
-    // Horizontal rule
-    public Brush HorizontalRuleBrush { get; set; } = (Brush)Application.Current.Resources["DividerStrokeColorDefaultBrush"];
-    public double HorizontalRuleThickness { get; set; } = 1.0;
-    public Thickness HorizontalRuleMargin { get; set; } = new Thickness(0, 12, 0, 12);
-
-    // Link styling
-    public Brush LinkForeground { get; set; } = (Brush)Application.Current.Resources["AccentTextFillColorPrimaryBrush"];
-
-    // Paragraph / list
-    public Thickness ParagraphMargin { get; set; } = new Thickness(0, 8, 0, 8);
-    public double ParagraphLineHeight { get; set; } = 0; // 0 = default
-    public double ListBulletSpacing { get; set; } = 4; // spaces after bullet
-    public double ListGutterWidth { get; set; } = 32; // indent delta per level
-    public Thickness ListMargin { get; set; } = new Thickness(0, 4, 0, 4);
-
-    // Quote styling
-    public Brush QuoteBackground { get; set; } = new SolidColorBrush(Colors.Transparent);
-    public Brush QuoteBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-    public Thickness QuoteBorderThickness { get; set; } = new Thickness(4, 0, 0, 0);
-    public Brush QuoteForeground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
-    public Thickness QuoteMargin { get; set; } = new Thickness(0, 4, 0, 4);
-    public Thickness QuotePadding { get; set; } = new Thickness(4);
-    public CornerRadius QuoteCornerRadius { get; set; } = new CornerRadius(4);
-
-    // Image styling
-    public double ImageMaxWidth { get; set; } = 0; // 0 = no constraint
-    public double ImageMaxHeight { get; set; } = 0;
-    public Stretch ImageStretch { get; set; } = Stretch.Uniform;
-
-    // Table styling
-    public Brush TableBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-    public double TableBorderThickness { get; set; } = 1;
-    public Thickness TableCellPadding { get; set; } = new Thickness(4);
-    public Thickness TableMargin { get; set; } = new Thickness(0, 8, 0, 8);
-
-    // YAML / not currently used - placeholders for parity
-    public Brush YamlBorderBrush { get; set; } = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
-    public Thickness YamlBorderThickness { get; set; } = new Thickness(1);
-}
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/CodeBlockRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/CodeBlockRenderer.cs
index c432a2abe..5732fc5a9 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/CodeBlockRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/CodeBlockRenderer.cs
@@ -11,7 +11,7 @@ internal class CodeBlockRenderer : UWPObjectRenderer<CodeBlock>
 {
     protected override void Write(WinUIRenderer renderer, CodeBlock obj)
     {
-        var code = new MyCodeBlock(obj, renderer.Config);
+        var code = new MyCodeBlock(obj, renderer.MarkdownTextBlock);
         renderer.Push(code);
         renderer.Pop();
     }
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Extensions/TableRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Extensions/TableRenderer.cs
index bc2a8a956..63fcba20e 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Extensions/TableRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Extensions/TableRenderer.cs
@@ -14,8 +14,8 @@ protected override void Write(WinUIRenderer renderer, Table table)
         if (renderer == null) throw new ArgumentNullException(nameof(renderer));
         if (table == null) throw new ArgumentNullException(nameof(table));
 
-        var themes = renderer.Config.Themes;
-        var myTable = new MyTable(table, themes);
+        var control = renderer.MarkdownTextBlock;
+        var myTable = new MyTable(table, control);
 
         renderer.Push(myTable);
 
@@ -48,7 +48,7 @@ protected override void Write(WinUIRenderer renderer, Table table)
                     };
                 }
 
-                var myCell = new MyTableCell(cell, textAlignment, row.IsHeader, columnIndex, rowIndex, themes);
+                var myCell = new MyTableCell(cell, textAlignment, row.IsHeader, columnIndex, rowIndex, control);
 
                 renderer.Push(myCell);
                 renderer.Write(cell);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/HeadingRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/HeadingRenderer.cs
index 9571ff230..b666e1b51 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/HeadingRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/HeadingRenderer.cs
@@ -14,7 +14,7 @@ protected override void Write(WinUIRenderer renderer, HeadingBlock obj)
         if (renderer == null) throw new ArgumentNullException(nameof(renderer));
         if (obj == null) throw new ArgumentNullException(nameof(obj));
 
-        var paragraph = new MyHeading(obj, renderer.Config);
+        var paragraph = new MyHeading(obj, renderer.MarkdownTextBlock);
         renderer.Push(paragraph);
         renderer.WriteLeafInline(obj);
         renderer.Pop();
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs
index c8bf38ffd..a134c6597 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs
@@ -25,7 +25,7 @@ protected override void Write(WinUIRenderer renderer, AutolinkInline link)
             url = "#";
         }
 
-        var autolink = new MyAutolinkInline(link, renderer.Config.Themes);
+        var autolink = new MyAutolinkInline(link, renderer.MarkdownTextBlock);
         autolink.ClickEvent += (sender, e) =>
         {
             renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/CodeInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/CodeInlineRenderer.cs
index c56eb1a7b..5f16ae752 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/CodeInlineRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/CodeInlineRenderer.cs
@@ -14,6 +14,6 @@ protected override void Write(WinUIRenderer renderer, CodeInline obj)
         if (renderer == null) throw new ArgumentNullException(nameof(renderer));
         if (obj == null) throw new ArgumentNullException(nameof(obj));
 
-        renderer.WriteInline(new MyInlineCode(obj, renderer.Config));
+        renderer.WriteInline(new MyInlineCode(obj, renderer.MarkdownTextBlock));
     }
 }
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/EmphasisInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/EmphasisInlineRenderer.cs
index c7e620c5d..cba800aea 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/EmphasisInlineRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/EmphasisInlineRenderer.cs
@@ -21,7 +21,7 @@ protected override void Write(WinUIRenderer renderer, EmphasisInline obj)
             case '*':
             case '_':
                 span = new MyEmphasisInline(obj);
-                if (obj.DelimiterCount == 2) { span.SetBold(renderer.Config.Themes.BoldFontWeight); } else { span.SetItalic(); }
+                if (obj.DelimiterCount == 2) { span.SetBold(renderer.MarkdownTextBlock.BoldFontWeight); } else { span.SetItalic(); }
                 break;
             case '~':
                 span = new MyEmphasisInline(obj);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs
index d99d67ff2..bd9c173cd 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs
@@ -23,14 +23,14 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
 
         if (link.IsImage)
         {
-            var image = new MyImage(link, Controls.Extensions.GetUri(url, renderer.Config.BaseUrl), renderer.Config);
+            var image = new MyImage(link, Controls.Extensions.GetUri(url, renderer.MarkdownTextBlock.BaseUrl), renderer.MarkdownTextBlock);
             renderer.WriteInline(image);
         }
         else
         {
             if (link.FirstChild is LinkInline linkInlineChild && linkInlineChild.IsImage)
             {
-                var myHyperlinkButton = new MyHyperlinkButton(link, renderer.Config.BaseUrl, renderer.Config.Themes);
+                var myHyperlinkButton = new MyHyperlinkButton(link, renderer.MarkdownTextBlock);
                 myHyperlinkButton.ClickEvent += (sender, e) =>
                 {
                     var button = (HyperlinkButton)sender;
@@ -47,7 +47,7 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
             }
             else
             {
-                var hyperlink = new MyHyperlink(link, renderer.Config.BaseUrl, renderer.Config.Themes);
+                var hyperlink = new MyHyperlink(link, renderer.MarkdownTextBlock);
                 hyperlink.ClickEvent += (sender, e) =>
                 {
                     var uri = sender.NavigateUri;
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/QuoteBlockRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/QuoteBlockRenderer.cs
index bdc1b3210..cb635f0b2 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/QuoteBlockRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/QuoteBlockRenderer.cs
@@ -14,7 +14,7 @@ protected override void Write(WinUIRenderer renderer, QuoteBlock obj)
         if (renderer == null) throw new ArgumentNullException(nameof(renderer));
         if (obj == null) throw new ArgumentNullException(nameof(obj));
 
-    var quote = new MyQuote(obj, renderer.Config.Themes);
+    var quote = new MyQuote(obj, renderer.MarkdownTextBlock);
 
         renderer.Push(quote);
         renderer.WriteChildren(obj);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/ThematicBreakRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/ThematicBreakRenderer.cs
index 73c581922..606aa03db 100644
--- a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/ThematicBreakRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/ThematicBreakRenderer.cs
@@ -14,7 +14,7 @@ protected override void Write(WinUIRenderer renderer, ThematicBreakBlock obj)
         if (renderer == null) throw new ArgumentNullException(nameof(renderer));
         if (obj == null) throw new ArgumentNullException(nameof(obj));
 
-        var thematicBreak = new MyThematicBreak(obj, renderer.Config.Themes);
+        var thematicBreak = new MyThematicBreak(obj, renderer.MarkdownTextBlock);
 
         renderer.WriteBlock(thematicBreak);
     }
diff --git a/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs b/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
index 879c45158..21f624329 100644
--- a/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
@@ -16,21 +16,14 @@ public class WinUIRenderer : RendererBase
 {
     private readonly Stack<IAddChild> _stack = new Stack<IAddChild>();
     private char[] _buffer;
-    private MarkdownConfig _config = MarkdownConfig.Default;
     private readonly Stack<string> _listBullets = new();
 
     public MyFlowDocument FlowDocument { get; private set; }
-    public MarkdownConfig Config
-    {
-        get => _config;
-        set => _config = value;
-    }
     public MarkdownTextBlock MarkdownTextBlock { get; }
 
-    public WinUIRenderer(MyFlowDocument document, MarkdownConfig config, MarkdownTextBlock markdownTextBlock)
+    public WinUIRenderer(MyFlowDocument document, MarkdownTextBlock markdownTextBlock)
     {
         _buffer = new char[1024];
-        Config = config;
         MarkdownTextBlock = markdownTextBlock;
         FlowDocument = document;
         // set style
diff --git a/components/MarkdownTextBlock/src/TextElements/MyAutolinkInline.cs b/components/MarkdownTextBlock/src/TextElements/MyAutolinkInline.cs
index 13d03c6bf..25380e1a5 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyAutolinkInline.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyAutolinkInline.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Syntax.Inlines;
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
@@ -9,7 +10,7 @@ namespace CommunityToolkit.WinUI.Controls.TextElements;
 internal class MyAutolinkInline : IAddChild
 {
     private AutolinkInline _autoLinkInline;
-    private MarkdownThemes _themes;
+    private MarkdownTextBlock _control;
 
     public TextElement TextElement { get; private set; }
 
@@ -25,14 +26,14 @@ public event TypedEventHandler<Hyperlink, HyperlinkClickEventArgs>? ClickEvent
         }
     }
 
-    public MyAutolinkInline(AutolinkInline autoLinkInline, MarkdownThemes themes)
+    public MyAutolinkInline(AutolinkInline autoLinkInline, MarkdownTextBlock control)
     {
         _autoLinkInline = autoLinkInline;
-        _themes = themes;
+        _control = control;
         TextElement = new Hyperlink()
         {
             NavigateUri = new Uri(autoLinkInline.Url),
-            Foreground = _themes.LinkForeground
+            Foreground = _control.LinkForeground
         };
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyCodeBlock.cs b/components/MarkdownTextBlock/src/TextElements/MyCodeBlock.cs
index 2ef5ad659..4dfa596d8 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyCodeBlock.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyCodeBlock.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Syntax;
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
@@ -10,29 +11,29 @@ internal class MyCodeBlock : IAddChild
 {
     private CodeBlock _codeBlock;
     private Paragraph _paragraph;
-    private MarkdownConfig _config;
+    private MarkdownTextBlock _control;
 
     public TextElement TextElement
     {
         get => _paragraph;
     }
 
-    public MyCodeBlock(CodeBlock codeBlock, MarkdownConfig config)
+    public MyCodeBlock(CodeBlock codeBlock, MarkdownTextBlock control)
     {
         _codeBlock = codeBlock;
-        _config = config;
+        _control = control;
         _paragraph = new Paragraph();
         var container = new InlineUIContainer();
         var border = new Border();
-    border.Background = _config.Themes.CodeBlockBackground;
-    border.BorderBrush = _config.Themes.CodeBlockBorderBrush;
-    border.BorderThickness = _config.Themes.CodeBlockBorderThickness;
-    border.Padding = _config.Themes.CodeBlockPadding;
-    border.Margin = _config.Themes.CodeBlockMargin;
-    border.CornerRadius = _config.Themes.CodeBlockCornerRadius;
+    border.Background = _control.CodeBlockBackground;
+    border.BorderBrush = _control.CodeBlockBorderBrush;
+    border.BorderThickness = _control.CodeBlockBorderThickness;
+    border.Padding = _control.CodeBlockPadding;
+    border.Margin = _control.CodeBlockMargin;
+    border.CornerRadius = _control.CodeBlockCornerRadius;
         var richTextBlock = new RichTextBlock();
-    richTextBlock.FontFamily = _config.Themes.CodeBlockFontFamily;
-    richTextBlock.Foreground = _config.Themes.CodeBlockForeground;
+    richTextBlock.FontFamily = _control.CodeBlockFontFamily;
+    richTextBlock.Foreground = _control.CodeBlockForeground;
 
 #if false
         if (codeBlock is FencedCodeBlock fencedCodeBlock)
diff --git a/components/MarkdownTextBlock/src/TextElements/MyFlowDocument.cs b/components/MarkdownTextBlock/src/TextElements/MyFlowDocument.cs
index 3a135ad41..a4477718b 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyFlowDocument.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyFlowDocument.cs
@@ -14,38 +14,46 @@
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
 
+/// <summary>
+/// Represents a flow document that wraps a <see cref="Microsoft.UI.Xaml.Controls.RichTextBlock"/> for rendering markdown or HTML content.
+/// </summary>
 public class MyFlowDocument : IAddChild
 {
     private HtmlNode? _htmlNode;
     private RichTextBlock _richTextBlock = new RichTextBlock();
     private MarkdownObject? _markdownObject;
 
-    // useless property
+    /// <summary>Gets or sets the text element (unused, required by <see cref="IAddChild"/>).</summary>
     public TextElement TextElement { get; set; } = new Run();
-    //
 
+    /// <summary>Gets or sets the underlying <see cref="Microsoft.UI.Xaml.Controls.RichTextBlock"/>.</summary>
     public RichTextBlock RichTextBlock
     {
         get => _richTextBlock;
         set => _richTextBlock = value;
     }
 
+    /// <summary>Gets a value indicating whether this document was created from an HTML node.</summary>
     public bool IsHtml => _htmlNode != null;
 
+    /// <summary>Initializes a new instance of the <see cref="MyFlowDocument"/> class.</summary>
     public MyFlowDocument()
     {
     }
 
+    /// <summary>Initializes a new instance of the <see cref="MyFlowDocument"/> class from a markdown object.</summary>
     public MyFlowDocument(MarkdownObject markdownObject)
     {
         _markdownObject = markdownObject;
     }
 
+    /// <summary>Initializes a new instance of the <see cref="MyFlowDocument"/> class from an HTML node.</summary>
     public MyFlowDocument(HtmlNode node)
     {
         _htmlNode = node;
     }
 
+    /// <summary>Adds a child element as a block or inline to the document.</summary>
     public void AddChild(IAddChild child)
     {
         TextElement element = child.TextElement;
diff --git a/components/MarkdownTextBlock/src/TextElements/MyHeading.cs b/components/MarkdownTextBlock/src/TextElements/MyHeading.cs
index ab8a85392..931ef6283 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyHeading.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyHeading.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using HtmlAgilityPack;
 using Markdig.Syntax;
 
@@ -12,7 +13,7 @@ internal class MyHeading : IAddChild
     private Paragraph _paragraph;
     private HeadingBlock? _headingBlock;
     private HtmlNode? _htmlNode;
-    private MarkdownConfig _config;
+    private MarkdownTextBlock _control;
 
     public bool IsHtml => _htmlNode != null;
 
@@ -21,20 +22,20 @@ public TextElement TextElement
         get => _paragraph;
     }
 
-    public MyHeading(HeadingBlock headingBlock, MarkdownConfig config)
+    public MyHeading(HeadingBlock headingBlock, MarkdownTextBlock control)
     {
         _headingBlock = headingBlock;
         _paragraph = new Paragraph();
-        _config = config;
+        _control = control;
 
         SetHProperties(headingBlock.Level);
     }
 
-    public MyHeading(HtmlNode htmlNode, MarkdownConfig config)
+    public MyHeading(HtmlNode htmlNode, MarkdownTextBlock control)
     {
         _htmlNode = htmlNode;
         _paragraph = new Paragraph();
-        _config = config;
+        _control = control;
 
         var align = _htmlNode.GetAttribute("align", "left");
         _paragraph.TextAlignment = align switch
@@ -53,39 +54,39 @@ private void SetHProperties(int level)
     {
         _paragraph.FontSize = level switch
         {
-            1 => _config.Themes.H1FontSize,
-            2 => _config.Themes.H2FontSize,
-            3 => _config.Themes.H3FontSize,
-            4 => _config.Themes.H4FontSize,
-            5 => _config.Themes.H5FontSize,
-            _ => _config.Themes.H6FontSize,
+            1 => _control.H1FontSize,
+            2 => _control.H2FontSize,
+            3 => _control.H3FontSize,
+            4 => _control.H4FontSize,
+            5 => _control.H5FontSize,
+            _ => _control.H6FontSize,
         };
         _paragraph.Foreground = level switch
         {
-            1 => _config.Themes.H1Foreground,
-            2 => _config.Themes.H2Foreground,
-            3 => _config.Themes.H3Foreground,
-            4 => _config.Themes.H4Foreground,
-            5 => _config.Themes.H5Foreground,
-            _ => _config.Themes.H6Foreground,
+            1 => _control.H1Foreground,
+            2 => _control.H2Foreground,
+            3 => _control.H3Foreground,
+            4 => _control.H4Foreground,
+            5 => _control.H5Foreground,
+            _ => _control.H6Foreground,
         };
         _paragraph.FontWeight = level switch
         {
-            1 => _config.Themes.H1FontWeight,
-            2 => _config.Themes.H2FontWeight,
-            3 => _config.Themes.H3FontWeight,
-            4 => _config.Themes.H4FontWeight,
-            5 => _config.Themes.H5FontWeight,
-            _ => _config.Themes.H6FontWeight,
+            1 => _control.H1FontWeight,
+            2 => _control.H2FontWeight,
+            3 => _control.H3FontWeight,
+            4 => _control.H4FontWeight,
+            5 => _control.H5FontWeight,
+            _ => _control.H6FontWeight,
         };
         _paragraph.Margin = level switch
         {
-            1 => _config.Themes.H1Margin,
-            2 => _config.Themes.H2Margin,
-            3 => _config.Themes.H3Margin,
-            4 => _config.Themes.H4Margin,
-            5 => _config.Themes.H5Margin,
-            _ => _config.Themes.H6Margin,
+            1 => _control.H1Margin,
+            2 => _control.H2Margin,
+            3 => _control.H3Margin,
+            4 => _control.H4Margin,
+            5 => _control.H5Margin,
+            _ => _control.H6Margin,
         };
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyHyperlink.cs b/components/MarkdownTextBlock/src/TextElements/MyHyperlink.cs
index dcabeb8ac..c0c6b446d 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyHyperlink.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyHyperlink.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using HtmlAgilityPack;
 using Markdig.Syntax.Inlines;
 
@@ -13,7 +14,7 @@ internal class MyHyperlink : IAddChild
     private LinkInline? _linkInline;
     private HtmlNode? _htmlNode;
     private string? _baseUrl;
-    private MarkdownThemes _themes;
+    private MarkdownTextBlock _control;
 
     public event TypedEventHandler<Hyperlink, HyperlinkClickEventArgs> ClickEvent
     {
@@ -34,29 +35,29 @@ public TextElement TextElement
         get => _hyperlink;
     }
 
-    public MyHyperlink(LinkInline linkInline, string? baseUrl, MarkdownThemes themes)
+    public MyHyperlink(LinkInline linkInline, MarkdownTextBlock control)
     {
-        _baseUrl = baseUrl;
-        _themes = themes;
+        _baseUrl = control.BaseUrl;
+        _control = control;
         var url = linkInline.GetDynamicUrl != null ? linkInline.GetDynamicUrl() ?? linkInline.Url : linkInline.Url;
         _linkInline = linkInline;
         _hyperlink = new Hyperlink()
         {
-            NavigateUri = Extensions.GetUri(url, baseUrl),
-            Foreground = _themes.LinkForeground
+            NavigateUri = Extensions.GetUri(url, _baseUrl),
+            Foreground = _control.LinkForeground
         };
     }
 
-    public MyHyperlink(HtmlNode htmlNode, string? baseUrl, MarkdownThemes themes)
+    public MyHyperlink(HtmlNode htmlNode, MarkdownTextBlock control)
     {
-        _baseUrl = baseUrl;
-        _themes = themes;
+        _baseUrl = control.BaseUrl;
+        _control = control;
         var url = htmlNode.GetAttribute("href", "#");
         _htmlNode = htmlNode;
         _hyperlink = new Hyperlink()
         {
-            NavigateUri = Extensions.GetUri(url, baseUrl),
-            Foreground = _themes.LinkForeground
+            NavigateUri = Extensions.GetUri(url, _baseUrl),
+            Foreground = _control.LinkForeground
         };
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyHyperlinkButton.cs b/components/MarkdownTextBlock/src/TextElements/MyHyperlinkButton.cs
index ceb63a4bd..5942805ea 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyHyperlinkButton.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyHyperlinkButton.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using HtmlAgilityPack;
 using Markdig.Syntax.Inlines;
 
@@ -15,7 +16,7 @@ internal class MyHyperlinkButton : IAddChild
     private string? _baseUrl;
     private LinkInline? _linkInline;
     private HtmlNode? _htmlNode;
-    private MarkdownThemes _themes;
+    private MarkdownTextBlock _control;
     
     public event RoutedEventHandler? ClickEvent
     {
@@ -36,22 +37,22 @@ public TextElement TextElement
         get => _inlineUIContainer;
     }
 
-    public MyHyperlinkButton(LinkInline linkInline, string? baseUrl, MarkdownThemes themes)
-        : this(linkInline.GetDynamicUrl != null ? linkInline.GetDynamicUrl() ?? linkInline.Url : linkInline.Url, baseUrl, null, linkInline, themes)
+    public MyHyperlinkButton(LinkInline linkInline, MarkdownTextBlock control)
+        : this(linkInline.GetDynamicUrl != null ? linkInline.GetDynamicUrl() ?? linkInline.Url : linkInline.Url, control.BaseUrl, null, linkInline, control)
     {
     }
 
-    public MyHyperlinkButton(HtmlNode htmlNode, string? baseUrl, MarkdownThemes themes)
-        : this(htmlNode.GetAttribute("href", "#"), baseUrl, htmlNode, null, themes)
+    public MyHyperlinkButton(HtmlNode htmlNode, MarkdownTextBlock control)
+        : this(htmlNode.GetAttribute("href", "#"), control.BaseUrl, htmlNode, null, control)
     {
     }
 
-    private MyHyperlinkButton(string? url, string? baseUrl, HtmlNode? htmlNode, LinkInline? linkInline, MarkdownThemes themes)
+    private MyHyperlinkButton(string? url, string? baseUrl, HtmlNode? htmlNode, LinkInline? linkInline, MarkdownTextBlock control)
     {
         _baseUrl = baseUrl;
         _htmlNode = htmlNode;
         _linkInline = linkInline;
-        _themes = themes;
+        _control = control;
         _hyperLinkButton = new HyperlinkButton
         {
             NavigateUri = Extensions.GetUri(url, baseUrl),
@@ -67,7 +68,7 @@ private MyHyperlinkButton(string? url, string? baseUrl, HtmlNode? htmlNode, Link
             _flowDoc = new MyFlowDocument(_linkInline!);
         }
         _inlineUIContainer.Child = _hyperLinkButton;
-        _flowDoc.RichTextBlock.Foreground = _themes.LinkForeground;
+        _flowDoc.RichTextBlock.Foreground = _control.LinkForeground;
         _hyperLinkButton.Content = _flowDoc.RichTextBlock;
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index 1d100881a..7ae126025 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Syntax.Inlines;
 using HtmlAgilityPack;
 using System.Globalization;
@@ -11,6 +12,9 @@ namespace CommunityToolkit.WinUI.Controls.TextElements;
 
 internal class MyImage : IAddChild
 {
+    private static readonly HttpClient _sharedHttpClient = new();
+    private static readonly DefaultSVGRenderer _defaultSvgRenderer = new();
+
     private InlineUIContainer _container = new InlineUIContainer();
     private LinkInline? _linkInline;
     private Image _image = new Image();
@@ -18,7 +22,7 @@ internal class MyImage : IAddChild
     private HtmlNode? _htmlNode;
     private IImageProvider? _imageProvider;
     private ISVGRenderer _svgRenderer;
-    private MarkdownThemes _themes;
+    private MarkdownTextBlock _control;
     private double _precedentWidth;
     private double _precedentHeight;
     private bool _loaded;
@@ -28,13 +32,13 @@ public TextElement TextElement
         get => _container;
     }
 
-    public MyImage(LinkInline linkInline, Uri uri, MarkdownConfig config)
+    public MyImage(LinkInline linkInline, Uri uri, MarkdownTextBlock control)
     {
         _linkInline = linkInline;
         _uri = uri;
-        _imageProvider = config.ImageProvider;
-        _svgRenderer = config.SVGRenderer == null ? new DefaultSVGRenderer() : config.SVGRenderer;
-        _themes = config.Themes;
+        _imageProvider = control.ImageProvider;
+        _svgRenderer = control.SVGRenderer ?? _defaultSvgRenderer;
+        _control = control;
         Init();
         var size = Extensions.GetMarkdownImageSize(linkInline);
         if (size.Width != 0)
@@ -48,16 +52,16 @@ public MyImage(LinkInline linkInline, Uri uri, MarkdownConfig config)
     }
 
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    public MyImage(HtmlNode htmlNode, MarkdownConfig? config)
+    public MyImage(HtmlNode htmlNode, MarkdownTextBlock? control)
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
 #pragma warning disable CS8601 // Possible null reference assignment.
         Uri.TryCreate(htmlNode.GetAttribute("src", "#"), UriKind.RelativeOrAbsolute, out _uri);
 #pragma warning restore CS8601 // Possible null reference assignment.
         _htmlNode = htmlNode;
-        _imageProvider = config?.ImageProvider;
-        _svgRenderer = config?.SVGRenderer == null ? new DefaultSVGRenderer() : config.SVGRenderer;
-        _themes = config?.Themes ?? MarkdownThemes.Default;
+        _imageProvider = control?.ImageProvider;
+        _svgRenderer = control?.SVGRenderer ?? _defaultSvgRenderer;
+        _control = control!;
         Init();
         int.TryParse(
             htmlNode.GetAttribute("width", "0"),
@@ -89,6 +93,7 @@ private void Init()
 
     private async void LoadImage(object sender, RoutedEventArgs e)
     {
+        _image.Loaded -= LoadImage;
         if (_loaded) return;
         try
         {
@@ -194,15 +199,15 @@ private async void LoadImage(object sender, RoutedEventArgs e)
 
             // Apply theme constraints - only if we have a known dimension to constrain
             // This prevents theme constraints from enlarging images with unknown natural size
-            if (_themes.ImageMaxWidth > 0 && hasNaturalWidth && _themes.ImageMaxWidth < _image.MaxWidth)
+            if (_control.ImageMaxWidth > 0 && hasNaturalWidth && _control.ImageMaxWidth < _image.MaxWidth)
             {
-                _image.MaxWidth = _themes.ImageMaxWidth;
+                _image.MaxWidth = _control.ImageMaxWidth;
             }
-            if (_themes.ImageMaxHeight > 0 && hasNaturalHeight && _themes.ImageMaxHeight < _image.MaxHeight)
+            if (_control.ImageMaxHeight > 0 && hasNaturalHeight && _control.ImageMaxHeight < _image.MaxHeight)
             {
-                _image.MaxHeight = _themes.ImageMaxHeight;
+                _image.MaxHeight = _control.ImageMaxHeight;
             }
-            _image.Stretch = _themes.ImageStretch;
+            _image.Stretch = _control.ImageStretch;
         }
         catch (Exception) { }
     }
diff --git a/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs b/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
index 090f1a21d..b807ce5b5 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Syntax.Inlines;
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
@@ -10,32 +11,32 @@ internal class MyInlineCode : IAddChild
 {
     private CodeInline _codeInline;
     private InlineUIContainer _inlineContainer;
-    private MarkdownConfig _config;
+    private MarkdownTextBlock _control;
 
     public TextElement TextElement
     {
         get => _inlineContainer;
     }
 
-    public MyInlineCode(CodeInline codeInline, MarkdownConfig config)
+    public MyInlineCode(CodeInline codeInline, MarkdownTextBlock control)
     {
         _codeInline = codeInline;
-        _config = config;
+        _control = control;
         _inlineContainer = new InlineUIContainer();
         var border = new Border();
         border.VerticalAlignment = VerticalAlignment.Bottom;
-        border.Background = _config.Themes.InlineCodeBackground;
-        border.BorderBrush = _config.Themes.InlineCodeBorderBrush;
-        border.BorderThickness = _config.Themes.InlineCodeBorderThickness;
-        border.CornerRadius = _config.Themes.InlineCodeCornerRadius;
-        border.Padding = _config.Themes.InlineCodePadding;
+        border.Background = _control.InlineCodeBackground;
+        border.BorderBrush = _control.InlineCodeBorderBrush;
+        border.BorderThickness = _control.InlineCodeBorderThickness;
+        border.CornerRadius = _control.InlineCodeCornerRadius;
+        border.Padding = _control.InlineCodePadding;
         CompositeTransform3D transform = new CompositeTransform3D();
         transform.TranslateY = 4;
         border.Transform3D = transform;
         var textBlock = new TextBlock();
-        textBlock.FontSize = _config.Themes.InlineCodeFontSize;
-        textBlock.Foreground = _config.Themes.InlineCodeForeground;
-        textBlock.FontWeight = _config.Themes.InlineCodeFontWeight;
+        textBlock.FontSize = _control.InlineCodeFontSize;
+        textBlock.Foreground = _control.InlineCodeForeground;
+        textBlock.FontWeight = _control.InlineCodeFontWeight;
         textBlock.Text = codeInline.Content.ToString();
         border.Child = textBlock;
         _inlineContainer.Child = border;
diff --git a/components/MarkdownTextBlock/src/TextElements/MyParagraph.cs b/components/MarkdownTextBlock/src/TextElements/MyParagraph.cs
index 307dba187..984eb4f18 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyParagraph.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyParagraph.cs
@@ -26,25 +26,25 @@ public MyParagraph(ParagraphBlock paragraphBlock, WinUIRenderer renderer)
 
         // Lists are plain Paragraph_s, one per item.
         // This is so that you can select across list items.
-        var themes = renderer.Config.Themes;
-        Thickness margin = themes.ParagraphMargin;
+        var control = renderer.MarkdownTextBlock;
+        Thickness margin = control.ParagraphMargin;
         int bulletCount = renderer.GetListBulletCount();
-        margin.Left += themes.ListGutterWidth * bulletCount;
+        margin.Left += control.ListGutterWidth * bulletCount;
         _paragraph.Margin = margin;
-        if (themes.ParagraphLineHeight > 0)
+        if (control.ParagraphLineHeight > 0)
         {
-            _paragraph.LineHeight = themes.ParagraphLineHeight;
+            _paragraph.LineHeight = control.ParagraphLineHeight;
         }
 
         if (bulletCount != 0)
         {
             string bullet = renderer.PeekListBullet();
             // Use spaces to create spacing between bullet and text based on ListBulletSpacing
-            string spacing = new string(' ', (int)themes.ListBulletSpacing);
+            string spacing = new string(' ', (int)control.ListBulletSpacing);
             Run bulletRun = new Run { Text = bullet + spacing };
 
             _paragraph.Inlines.Add(bulletRun);
-            _paragraph.TextIndent = -themes.ListGutterWidth;
+            _paragraph.TextIndent = -control.ListGutterWidth;
         }
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyQuote.cs b/components/MarkdownTextBlock/src/TextElements/MyQuote.cs
index 6633c5bdb..32a710c08 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyQuote.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyQuote.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Syntax;
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
@@ -11,17 +12,17 @@ internal class MyQuote : IAddChild
     private Paragraph _paragraph;
     private MyFlowDocument _flowDocument;
     private QuoteBlock _quoteBlock;
-    private MarkdownThemes _themes;
+    private MarkdownTextBlock _control;
 
     public TextElement TextElement
     {
         get => _paragraph;
     }
 
-    public MyQuote(QuoteBlock quoteBlock, MarkdownThemes themes)
+    public MyQuote(QuoteBlock quoteBlock, MarkdownTextBlock control)
     {
         _quoteBlock = quoteBlock;
-        _themes = themes;
+        _control = control;
         _paragraph = new Paragraph();
 
         _flowDocument = new MyFlowDocument(quoteBlock);
@@ -32,24 +33,24 @@ public MyQuote(QuoteBlock quoteBlock, MarkdownThemes themes)
         grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) });
 
         var bar = new Grid();
-        var borderThickness = _themes.QuoteBorderThickness.Left > 0 ? _themes.QuoteBorderThickness.Left : 4;
+        var borderThickness = _control.QuoteBorderThickness.Left > 0 ? _control.QuoteBorderThickness.Left : 4;
         bar.Width = borderThickness;
-        bar.Background = _themes.QuoteBorderBrush ?? new SolidColorBrush(Colors.Gray);
+        bar.Background = _control.QuoteBorderBrush;
         bar.SetValue(Grid.ColumnProperty, 0);
         bar.VerticalAlignment = VerticalAlignment.Stretch;
-        bar.Margin = new Thickness(0, 0, 4, 0);
+        bar.Margin = _control.QuoteBarMargin;
         grid.Children.Add(bar);
 
     var rightGrid = new Grid();
-    rightGrid.Padding = _themes.QuotePadding;
-    rightGrid.Background = _themes.QuoteBackground;
-    rightGrid.CornerRadius = _themes.QuoteCornerRadius;
+    rightGrid.Padding = _control.QuotePadding;
+    rightGrid.Background = _control.QuoteBackground;
+    rightGrid.CornerRadius = _control.QuoteCornerRadius;
         rightGrid.Children.Add(_flowDocument.RichTextBlock);
-    _flowDocument.RichTextBlock.Foreground = _themes.QuoteForeground;
+    _flowDocument.RichTextBlock.Foreground = _control.QuoteForeground;
 
         rightGrid.SetValue(Grid.ColumnProperty, 1);
         grid.Children.Add(rightGrid);
-        grid.Margin = _themes.QuoteMargin;
+        grid.Margin = _control.QuoteMargin;
 
         inlineUIContainer.Child = grid;
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyTable.cs b/components/MarkdownTextBlock/src/TextElements/MyTable.cs
index 2cd341cb5..11d45e193 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyTable.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyTable.cs
@@ -18,7 +18,7 @@ public TextElement TextElement
         get => _paragraph;
     }
 
-    public MyTable(Table table, MarkdownThemes themes)
+    public MyTable(Table table, MarkdownTextBlock control)
     {
         _table = table;
         _paragraph = new Paragraph();
@@ -29,11 +29,11 @@ public MyTable(Table table, MarkdownThemes themes)
         (
             column,
             table.Count,
-            borderThickness: themes.TableBorderThickness,
-            themes.TableBorderBrush ?? themes.BorderBrush,
-            themes.TableHeadingBackground,
-            themes.CornerRadius,
-            themes.TableMargin
+            borderThickness: control.TableBorderThickness,
+            control.TableBorderBrush,
+            control.TableHeadingBackground,
+            control.TableCornerRadius,
+            control.TableMargin
         );
 
         var inlineUIContainer = new InlineUIContainer();
diff --git a/components/MarkdownTextBlock/src/TextElements/MyTableCell.cs b/components/MarkdownTextBlock/src/TextElements/MyTableCell.cs
index 46c4f71cb..be020153e 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyTableCell.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyTableCell.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
 using Markdig.Extensions.Tables;
 
 namespace CommunityToolkit.WinUI.Controls.TextElements;
@@ -46,7 +47,7 @@ public int RowIndex
         get => _rowIndex;
     }
 
-    public MyTableCell(TableCell tableCell, TextAlignment textAlignment, bool isHeader, int columnIndex, int rowIndex, MarkdownThemes themes)
+    public MyTableCell(TableCell tableCell, TextAlignment textAlignment, bool isHeader, int columnIndex, int rowIndex, MarkdownTextBlock control)
     {
         _isHeader = isHeader;
         _tableCell = tableCell;
@@ -67,7 +68,7 @@ public MyTableCell(TableCell tableCell, TextAlignment textAlignment, bool isHead
         };
 
         // Use themed table cell padding
-        _container.Padding = themes.TableCellPadding;
+        _container.Padding = control.TableCellPadding;
         if (_isHeader)
         {
             _flowDocument.RichTextBlock.FontWeight = FontWeights.Bold;
diff --git a/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs b/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
index 771ef37c2..e3c399962 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
@@ -17,7 +17,7 @@ public TextElement TextElement
         get => _paragraph;
     }
 
-    public MyThematicBreak(ThematicBreakBlock thematicBreakBlock, MarkdownThemes themes)
+    public MyThematicBreak(ThematicBreakBlock thematicBreakBlock, MarkdownTextBlock control)
     {
         _thematicBreakBlock = thematicBreakBlock;
         _paragraph = new Paragraph();
@@ -26,10 +26,10 @@ public MyThematicBreak(ThematicBreakBlock thematicBreakBlock, MarkdownThemes the
         Line line = new Line
         {
             Stretch = Stretch.Fill,
-            Stroke = themes.HorizontalRuleBrush ?? themes.BorderBrush,
-            X2 = 1,
-            StrokeThickness = themes.HorizontalRuleThickness,
-            Margin = themes.HorizontalRuleMargin
+            Stroke = control.HorizontalRuleBrush,
+            X2 = control.HorizontalRuleX2,
+            StrokeThickness = control.HorizontalRuleThickness,
+            Margin = control.HorizontalRuleMargin
         };
         inlineUIContainer.Child = line;
         _paragraph.Inlines.Add(inlineUIContainer);
diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
index f7d58b888..123f96a8b 100644
--- a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -50,20 +50,11 @@ public async Task ImageProvider_WithThemeConstraints_ShouldNotApplyConstraintsTo
         // Arrange: Image provider returns a 100x100 image
         var provider = new TestImageProvider(width: 100, height: 100);
         
-        var config = new MarkdownConfig
-        {
-            ImageProvider = provider,
-            Themes = new MarkdownThemes
-            {
-                // Theme allows images up to 500px wide
-                ImageMaxWidth = 500,
-                ImageMaxHeight = 500
-            }
-        };
-
         var markdown = new MarkdownTextBlock
         {
-            Config = config,
+            ImageProvider = provider,
+            ImageMaxWidth = 500,
+            ImageMaxHeight = 500,
             // Image URL with no precedent dimensions specified
             Text = "![Test Image](test://example.png)"
         };
@@ -100,19 +91,11 @@ public async Task ImageProvider_WithPrecedentDimensions_ShouldUsePrecedent()
         // Arrange: Image provider returns a 100x100 image
         var provider = new TestImageProvider(width: 100, height: 100);
         
-        var config = new MarkdownConfig
-        {
-            ImageProvider = provider,
-            Themes = new MarkdownThemes
-            {
-                ImageMaxWidth = 500,
-                ImageMaxHeight = 500
-            }
-        };
-
         var markdown = new MarkdownTextBlock
         {
-            Config = config,
+            ImageProvider = provider,
+            ImageMaxWidth = 500,
+            ImageMaxHeight = 500,
             // Image with explicit width specified in markdown
             Text = "<img src=\"test://example.png\" width=\"200\">"
         };
@@ -136,20 +119,12 @@ public async Task ImageProvider_WithSmallerThemeConstraint_ShouldApplyThemeConst
         // Arrange: Image provider returns a 800x600 image
         var provider = new TestImageProvider(width: 800, height: 600);
         
-        var config = new MarkdownConfig
-        {
-            ImageProvider = provider,
-            Themes = new MarkdownThemes
-            {
-                // Theme constrains images to max 400px
-                ImageMaxWidth = 400,
-                ImageMaxHeight = 400
-            }
-        };
-
         var markdown = new MarkdownTextBlock
         {
-            Config = config,
+            ImageProvider = provider,
+            // Theme constrains images to max 400px
+            ImageMaxWidth = 400,
+            ImageMaxHeight = 400,
             Text = "![Test Image](test://large.png)"
         };
 

From bbdbff07d277a90eaf02cdd36bffc66b10ff13cc Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:29:13 +0100
Subject: [PATCH 2/6] Perf improvements

---
 components/MarkdownTextBlock/src/HtmlWriter.cs        |  6 +++++-
 .../MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs   | 11 +++++++++++
 .../MarkdownTextBlock/src/Renderers/WinUIRenderer.cs  | 10 +++-------
 .../MarkdownTextBlock/src/TextElements/MyImage.cs     |  5 +----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/components/MarkdownTextBlock/src/HtmlWriter.cs b/components/MarkdownTextBlock/src/HtmlWriter.cs
index 8cf56c7ba..00381418d 100644
--- a/components/MarkdownTextBlock/src/HtmlWriter.cs
+++ b/components/MarkdownTextBlock/src/HtmlWriter.cs
@@ -84,7 +84,11 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                 if (tag == "details")
                 {
                     block = new MyDetails(node);
-                    node.ChildNodes.Remove(node.ChildNodes.FirstOrDefault(x => x.Name == "summary" || x.Name == "header"));
+                    var summaryNode = node.ChildNodes.FirstOrDefault(x => x.Name == "summary" || x.Name == "header");
+                    if (summaryNode != null)
+                    {
+                        node.ChildNodes.Remove(summaryNode);
+                    }
                     renderer.Push(block);
                     WriteHtml(renderer, node.ChildNodes);
                 }
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
index 657a31d9a..a36bec569 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
@@ -47,9 +47,20 @@ public MarkdownTextBlock()
     {
         this.DefaultStyleKey = typeof(MarkdownTextBlock);
         _document = new MyFlowDocument();
+        this.Loaded += OnLoaded;
+        this.Unloaded += OnUnloaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
         this.ActualThemeChanged += OnActualThemeChanged;
     }
 
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        this.ActualThemeChanged -= OnActualThemeChanged;
+    }
+
     private void OnActualThemeChanged(FrameworkElement sender, object args)
     {
         if (!_themePropertyChangeQueued)
diff --git a/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs b/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
index 21f624329..34cfd3ed7 100644
--- a/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
+++ b/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
@@ -118,14 +118,10 @@ public void WriteText(string? text, int offset, int length)
         {
             if (length > _buffer.Length)
             {
-                _buffer = text.ToCharArray();
-                WriteText(new string(_buffer, offset, length));
-            }
-            else
-            {
-                text.CopyTo(offset, _buffer, 0, length);
-                WriteText(new string(_buffer, 0, length));
+                _buffer = new char[Math.Max(length, _buffer.Length * 2)];
             }
+            text.CopyTo(offset, _buffer, 0, length);
+            WriteText(new string(_buffer, 0, length));
         }
     }
 
diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index 7ae126025..fb5ae415f 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -125,10 +125,7 @@ private async void LoadImage(object sender, RoutedEventArgs e)
             }
             else
             {
-                HttpClient client = new HttpClient();
-
-                // Download data from URL
-                HttpResponseMessage response = await client.GetAsync(_uri);
+                HttpResponseMessage response = await _sharedHttpClient.GetAsync(_uri);
 
 
                 // Get the Content-Type header

From ce31ab7332733bc0fdb378b5cbb0c56ce5f665a9 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:36:02 +0100
Subject: [PATCH 3/6] XAML styling

---
 .../MarkdownTextBlockCustomThemeSample.xaml   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
index e5455d3a8..5da90bafc 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <local:MarkdownTextBlockCustomThemeSampleBase x:Class="MarkdownTextBlockExperiment.Samples.MarkdownTextBlockCustomThemeSample"
                                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,37 +11,37 @@
     <ScrollViewer>
         <controls:MarkdownTextBlock x:Name="MarkdownTextBlock"
                                     Margin="12"
+                                    BoldFontWeight="{x:Bind GetBoldFontWeight(BoldFontWeightIndex), Mode=OneWay}"
+                                    CodeBlockBackground="{x:Bind GetCodeBackgroundBrush(CodeBlockBackgroundColorIndex), Mode=OneWay}"
+                                    CodeBlockBorderBrush="{x:Bind GetCodeBorderBrush(CodeBlockBorderColorIndex), Mode=OneWay}"
+                                    CodeBlockBorderThickness="{x:Bind GetUniformThickness(CodeBlockBorderThickness), Mode=OneWay}"
+                                    CodeBlockCornerRadius="{x:Bind GetUniformCornerRadius(CodeBlockCornerRadius), Mode=OneWay}"
+                                    CodeBlockFontFamily="{x:Bind GetCodeFont(CodeBlockFontIndex), Mode=OneWay}"
+                                    CodeBlockPadding="{x:Bind GetUniformThickness(CodeBlockPadding), Mode=OneWay}"
                                     H1FontSize="{x:Bind H1FontSize, Mode=OneWay}"
                                     H1Foreground="{x:Bind GetHeadingBrush(H1ColorIndex), Mode=OneWay}"
                                     H2FontSize="{x:Bind H2FontSize, Mode=OneWay}"
                                     H3FontSize="{x:Bind H3FontSize, Mode=OneWay}"
-                                    InlineCodeFontSize="{x:Bind InlineCodeFontSize, Mode=OneWay}"
-                                    InlineCodePadding="{x:Bind GetHorizontalPadding(InlineCodePadding), Mode=OneWay}"
-                                    InlineCodeCornerRadius="{x:Bind GetUniformCornerRadius(InlineCodeCornerRadius), Mode=OneWay}"
-                                    InlineCodeBorderThickness="{x:Bind GetUniformThickness(InlineCodeBorderThickness), Mode=OneWay}"
-                                    InlineCodeForeground="{x:Bind GetInlineCodeBrush(InlineCodeColorIndex), Mode=OneWay}"
-                                    InlineCodeBackground="{x:Bind GetCodeBackgroundBrush(InlineCodeBackgroundColorIndex), Mode=OneWay}"
-                                    InlineCodeBorderBrush="{x:Bind GetCodeBorderBrush(InlineCodeBorderColorIndex), Mode=OneWay}"
-                                    CodeBlockPadding="{x:Bind GetUniformThickness(CodeBlockPadding), Mode=OneWay}"
-                                    CodeBlockCornerRadius="{x:Bind GetUniformCornerRadius(CodeBlockCornerRadius), Mode=OneWay}"
-                                    CodeBlockBorderThickness="{x:Bind GetUniformThickness(CodeBlockBorderThickness), Mode=OneWay}"
-                                    CodeBlockFontFamily="{x:Bind GetCodeFont(CodeBlockFontIndex), Mode=OneWay}"
-                                    CodeBlockBackground="{x:Bind GetCodeBackgroundBrush(CodeBlockBackgroundColorIndex), Mode=OneWay}"
-                                    CodeBlockBorderBrush="{x:Bind GetCodeBorderBrush(CodeBlockBorderColorIndex), Mode=OneWay}"
-                                    QuoteBorderThickness="{x:Bind GetLeftBorderThickness(QuoteBorderWidth), Mode=OneWay}"
-                                    QuotePadding="{x:Bind GetHorizontalPadding(QuotePadding), Mode=OneWay}"
-                                    QuoteCornerRadius="{x:Bind GetRightCornerRadius(QuoteCornerRadius), Mode=OneWay}"
-                                    QuoteBorderBrush="{x:Bind GetQuoteBrush(QuoteColorIndex), Mode=OneWay}"
-                                    TableCellPadding="{x:Bind GetHorizontalPadding(TableCellPadding), Mode=OneWay}"
-                                    TableBorderThickness="{x:Bind TableBorderThickness, Mode=OneWay}"
-                                    HorizontalRuleThickness="{x:Bind HorizontalRuleThickness, Mode=OneWay}"
                                     HorizontalRuleMargin="{x:Bind GetVerticalMargin(HorizontalRuleMargin), Mode=OneWay}"
-                                    ImageMaxWidth="{x:Bind ImageMaxWidth, Mode=OneWay}"
+                                    HorizontalRuleThickness="{x:Bind HorizontalRuleThickness, Mode=OneWay}"
                                     ImageMaxHeight="{x:Bind ImageMaxHeight, Mode=OneWay}"
+                                    ImageMaxWidth="{x:Bind ImageMaxWidth, Mode=OneWay}"
                                     ImageStretch="{x:Bind GetImageStretch(ImageStretchIndex), Mode=OneWay}"
-                                    BoldFontWeight="{x:Bind GetBoldFontWeight(BoldFontWeightIndex), Mode=OneWay}"
+                                    InlineCodeBackground="{x:Bind GetCodeBackgroundBrush(InlineCodeBackgroundColorIndex), Mode=OneWay}"
+                                    InlineCodeBorderBrush="{x:Bind GetCodeBorderBrush(InlineCodeBorderColorIndex), Mode=OneWay}"
+                                    InlineCodeBorderThickness="{x:Bind GetUniformThickness(InlineCodeBorderThickness), Mode=OneWay}"
+                                    InlineCodeCornerRadius="{x:Bind GetUniformCornerRadius(InlineCodeCornerRadius), Mode=OneWay}"
+                                    InlineCodeFontSize="{x:Bind InlineCodeFontSize, Mode=OneWay}"
+                                    InlineCodeForeground="{x:Bind GetInlineCodeBrush(InlineCodeColorIndex), Mode=OneWay}"
+                                    InlineCodePadding="{x:Bind GetHorizontalPadding(InlineCodePadding), Mode=OneWay}"
                                     ListBulletSpacing="{x:Bind ListBulletSpacing, Mode=OneWay}"
                                     ListGutterWidth="{x:Bind ListGutterWidth, Mode=OneWay}"
+                                    QuoteBorderBrush="{x:Bind GetQuoteBrush(QuoteColorIndex), Mode=OneWay}"
+                                    QuoteBorderThickness="{x:Bind GetLeftBorderThickness(QuoteBorderWidth), Mode=OneWay}"
+                                    QuoteCornerRadius="{x:Bind GetRightCornerRadius(QuoteCornerRadius), Mode=OneWay}"
+                                    QuotePadding="{x:Bind GetHorizontalPadding(QuotePadding), Mode=OneWay}"
+                                    TableBorderThickness="{x:Bind TableBorderThickness, Mode=OneWay}"
+                                    TableCellPadding="{x:Bind GetHorizontalPadding(TableCellPadding), Mode=OneWay}"
                                     Text="{x:Bind MarkdownText, Mode=OneWay}" />
     </ScrollViewer>
 </local:MarkdownTextBlockCustomThemeSampleBase>

From 363899661642254834cf1292d48805fbaf5f2c3e Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:44:19 +0100
Subject: [PATCH 4/6] Removing RuleX2

---
 .../MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs | 8 --------
 components/MarkdownTextBlock/src/MarkdownTextBlock.xaml   | 1 -
 .../MarkdownTextBlock/src/TextElements/MyThematicBreak.cs | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
index efad7561c..afe60249f 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
@@ -451,12 +451,6 @@ private static void OnThemePropertyChanged(DependencyObject d, DependencyPropert
     public static readonly DependencyProperty HorizontalRuleMarginProperty =
         DependencyProperty.Register(nameof(HorizontalRuleMargin), typeof(Thickness), typeof(MarkdownTextBlock), new PropertyMetadata(default(Thickness), OnThemePropertyChanged));
 
-    /// <summary>
-    /// Identifies the <see cref="HorizontalRuleX2"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty HorizontalRuleX2Property =
-        DependencyProperty.Register(nameof(HorizontalRuleX2), typeof(double), typeof(MarkdownTextBlock), new PropertyMetadata(0d, OnThemePropertyChanged));
-
     // ── Link ────────────────────────────────────────────────────────────
 
     /// <summary>
@@ -818,8 +812,6 @@ public bool IsTextSelectionEnabled
     public double HorizontalRuleThickness { get => (double)GetValue(HorizontalRuleThicknessProperty); set => SetValue(HorizontalRuleThicknessProperty, value); }
     /// <summary>Gets or sets the margin around horizontal rules.</summary>
     public Thickness HorizontalRuleMargin { get => (Thickness)GetValue(HorizontalRuleMarginProperty); set => SetValue(HorizontalRuleMarginProperty, value); }
-    /// <summary>Gets or sets the X2 endpoint coordinate for horizontal rules.</summary>
-    public double HorizontalRuleX2 { get => (double)GetValue(HorizontalRuleX2Property); set => SetValue(HorizontalRuleX2Property, value); }
 
     /// <summary>Gets or sets the foreground brush for hyperlinks.</summary>
     public Brush LinkForeground { get => (Brush)GetValue(LinkForegroundProperty); set => SetValue(LinkForegroundProperty, value); }
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
index 22dc251e2..f2596f06b 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml
@@ -200,7 +200,6 @@
         <Setter Property="HorizontalRuleBrush" Value="{ThemeResource MarkdownTextBlockHorizontalRuleBrush}" />
         <Setter Property="HorizontalRuleThickness" Value="1" />
         <Setter Property="HorizontalRuleMargin" Value="0,12,0,12" />
-        <Setter Property="HorizontalRuleX2" Value="1" />
 
         <!--  Link properties  -->
         <Setter Property="LinkForeground" Value="{ThemeResource MarkdownTextBlockLinkForeground}" />
diff --git a/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs b/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
index e3c399962..4634d6daa 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyThematicBreak.cs
@@ -27,7 +27,7 @@ public MyThematicBreak(ThematicBreakBlock thematicBreakBlock, MarkdownTextBlock
         {
             Stretch = Stretch.Fill,
             Stroke = control.HorizontalRuleBrush,
-            X2 = control.HorizontalRuleX2,
+            X2 = 1,
             StrokeThickness = control.HorizontalRuleThickness,
             Margin = control.HorizontalRuleMargin
         };

From a923ea20fe9d61149c5eb3d26aa7cb101b31bd5a Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:46:11 +0100
Subject: [PATCH 5/6] Update ExampleMarkdownTextBlockTestClass.cs

---
 .../tests/ExampleMarkdownTextBlockTestClass.cs               | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/MarkdownTextBlock/tests/ExampleMarkdownTextBlockTestClass.cs b/components/MarkdownTextBlock/tests/ExampleMarkdownTextBlockTestClass.cs
index 77b42e04d..ffef2ccc0 100644
--- a/components/MarkdownTextBlock/tests/ExampleMarkdownTextBlockTestClass.cs
+++ b/components/MarkdownTextBlock/tests/ExampleMarkdownTextBlockTestClass.cs
@@ -135,10 +135,7 @@ public async Task ComplexAsyncLoadUIExampleWithoutDispatcherTest()
     [UIThreadTestMethod]
     public async Task MarkdownTextBlockEmptyTextValueTest()
     {
-        var component = new MarkdownTextBlock
-        {
-            Config = new()
-        };
+        var component = new MarkdownTextBlock();
 
         Assert.IsNotNull(component);
         Assert.IsFalse(component.IsLoaded);

From 5d6b4ffd080ea335ca7f942bc586674081be2eb0 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 24 Feb 2026 15:57:58 +0100
Subject: [PATCH 6/6] Fix CI

---
 .../MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs | 4 +++-
 .../MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs       | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
index afe60249f..6c0aaf327 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.Properties.cs
@@ -7,9 +7,11 @@
 #if !WINAPPSDK
 using FontWeight = Windows.UI.Text.FontWeight;
 using FontWeights = Windows.UI.Text.FontWeights;
+using DispatcherQueue = Windows.System.DispatcherQueue;
 #else
 using FontWeight = Windows.UI.Text.FontWeight;
 using FontWeights = Microsoft.UI.Text.FontWeights;
+using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
 #endif
 
 namespace CommunityToolkit.WinUI.Controls;
@@ -163,7 +165,7 @@ private static void OnThemePropertyChanged(DependencyObject d, DependencyPropert
         if (d is MarkdownTextBlock self && !self._themePropertyChangeQueued)
         {
             self._themePropertyChangeQueued = true;
-            self.DispatcherQueue.TryEnqueue(() =>
+            DispatcherQueue.GetForCurrentThread().TryEnqueue(() =>
             {
                 self._themePropertyChangeQueued = false;
                 self.ApplyText(true);
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
index a36bec569..ea266d19e 100644
--- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
+++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
@@ -10,6 +10,12 @@
 using Markdig;
 using Markdig.Syntax;
 
+#if !WINAPPSDK
+using DispatcherQueue = Windows.System.DispatcherQueue;
+#else
+using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
+#endif
+
 namespace CommunityToolkit.WinUI.Controls;
 
 [TemplatePart(Name = MarkdownContainerName, Type = typeof(Grid))]
@@ -66,7 +72,7 @@ private void OnActualThemeChanged(FrameworkElement sender, object args)
         if (!_themePropertyChangeQueued)
         {
             _themePropertyChangeQueued = true;
-            DispatcherQueue.TryEnqueue(() =>
+            DispatcherQueue.GetForCurrentThread().TryEnqueue(() =>
             {
                 _themePropertyChangeQueued = false;
                 ApplyText(true);