diff --git a/Version.json b/Version.json
index adf8c7f..787c13a 100644
--- a/Version.json
+++ b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.1.3",
+    "version": "2.2",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"
diff --git a/src/CrissCross.WPF.UI.Gallery/MainWindow.xaml b/src/CrissCross.WPF.UI.Gallery/MainWindow.xaml
index c860a60..5b1fa80 100644
--- a/src/CrissCross.WPF.UI.Gallery/MainWindow.xaml
+++ b/src/CrissCross.WPF.UI.Gallery/MainWindow.xaml
@@ -14,14 +14,13 @@
     x:TypeArguments="local:MainWindowViewModel"
     mc:Ignorable="d">
     <ui:FluentNavigationWindow.LeftContent>
-        <StackPanel>
+        <ui:StackPanel>
             <ui:TextBox Margin="3,0,0,0" Text="{Binding Filter, ElementName=NavigationLeft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <ui:TextBox.Icon>
                     <ui:SymbolIcon Symbol="Search20" />
                 </ui:TextBox.Icon>
             </ui:TextBox>
             <ui:NavigationVMLeft x:Name="NavigationLeft" />
-        </StackPanel>
+        </ui:StackPanel>
     </ui:FluentNavigationWindow.LeftContent>
-    <Grid />
 </ui:FluentNavigationWindow>
diff --git a/src/CrissCross.WPF.UI.Gallery/Views/MainView.xaml b/src/CrissCross.WPF.UI.Gallery/Views/MainView.xaml
index 980c4ac..2de1b0a 100644
--- a/src/CrissCross.WPF.UI.Gallery/Views/MainView.xaml
+++ b/src/CrissCross.WPF.UI.Gallery/Views/MainView.xaml
@@ -13,28 +13,46 @@
         Margin="0,0,0,20"
         CanContentScroll="True"
         VerticalScrollBarVisibility="Auto">
-        <StackPanel>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
             <ui:TextBlock
                 FontSize="20"
                 FontWeight="Medium"
                 Text="Welcome to CrissCross" />
             <ui:TextBlock
+                Grid.Row="1"
                 FontSize="16"
                 FontWeight="Normal"
                 Text="Step 1: Add the CrissCross.UI namespace to your XAML file." />
             <ui:TextBlock
+                Grid.Row="2"
                 FontSize="16"
                 FontWeight="Normal"
                 Text="xmlns:ui='https://github.com/reactivemarbles/CrissCross.ui'" />
             <ui:TextBlock
+                Grid.Row="3"
                 FontSize="16"
                 FontWeight="Normal"
                 Text="Step 2: Use CrissCross UI components in your XAML." />
             <ui:TextBlock
+                Grid.Row="4"
                 FontSize="16"
                 FontWeight="Normal"
                 Text="Example:" />
             <Border
+                Grid.Row="5"
                 Padding="10"
                 BorderBrush="Black"
                 BorderThickness="1">
@@ -44,29 +62,34 @@
                     Text="&lt;ui:TextBlock FontSize='20' FontWeight='Medium' Text='Welcome to CrissCross' /&gt;" />
             </Border>
             <ui:TextBlock
+                Grid.Row="6"
                 FontSize="16"
                 FontWeight="Normal"
                 Text="Step 3: Build and run your application to see the CrissCross UI components in action." />
             <ui:TextBlock
+                Grid.Row="7"
                 Margin="0,10"
                 FontSize="20"
                 FontWeight="Medium"
                 Text="Project Setup - use the following as a guide for setting up your initial application" />
             <ui:TextBlock
                 x:Name="AppXamlSetup"
+                Grid.Row="8"
                 Margin="0,10"
                 FontSize="12"
                 FontWeight="Normal" />
             <ui:TextBlock
                 x:Name="MainWindowXamlSetup"
+                Grid.Row="9"
                 Margin="0,10"
                 FontSize="12"
                 FontWeight="Normal" />
             <ui:TextBlock
                 x:Name="MainWindowXamlCsSetup"
+                Grid.Row="10"
                 Margin="0,10"
                 FontSize="12"
                 FontWeight="Normal" />
-        </StackPanel>
+        </Grid>
     </ui:DynamicScrollViewer>
 </UserControl>
diff --git a/src/CrissCross.WPF.UI/Controls/Card/Card.xaml b/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
index cf822a7..4394e37 100644
--- a/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
+++ b/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
@@ -44,7 +44,14 @@
                             <ContentPresenter
                                 x:Name="ContentPresenter"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                <ContentPresenter.Resources>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
                         </Border>
 
                         <Border
@@ -56,7 +63,14 @@
                             BorderThickness="1"
                             CornerRadius="0,0,4,4"
                             Visibility="Collapsed">
-                            <ContentPresenter x:Name="FooterContentPresenter" Content="{TemplateBinding Footer}" />
+                            <ContentPresenter x:Name="FooterContentPresenter" Content="{TemplateBinding Footer}">
+                                <ContentPresenter.Resources>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
                         </Border>
                     </Grid>
 
diff --git a/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml b/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
index b2f152f..c54a474 100644
--- a/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
@@ -68,7 +68,14 @@
                                 Grid.Column="1"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                                TextElement.Foreground="{TemplateBinding Foreground}">
+                                <ContentPresenter.Resources>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
 
                             <controls:SymbolIcon
                                 x:Name="ChevronIcon"
diff --git a/src/CrissCross.WPF.UI/Controls/CardColor/CardColor.xaml b/src/CrissCross.WPF.UI/Controls/CardColor/CardColor.xaml
index e9923ec..92293e9 100644
--- a/src/CrissCross.WPF.UI/Controls/CardColor/CardColor.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardColor/CardColor.xaml
@@ -44,7 +44,9 @@
                                 Margin="0"
                                 FontSize="{TemplateBinding SubtitleFontSize}"
                                 Foreground="{DynamicResource CardForegroundPressed}"
-                                Text="{TemplateBinding Subtitle}" />
+                                Text="{TemplateBinding Subtitle}"
+                                TextAlignment="Center"
+                                TextWrapping="Wrap" />
                         </StackPanel>
                     </Border>
                 </ControlTemplate>
diff --git a/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml b/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
index 7cd66ae..b29af62 100644
--- a/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
@@ -65,14 +65,28 @@
                                 Grid.Column="1"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Header}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                                TextElement.Foreground="{TemplateBinding Foreground}">
+                                <ContentPresenter.Resources>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
                             <ContentPresenter
                                 x:Name="ContentPresenter"
                                 Grid.Column="2"
                                 Margin="{StaticResource CardControlContentMargin}"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                                TextElement.Foreground="{TemplateBinding Foreground}">
+                                <ContentPresenter.Resources>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
diff --git a/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml b/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
index 4b9a231..6233516 100644
--- a/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
@@ -24,7 +24,14 @@
                 Grid.Column="0"
                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Content="{TemplateBinding Content}" />
+                Content="{TemplateBinding Content}">
+                <ContentPresenter.Resources>
+                    <Style TargetType="{x:Type TextBlock}">
+                        <Setter Property="TextWrapping" Value="Wrap" />
+                        <Setter Property="TextAlignment" Value="Center" />
+                    </Style>
+                </ContentPresenter.Resources>
+            </ContentPresenter>
             <Grid
                 x:Name="ChevronGrid"
                 Grid.Column="1"
@@ -147,7 +154,14 @@
                                             x:Name="HeaderContentPresenter"
                                             Grid.Column="1"
                                             Content="{TemplateBinding Header}"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                                            TextElement.Foreground="{TemplateBinding Foreground}">
+                                            <ContentPresenter.Resources>
+                                                <Style TargetType="{x:Type TextBlock}">
+                                                    <Setter Property="TextWrapping" Value="Wrap" />
+                                                    <Setter Property="TextAlignment" Value="Center" />
+                                                </Style>
+                                            </ContentPresenter.Resources>
+                                        </ContentPresenter>
                                     </Grid>
                                 </ToggleButton.Content>
                             </ToggleButton>