diff --git a/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml b/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml
index a5ccba5..9a4a9e8 100644
--- a/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml
@@ -1,7 +1,7 @@
 <Styles  xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="using:Avalonia.Xaml.Interactivity"
-        xmlns:b="using:Avalonia.Xaml.Interactivity.Draggable">        
+        xmlns:id="using:Avalonia.Xaml.Interactions.Draggable">        
 	<Design.PreviewWith>
 		<AuraTabView TabStripPlacement="Right">
 			<AuraTabItem Header="Hello" 
@@ -51,7 +51,7 @@
 		<Setter Property="(i:Interaction.Behaviors)">
       <i:BehaviorCollectionTemplate>
         <i:BehaviorCollection>
-          <b:ItemDragBehavior Orientation="Horizontal" />
+          <id:ItemDragBehavior Orientation="Horizontal" />
         </i:BehaviorCollection>
       </i:BehaviorCollectionTemplate>
 		</Setter> 
@@ -112,13 +112,11 @@
 	<Style Selector="AuraTabItem[TabStripPlacement=Bottom]">
 		<Setter Property="CornerRadius" Value="0,0,7,7" />		
 		<Setter Property="(i:Interaction.Behaviors)">
-			<b:SharedContentTemplate>
-				<b:SharedContent>
-					<i:BehaviorCollection>
-						<b:ItemDragBehavior Orientation="Horizontal"/>
-					</i:BehaviorCollection>
-				</b:SharedContent>
-			</b:SharedContentTemplate>
+      <i:BehaviorCollectionTemplate>
+        <i:BehaviorCollection>
+          <id:ItemDragBehavior Orientation="Horizontal" />
+        </i:BehaviorCollection>
+      </i:BehaviorCollectionTemplate>
 		</Setter> 
 		<Setter Property="Template">
 			<ControlTemplate>
@@ -169,13 +167,11 @@
 	<Style Selector="AuraTabItem[TabStripPlacement=Left]">
 		<Setter Property="CornerRadius" Value="7,0,0,7" />		
 		<Setter Property="(i:Interaction.Behaviors)">
-			<b:SharedContentTemplate>
-				<b:SharedContent>
-					<i:BehaviorCollection>
-						<b:ItemDragBehavior Orientation="Vertical"/>
-					</i:BehaviorCollection>
-				</b:SharedContent>
-			</b:SharedContentTemplate>
+      <i:BehaviorCollectionTemplate>
+        <i:BehaviorCollection>
+          <id:ItemDragBehavior Orientation="Vertical" />
+        </i:BehaviorCollection>
+      </i:BehaviorCollectionTemplate>
 		</Setter> 
 		<Setter Property="Template">
 			<ControlTemplate>
@@ -239,13 +235,11 @@
 	<Style Selector="AuraTabItem[TabStripPlacement=Right]">
 		<Setter Property="CornerRadius" Value="0,7,7,0" />	
 		<Setter Property="(i:Interaction.Behaviors)">
-			<b:SharedContentTemplate>
-				<b:SharedContent>
-					<i:BehaviorCollection>
-						<b:ItemDragBehavior Orientation="Vertical"/>
-					</i:BehaviorCollection>
-				</b:SharedContent>
-			</b:SharedContentTemplate>
+      <i:BehaviorCollectionTemplate>
+        <i:BehaviorCollection>
+          <id:ItemDragBehavior Orientation="Vertical" />
+        </i:BehaviorCollection>
+      </i:BehaviorCollectionTemplate>
 		</Setter> 
 		<Setter Property="Template">
 			<ControlTemplate>
diff --git a/src/Aura.UI.FluentTheme/Controls/AuraTabViewStyles.xaml b/src/Aura.UI.FluentTheme/Controls/AuraTabViewStyles.xaml
index 470f2d8..d04edc8 100644
--- a/src/Aura.UI.FluentTheme/Controls/AuraTabViewStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/AuraTabViewStyles.xaml
@@ -31,13 +31,19 @@
 		</DrawingImage>
 	</Styles.Resources>
 	<Style Selector="AuraTabView">
-	    <Setter Property="Background" Value="{DynamicResource AuraTabViewBackground}"/>
+	   <Setter Property="Background" Value="{DynamicResource AuraTabViewBackground}"/>
 		<Setter Property="SecondaryBackground" Value="Transparent"/>
 	</Style>
 	<Style Selector="AuraTabView /template/ ContentPresenter#PART_FallBackContent">
 		<Setter Property="IsVisible" Value="false"/>
 	</Style>
-	<Style Selector="AuraTabView:empty /template/ ContentPresenter#PART_FallBackContent">
+  <Style Selector="AuraTabView /template/ ContentPresenter#PART_HeaderPresenter">
+    <Setter Property="FontSize" Value="15"/>
+  </Style>
+  <Style Selector="AuraTabView /template/ ContentPresenter#PART_FooterPresenter">
+    <Setter Property="FontSize" Value="15"/>
+  </Style>
+  <Style Selector="AuraTabView:empty /template/ ContentPresenter#PART_FallBackContent">
 		<Setter Property="IsVisible" Value="True"/>
 	</Style>
 	<Style Selector="Border#PART_InternalBorder">
@@ -73,10 +79,10 @@
 							      Width="{TemplateBinding Width}"
 								  ColumnDefinitions="auto,auto,*,auto">
 								<!--Header-->
-								<ContentPresenter Grid.Column="0"
-												  Content="{TemplateBinding Header}"
+								<ContentPresenter Name="PART_HeaderPresenter"
+																	Grid.Column="0"
+																	Content="{TemplateBinding Header}"
 								                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-								                  TextBlock.FontSize="15"
 								                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
 								                  VerticalContentAlignment="Center"
 								                  Margin="5, 0"
@@ -89,9 +95,7 @@
 									</Grid.ColumnDefinitions>
 										<ItemsPresenter Grid.Column="0"
 										                Name="PART_ItemsPresenter"
-										                Items="{TemplateBinding Items}"
 										                ItemsPanel="{TemplateBinding ItemsPanel}"
-										                ItemTemplate="{TemplateBinding ItemTemplate}"
 										                HorizontalAlignment="Left"
 										                MaxWidth="{TemplateBinding MaxWidthOfItemsPresenter}">
 											<ItemsPresenter.Transitions>
@@ -128,10 +132,10 @@
 									</Border>	
 							</Grid>
 								<!--Footer-->
-								<ContentPresenter Grid.Column="3"
-												  Content="{TemplateBinding Footer}"
+								<ContentPresenter Name="PART_FooterPresenter"
+																	Grid.Column="3"
+																	Content="{TemplateBinding Footer}"
 								                  ContentTemplate="{TemplateBinding FooterTemplate}"
-								                  TextBlock.FontSize="15"
 								                  TextBlock.Foreground="{DynamicResource ThemeForegroundLowBrush}"
 								                  VerticalContentAlignment="Center"
 								                  Margin="5,0"
@@ -187,10 +191,10 @@
 								   Background="{TemplateBinding SecondaryBackground}"
 								   Width="{TemplateBinding Width}" ColumnDefinitions="auto,auto,*,auto">
 									<!--Header-->
-									<ContentPresenter Grid.Column="0"
-														Content="{TemplateBinding Header}"
+									<ContentPresenter Name="PART_HeaderPresenter"
+																		Grid.Column="0"
+																		Content="{TemplateBinding Header}"
 									                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-									                  TextBlock.FontSize="15"
 									                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
 									                  VerticalContentAlignment="Center"
 									                  Margin="5, 0"
@@ -203,9 +207,7 @@
 										</Grid.ColumnDefinitions>
 										<ItemsPresenter Grid.Column="0"
 														Name="PART_ItemsPresenter"
-														Items="{TemplateBinding Items}"
 														ItemsPanel="{TemplateBinding ItemsPanel}"
-														ItemTemplate="{TemplateBinding ItemTemplate}"
 														HorizontalAlignment="Left"
 														MaxWidth="{TemplateBinding MaxWidthOfItemsPresenter}">
 											<ItemsPresenter.Transitions>
@@ -240,10 +242,10 @@
 									</Grid>
 								
 									<!--Footer-->
-									<ContentPresenter Grid.Column="3" 
+									<ContentPresenter Name="PART_FooterPresenter"
+																	Grid.Column="3" 
 													Content="{TemplateBinding Footer}"
 													  ContentTemplate="{TemplateBinding FooterTemplate}"
-													  TextBlock.FontSize="15"
 													  TextBlock.Foreground="{DynamicResource ThemeForegroundLowBrush}"
 													  VerticalContentAlignment="Center"
 													  Margin="5,0"
@@ -300,9 +302,9 @@
 								   Name="PART_DockContainer"
 								Height="{Binding $parent[AuraTabView].Bounds.Height}">
 								<!--Header-->
-								<ContentPresenter Content="{TemplateBinding Header}"
+								<ContentPresenter Name="PART_HeaderPresenter"
+																	Content="{TemplateBinding Header}"
 								                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-								                  TextBlock.FontSize="15"
 								                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
 								                  VerticalContentAlignment="Center"
 								                  Margin="5, 5"
@@ -313,9 +315,7 @@
 									  RowDefinitions="*,auto">
 									<ItemsPresenter Grid.Row="0"
 									                Name="PART_ItemsPresenter"
-									                Items="{TemplateBinding Items}"
 									                ItemsPanel="{TemplateBinding ItemsPanel}"
-									                ItemTemplate="{TemplateBinding ItemTemplate}"
 									                HorizontalAlignment="Left" VerticalAlignment="Top"
 									                MaxHeight="{TemplateBinding MaxWidthOfItemsPresenter}">
 										<ItemsPresenter.Transitions>
@@ -350,9 +350,9 @@
 								</Grid>
 							
 								<!--Footer-->
-								<ContentPresenter Grid.Row="3" Content="{TemplateBinding Footer}"
+								<ContentPresenter Name="PART_FooterPresenter"
+																	Grid.Row="3" Content="{TemplateBinding Footer}"
 												  ContentTemplate="{TemplateBinding FooterTemplate}"
-												  TextBlock.FontSize="15"
 												  TextBlock.Foreground="{DynamicResource ThemeForegroundLowBrush}"
 												  VerticalContentAlignment="Center"
 												  Margin="5,5"
@@ -410,10 +410,10 @@
 								  Height="{TemplateBinding Height}" 
 								  RowDefinitions="auto,auto,*,auto"> 
 								<!--Header-->
-								<ContentPresenter Grid.Row="0"
-												  Content="{TemplateBinding Header}"
+								<ContentPresenter Name="PART_HeaderPresenter"
+																	Grid.Row="0"
+																	Content="{TemplateBinding Header}"
 								                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-								                  TextBlock.FontSize="15"
 								                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
 								                  VerticalContentAlignment="Center"
 								                  Margin="5, 5"
@@ -425,9 +425,7 @@
 										RowDefinitions="*,auto">
 									<ItemsPresenter Grid.Row="0"
 											 Name="PART_ItemsPresenter"
-											 Items="{TemplateBinding Items}"
 											 ItemsPanel="{TemplateBinding ItemsPanel}"
-											 ItemTemplate="{TemplateBinding ItemTemplate}"
 											 HorizontalAlignment="Left"
 											 MaxWidth="{TemplateBinding MaxWidthOfItemsPresenter}">
 										<ItemsPresenter.Transitions>
@@ -461,9 +459,9 @@
 									</Border>
 								</Grid>
 								<!--Footer-->
-								<ContentPresenter Grid.Row="3" Content="{TemplateBinding Footer}"
+								<ContentPresenter Name="PART_FooterPresenter"
+																	Grid.Row="3" Content="{TemplateBinding Footer}"
 												ContentTemplate="{TemplateBinding FooterTemplate}"
-												TextBlock.FontSize="15"
 												TextBlock.Foreground="{DynamicResource ThemeForegroundLowBrush}"
 												VerticalContentAlignment="Center"
 												Margin="5,5"
diff --git a/src/Aura.UI.FluentTheme/Controls/CardCollectionStyles.xaml b/src/Aura.UI.FluentTheme/Controls/CardCollectionStyles.xaml
index 3d91cee..de83747 100644
--- a/src/Aura.UI.FluentTheme/Controls/CardCollectionStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/CardCollectionStyles.xaml
@@ -1,5 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="CardCollection /template/ ContentPresenter#PART_HeaderPresenter">
+    <Setter Property="FontSize" Value="15"/>
+    <Setter Property="FontWeight" Value="Bold"/>
+  </Style>
 	<Style Selector="CardCollection">
 		<Setter Property="Header" Value="CardCollection" />
 		<Setter Property="Padding" Value="{DynamicResource CardCollectionPadding}" />
@@ -8,17 +12,12 @@
 				<Border Padding="{TemplateBinding Padding}">
 					<Grid RowDefinitions="Auto,*">
 						<ContentPresenter Name="PART_HeaderPresenter"
-											Content="{TemplateBinding Header}"
-											TextBlock.FontWeight="Bold"
-											TextBlock.FontSize="18" />
+											Content="{TemplateBinding Header}" />
 						<ScrollViewer Grid.Row="1"
 										HorizontalScrollBarVisibility="Auto"
 									  VerticalScrollBarVisibility="Auto">
 							<ItemsPresenter
-										Items="{TemplateBinding Items}"
-										ItemsPanel="{TemplateBinding ItemsPanel}" 
-										ItemTemplate="{TemplateBinding ItemTemplate}"
-										VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
+										ItemsPanel="{TemplateBinding ItemsPanel}" />
 						</ScrollViewer>
 					</Grid>
 				</Border>
diff --git a/src/Aura.UI.FluentTheme/Controls/CardControlStyles.xaml b/src/Aura.UI.FluentTheme/Controls/CardControlStyles.xaml
index 41c8973..db01455 100644
--- a/src/Aura.UI.FluentTheme/Controls/CardControlStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/CardControlStyles.xaml
@@ -7,6 +7,12 @@
 			</CardControl>
 		</Border>
 	</Design.PreviewWith>
+  <Style Selector="CardControl /template/ ContentPresenter#PART_HeaderPresenter">
+    <Setter Property="FontSize" Value="18"/>
+  </Style>
+  <Style Selector="CardControl /template/ ContentPresenter#PART_SecondaryHeaderPresenter">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseMediumHighBrush}"/>
+  </Style>
 	<Style Selector="CardControl">
 		<Setter Property="Padding" Value="10" />
 		<Setter Property="Width" Value="200"/>
@@ -43,12 +49,11 @@
 									                  Grid.Row="1"
 									                  Name="PART_HeaderPresenter"
 									                  Content="{TemplateBinding Header}"
-									                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-									                  TextBlock.FontSize="18" />
-									<ContentPresenter Grid.Column="1"
+									                  ContentTemplate="{TemplateBinding HeaderTemplate}"/>
+									<ContentPresenter Name="PART_SecondaryHeaderPresenter"
+																		Grid.Column="1"
 									                  Grid.Row="3"
-									                  Content="{TemplateBinding SecondaryHeader}"
-									                  TextBlock.Foreground="{DynamicResource SystemControlBackgroundBaseMediumHighBrush}" />
+									                  Content="{TemplateBinding SecondaryHeader}" />
 								</Grid>
 							</ExperimentalAcrylicBorder>
 						</Border>
diff --git a/src/Aura.UI.FluentTheme/Controls/FloatingButtonBar.xaml b/src/Aura.UI.FluentTheme/Controls/FloatingButtonBar.xaml
index 3d38f9c..45cc1f2 100644
--- a/src/Aura.UI.FluentTheme/Controls/FloatingButtonBar.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/FloatingButtonBar.xaml
@@ -59,7 +59,6 @@
 					</ToggleButton>
 					<ItemsPresenter Grid.Column="1"
 									Name="PART_ItemsPresenter"
-									Items="{TemplateBinding Items}"
 									ItemsPanel="{TemplateBinding ItemsPanel}">
 						<ItemsPresenter.Transitions>
 							<Transitions>
@@ -115,7 +114,6 @@
 			<ControlTemplate>
 				<Grid ColumnDefinitions="*,auto">
 					<ItemsPresenter Name="PART_ItemsPresenter"
-									Items="{TemplateBinding Items}"
 									ItemsPanel="{TemplateBinding ItemsPanel}"
 									HorizontalAlignment="Right">
 						<!--<ItemsPresenter.Transitions>
@@ -183,7 +181,6 @@
 			<ControlTemplate>
 				<Grid RowDefinitions="*,auto" ColumnDefinitions="auto">
 					<ItemsPresenter Name="PART_ItemsPresenter"
-									Items="{TemplateBinding Items}"
 									ItemsPanel="{TemplateBinding ItemsPanel}">
 						<!--<ItemsPresenter.Transitions>
 							<Transitions>
@@ -263,7 +260,6 @@
 						</ToggleButton.RenderTransform>
 					</ToggleButton>
 					<ItemsPresenter Grid.Row="1" Name="PART_ItemsPresenter"
-									Items="{TemplateBinding Items}"
 									ItemsPanel="{TemplateBinding ItemsPanel}">
 						<!--<ItemsPresenter.Transitions>
 							<Transitions>
diff --git a/src/Aura.UI.FluentTheme/Controls/MessageDialogStyles.xaml b/src/Aura.UI.FluentTheme/Controls/MessageDialogStyles.xaml
index a0ca8e0..c1a3e8b 100644
--- a/src/Aura.UI.FluentTheme/Controls/MessageDialogStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/MessageDialogStyles.xaml
@@ -18,6 +18,7 @@
 			<GeometryDrawing  Brush="#FFCC00" Geometry="M8.44 1H7.56L1 13.26L1.44 14H14.54L14.98 13.26L8.44 1ZM2.28 13L8 2.28L13.7 13H2.28ZM7.5 6H8.5V10H7.5V6ZM7.5 11H8.5V12H7.5V11Z"   />
 		</DrawingImage>
 	</Styles.Resources>
+
 	<Style Selector="MessageDialog">
 		<Setter Property="Background" Value="{DynamicResource MessageDialogBackground}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource MessageDialogBorderBrush}"/>
@@ -55,24 +56,21 @@
 									Grid.Column="1"
 									ColumnDefinitions="*,10,auto">
 									<ContentPresenter Name="PART_TitlePresenter"
-													  Content="{TemplateBinding Title}"
-													  TextBlock.FontSize="25"
-													  TextBlock.FontWeight="DemiBold" />
-									<Button Grid.Column="2" Padding="3"
-									Name="PART_ButtonClose"
-									VerticalAlignment="Top"
-									HorizontalAlignment="Right"
-									Margin="0"
-									Width="15" Height="15">
+													  Content="{TemplateBinding Title}" />
+												<Button Grid.Column="2" Padding="3"
+												Name="PART_ButtonClose"
+												VerticalAlignment="Top"
+												HorizontalAlignment="Right"
+												Margin="0"
+												Width="15" Height="15">
 										<Image Source="{DynamicResource EvaIcons.CloseOutline}" />
 									</Button>
 								</Grid>
 								<ContentPresenter Grid.Row="2"
 								                  Grid.Column="1"
-												  Name="PART_ContentPresenter"
-												  Content="{TemplateBinding Content}"
-												  ContentTemplate="{TemplateBinding ContentTemplate}"
-												  TextBlock.FontWeight="Medium" />
+																	Name="PART_ContentPresenter"
+																	Content="{TemplateBinding Content}"
+																	ContentTemplate="{TemplateBinding ContentTemplate}"/>
 							</Grid>
 						</Grid>
 					</Border>
@@ -80,7 +78,13 @@
 			</ControlTemplate>
 		</Setter>
 	</Style>
-
+  <Style Selector="MessageDialog /template/ ContentPresenter#PART_TitlePresenter">
+    <Setter Property="FontSize" Value="25"/>
+    <Setter Property="FontWeight" Value="DemiBold"/>
+  </Style>
+  <Style Selector="MessageDialog /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="FontWeight" Value="Medium"/>
+  </Style>
   <!--this animation is some strange...-->
 	<!--<Style Selector="MessageDialog /template/ Border#PART_Border">
 		<Style.Animations>
diff --git a/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml b/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
index aa86d88..52331d9 100644
--- a/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
@@ -95,12 +95,7 @@
 										</Border.Transitions>
 										<ContentPresenter Name="PART_ContentPresenter"
 										                  Content="{TemplateBinding Header}"
-                                      ContentTemplate="{Binding $parent[NavigationView].HeaderTemplate}"
-										                  TextBlock.FontSize="14"
-										                  TextBlock.FontFamily="Segoe UI"
-                                      HorizontalAlignment="Left"
-                                      ClipToBounds="True"
-										                  VerticalAlignment="Center" />
+                                      ContentTemplate="{Binding $parent[NavigationView].HeaderTemplate}"/>
 									</Border>
 								<ToggleButton Grid.Column="3"
 									              Grid.Row="1"
@@ -125,8 +120,6 @@
 						</Border>
             <Border Grid.Row="1" Name="PART_BottomBorder">
 							<ItemsPresenter Name="PART_ItemsPresenter"
-							                Items="{TemplateBinding Items}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
 							                ItemsPanel="{TemplateBinding ItemsPanel}" />
 						</Border>
 					</Grid>
@@ -134,6 +127,15 @@
 			</ControlTemplate>
 		</Setter>
 	</Style>
+  
+  
+  <Style Selector="NavigationViewItemBase /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="FontFamily" Value="Segoe UI"/>
+    <Setter Property="HorizontalAlignment" Value="Left"/>
+    <Setter Property="ClipToBounds" Value="True"/>
+    <Setter Property="VerticalAlignment" Value="Center"/>
+  </Style>
 
   <Style Selector=":is(NavigationViewItemBase) /template/ Border#PART_NavDecorator">
     <Setter Property="Padding" Value="{DynamicResource NavigationViewItemIconPadding}"/>
diff --git a/src/Aura.UI.FluentTheme/Controls/NavigationViewLinker.xaml b/src/Aura.UI.FluentTheme/Controls/NavigationViewLinker.xaml
index bafbe02..2d83ef6 100644
--- a/src/Aura.UI.FluentTheme/Controls/NavigationViewLinker.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/NavigationViewLinker.xaml
@@ -34,26 +34,14 @@
 						       VerticalAlignment="Top" />
 						<Grid Grid.Column="1"
 						      RowDefinitions="auto,*">
-							<ContentPresenter Content="{TemplateBinding Title}"
-							                  Padding="10,15,10,0"
-							                  TextBlock.FontSize="20"
-							                  TextBlock.FontWeight="Medium"
-							                  TextBlock.Foreground="{DynamicResource NavigationViewLinkerTitleForeground}" />
-							<ContentPresenter Content="{TemplateBinding Content}"
-							                  Grid.Row="1"
-							                  Padding="10"
-							                  TextBlock.FontSize="14"
-							                  TextBlock.FontWeight="Medium"
-							                  TextBlock.Foreground="{DynamicResource NavigationViewLinkerTitleForegroundLow}" />
+							<ContentPresenter Name="PART_TitlePresenter"
+																Content="{TemplateBinding Title}"/>
+							<ContentPresenter Name="PART_ContentPresenter"
+																Content="{TemplateBinding Content}"
+							                  Grid.Row="1"/>
 						</Grid>
 						<ContentPresenter Name="PART_TopContentPresenter"
 						                  Grid.Column="2"
-						                  CornerRadius="0,2.5,0,2.5"
-						                  Background="{DynamicResource NavigationViewLinkerTitleTopContentBackground}"
-						                  TextBlock.Foreground="{DynamicResource NavigationViewLinkerTitleTopContentForeground}"
-						                  Padding="5"
-						                  TextBlock.FontSize="14"
-						                  VerticalAlignment="Top"
 						                  Content="{TemplateBinding TopContent}"
                               IsVisible="{Binding $parent[NavigationViewLinker].TopContentVisible}"/>
 					</Grid>
@@ -62,14 +50,37 @@
 		</Setter>
 	</Style>
 
-	<Style Selector="NavigationViewLinker Border#PART_Border">
+  <Style Selector="NavigationViewLinker /template/ ContentPresenter#PART_TitlePresenter">
+    <Setter Property="Padding" Value="10,15,10,0"/>
+    <Setter Property="FontSize" Value="20"/>
+    <Setter Property="FontWeight" Value="Medium"/>
+    <Setter Property="Foreground" Value="{DynamicResource NavigationViewLinkerTitleForeground}"/>
+  </Style>
+
+  <Style Selector="NavigationViewLinker /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="Padding" Value="10"/>
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="FontWeight" Value="Medium"/>
+    <Setter Property="Foreground" Value="{DynamicResource NavigationViewLinkerTitleForegroundLow}"/>
+  </Style>
+
+  <Style Selector="NavigationViewLinker /template/ ContentPresenter#PART_TopContentPresenter">
+    <Setter Property="BoxShadow" Value="0 0 2.5 0 Black"/>
+    <Setter Property="CornerRadius" Value="0,2.5,0,2.5"/>
+    <Setter Property="Background" Value="{DynamicResource NavigationViewLinkerTitleTopContentBackground}"/>
+    <Setter Property="Foreground" Value="{DynamicResource NavigationViewLinkerTitleTopContentForeground}"/>
+    <Setter Property="Padding" Value="5"/>
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="VerticalAlignment" Value="Top"/>
+  </Style>
+  
+	<Style Selector="NavigationViewLinker /template/ Border#PART_Border">
 	    <Setter Property="BoxShadow" Value="0 0 2.5 0 Black"/>
 	</Style>
 	<Style Selector="NavigationViewLinker:pressed /template/ Border#PART_Border">
 		<Setter Property="RenderTransform" Value="scale(0.98)"/>
 	</Style>
-	<Style Selector="NavigationViewLinker Border#PART_Border:pointerover">
-	    <Setter Property="BoxShadow" Value="0 0 2.5 0 Black"/>
+	<Style Selector="NavigationViewLinker /template/ Border#PART_Border:pointerover">
 	    <Setter Property="BoxShadow" Value="0 0 5 0 Black"/>
 	</Style>
 	<Style Selector="NavigationViewLinker:pointerover">
diff --git a/src/Aura.UI.FluentTheme/Controls/NavigationViewStyles.xaml b/src/Aura.UI.FluentTheme/Controls/NavigationViewStyles.xaml
index e0b75ad..55e7845 100644
--- a/src/Aura.UI.FluentTheme/Controls/NavigationViewStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/NavigationViewStyles.xaml
@@ -1,143 +1,159 @@
 <Styles xmlns="https://github.com/avaloniaui"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:lconverters="using:Aura.UI.Converters">
-	<Design.PreviewWith>
-		<NavigationView Width="700" DisplayMode="CompactOverlay" Header="Nice"
+  <Design.PreviewWith>
+    <NavigationView Width="700" DisplayMode="CompactOverlay" Header="Nice"
 		                IsFloatingHeader="True">
-			<NavigationViewItem Header="Header" Title="Item Title"
+      <NavigationViewItem Header="Header" Title="Item Title"
 								Content="Item Content">
-				<NavigationViewItem Header="Sub Item" IsExpanded="True" Title="SubItem Title" Content="SubItem Content">
-					<NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
-					<NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
-				</NavigationViewItem>
-			</NavigationViewItem>
-			<Separator />
-			<NavigationViewItem Header="Header" Title="Item Title"
+        <NavigationViewItem Header="Sub Item" IsExpanded="True" Title="SubItem Title" Content="SubItem Content">
+          <NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
+          <NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
+        </NavigationViewItem>
+      </NavigationViewItem>
+      <Separator />
+      <NavigationViewItem Header="Header" Title="Item Title"
 									 Content="Item Content">
-				<NavigationViewItem Header="Sub Item" Title="SubItem Title" Content="SubItem Content">
-					<NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
-					<NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
-				</NavigationViewItem>
-				<NavigationViewItem Header="Header" Title="Item Title"
+        <NavigationViewItem Header="Sub Item" Title="SubItem Title" Content="SubItem Content">
+          <NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
+          <NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
+        </NavigationViewItem>
+        <NavigationViewItem Header="Header" Title="Item Title"
 									Content="Item Content">
-					<NavigationViewItem Header="Sub Item" IsExpanded="True" Title="SubItem Title" Content="SubItem Content">
-						<NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
-						<NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
-					</NavigationViewItem>
-				</NavigationViewItem>
-			</NavigationViewItem>
-		</NavigationView>
-	</Design.PreviewWith>
-	<Styles.Resources>
-		<DrawingImage x:Key="line_horizontal_3_regular">
-			<GeometryDrawing Brush="{DynamicResource NavigationViewForeground}">
-				<StreamGeometry>M2 4.5C2 4.22386 2.22386 4 2.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H2.5C2.22386 5 2 4.77614 2 4.5Z M2 9.5C2 9.22386 2.22386 9 2.5 9H17.5C17.7761 9 18 9.22386 18 9.5C18 9.77614 17.7761 10 17.5 10H2.5C2.22386 10 2 9.77614 2 9.5Z M2.5 14C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H2.5Z</StreamGeometry>
-			</GeometryDrawing>
-		</DrawingImage>
-		<DrawingImage x:Key="Material.Home">
-			<GeometryDrawing  Brush="{DynamicResource SystemBaseHighColor}" Geometry="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" />
-		</DrawingImage>
-		<lconverters:IntToColumnDefinitionWidthConverter x:Key="WidthConverter"/>
-	</Styles.Resources>
+          <NavigationViewItem Header="Sub Item" IsExpanded="True" Title="SubItem Title" Content="SubItem Content">
+            <NavigationViewItem Header="SubItem 2" Title="SubItem 2 Title" Content="SubItem 2 Content" />
+            <NavigationViewItem Header="SubItem 3" Title="SubItem 3 Title" Content="SubItem 3 Content" />
+          </NavigationViewItem>
+        </NavigationViewItem>
+      </NavigationViewItem>
+    </NavigationView>
+  </Design.PreviewWith>
+  <Styles.Resources>
+    <DrawingImage x:Key="line_horizontal_3_regular">
+      <GeometryDrawing Brush="{DynamicResource NavigationViewForeground}">
+        <StreamGeometry>M2 4.5C2 4.22386 2.22386 4 2.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H2.5C2.22386 5 2 4.77614 2 4.5Z M2 9.5C2 9.22386 2.22386 9 2.5 9H17.5C17.7761 9 18 9.22386 18 9.5C18 9.77614 17.7761 10 17.5 10H2.5C2.22386 10 2 9.77614 2 9.5Z M2.5 14C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H2.5Z</StreamGeometry>
+      </GeometryDrawing>
+    </DrawingImage>
+    <DrawingImage x:Key="Material.Home">
+      <GeometryDrawing  Brush="{DynamicResource SystemBaseHighColor}" Geometry="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" />
+    </DrawingImage>
+    <lconverters:IntToColumnDefinitionWidthConverter x:Key="WidthConverter"/>
+  </Styles.Resources>
 
-	<Style Selector="NavigationView > Separator">
-		<Setter Property="DockPanel.Dock" Value="Top" />
-		<Setter Property="Template">
-			<ControlTemplate>
-				<Decorator Padding="5">
-					<Border Height="1"
+  <Style Selector="NavigationView /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="FontFamily" Value="Segoe UI"/>
+    <Setter Property="HorizontalAlignment" Value="Left"/>
+    <Setter Property="ClipToBounds" Value="True"/>
+    <Setter Property="VerticalAlignment" Value="Center"/>
+  </Style>
+
+  <Style Selector="NavigationView /template/ ContentPresenter#PART_HeaderPresenter">
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="FontFamily" Value="Segoe UI"/>
+    <Setter Property="HorizontalAlignment" Value="Left"/>
+  </Style>
+
+  <Style Selector="NavigationView /template/ ContentPresenter#PART_TitlePresenter">
+    <Setter Property="FontSize" Value="25"/>
+    <Setter Property="FontWeight" Value="UltraLight"/>
+    <Setter Property="VerticalAlignment" Value="Bottom"/>
+    <Setter Property="Margin" Value="20 0 0 0"/>
+    <Setter Property="Padding" Value="0"/>
+  </Style>
+
+
+  <Style Selector="NavigationView > Separator">
+    <Setter Property="DockPanel.Dock" Value="Top" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Decorator Padding="5">
+          <Border Height="1"
 							Background="{DynamicResource NavigationViewSeparatorBackground}" />
-				</Decorator>
-			</ControlTemplate>
-		</Setter>
-	</Style>
+        </Decorator>
+      </ControlTemplate>
+    </Setter>
+  </Style>
 
-	<Style Selector="NavigationView">
-		<Setter Property="CompactPaneLength" Value="{DynamicResource NavigationViewCompactPaneLength}" />
-		<Setter Property="OpenPaneLength" Value="{DynamicResource NavigationViewOpenPaneLength}" />
-		<Setter Property="Background" Value="{DynamicResource NavigationViewBackground}" />
-		<Setter Property="PanelMaterial" Value="{StaticResource NavigationViewMaterial}"/>
-		<Setter Property="Icon" Value="{DynamicResource line_horizontal_3_regular}" />
-		<Setter Property="ItemsPanel">
-			<ItemsPanelTemplate>
-				<DockPanel/>
-			</ItemsPanelTemplate>
-		</Setter>
-		<Setter Property="Template">
-			<ControlTemplate>
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="{Binding $parent[NavigationView].CompactPaneLength, Converter={StaticResource WidthConverter}}" />
-						<ColumnDefinition Width="*"/>
-					</Grid.ColumnDefinitions>
-					<SplitView
+  <Style Selector="NavigationView">
+    <Setter Property="CompactPaneLength" Value="{DynamicResource NavigationViewCompactPaneLength}" />
+    <Setter Property="OpenPaneLength" Value="{DynamicResource NavigationViewOpenPaneLength}" />
+    <Setter Property="Background" Value="{DynamicResource NavigationViewBackground}" />
+    <Setter Property="PanelMaterial" Value="{StaticResource NavigationViewMaterial}"/>
+    <Setter Property="Icon" Value="{DynamicResource line_horizontal_3_regular}" />
+    <Setter Property="ItemsPanel">
+      <ItemsPanelTemplate>
+        <DockPanel/>
+      </ItemsPanelTemplate>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="{Binding $parent[NavigationView].CompactPaneLength, Converter={StaticResource WidthConverter}}" />
+            <ColumnDefinition Width="*"/>
+          </Grid.ColumnDefinitions>
+          <SplitView
 						Name="split"
 						Grid.ColumnSpan="2"
 						IsPaneOpen="{Binding $parent[NavigationView].IsOpen, Mode=TwoWay}"
 						CompactPaneLength="{Binding $parent[NavigationView].CompactPaneLength}"
 						OpenPaneLength="{Binding $parent[NavigationView].OpenPaneLength}"
 						DisplayMode="{Binding $parent[NavigationView].DisplayMode}">
-						<SplitView.Pane>
-							<Border Name="PART_ShadowBorder">
-								<ExperimentalAcrylicBorder Name="PART_AcrylicBorder"
+            <SplitView.Pane>
+              <Border Name="PART_ShadowBorder">
+                <ExperimentalAcrylicBorder Name="PART_AcrylicBorder"
 								                           Padding="0,0"
                                            HorizontalAlignment="Stretch"
 								                           Material="{Binding $parent[NavigationView].PanelMaterial}">
-									<Grid RowDefinitions="auto,auto,auto,*">
-										<Border Grid.Row="1" 
+                  <Grid RowDefinitions="auto,auto,auto,*">
+                    <Border Grid.Row="1"
 										        Width="{Binding $parent[NavigationView].CompactPaneLength}"
-										        Height="{Binding $parent[NavigationView].CompactPaneLength}"></Border>
-										<Border Grid.Row="2" IsVisible="{Binding $parent[NavigationView].AutoCompleteBoxIsVisible}"
+										        Height="{Binding $parent[NavigationView].CompactPaneLength}"/>
+                    <Border Grid.Row="2" IsVisible="{Binding $parent[NavigationView].AutoCompleteBoxIsVisible}"
 										        Padding="5" Child="{Binding $parent[NavigationView].AutoCompleteBox}"/>
-										<DockPanel Grid.Row="3">
-											<ScrollViewer DockPanel.Dock="Top">
-												<ItemsPresenter Name="PART_ItemsPresenter"
-												                Items="{Binding $parent[NavigationView].Items}"
-												                ItemTemplate="{Binding $parent[NavigationView].ItemTemplate}"
+                    <DockPanel Grid.Row="3">
+                      <ScrollViewer DockPanel.Dock="Top">
+                        <ItemsPresenter Name="PART_ItemsPresenter"
 												                ItemsPanel="{Binding $parent[NavigationView].ItemsPanel}" />
-											</ScrollViewer>
-										</DockPanel>
-									</Grid>
-								</ExperimentalAcrylicBorder>
-							</Border>
-						</SplitView.Pane>
-						<Border Name="PART_Container" 
+                      </ScrollViewer>
+                    </DockPanel>
+                  </Grid>
+                </ExperimentalAcrylicBorder>
+              </Border>
+            </SplitView.Pane>
+            <Border Name="PART_Container"
 						        Background="{Binding $parent[NavigationView].Background}">
-							<Grid>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="auto"/>
-									<RowDefinition Height="*"/>
-								</Grid.RowDefinitions>
-								<Grid.Styles>
-									<Style Selector="AuraContentPresenter > TextBlock">
-										<Setter Property="VerticalAlignment" Value="Bottom"/>
-									</Style>
-								</Grid.Styles>
-								<AuraContentPresenter Grid.Row="0"
-								                      IsVisible="{Binding !$parent[NavigationView].HideTitle}"
-								                      Name="PART_TitlePresenter"
-								                      Margin="20 0 0 0"
-								                      Padding="0"
-								                      MinHeight="75"
-								                      VerticalAlignment="Bottom"
-								                      Content="{Binding $parent[NavigationView].Title}"
-                                                      ContentTemplate="{Binding $parent[NavigationView].TitleTemplate}"
-								                      TextBlock.FontWeight="UltraLight"
-								                      TextBlock.FontSize="25"/>
-								<ScrollViewer Grid.Row="1" HorizontalContentAlignment="Left"
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="auto"/>
+                  <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid.Styles>
+                  <Style Selector="ContentPresenter > TextBlock">
+                    <Setter Property="VerticalAlignment" Value="Bottom"/>
+                  </Style>
+                </Grid.Styles>
+                <ContentPresenter Grid.Row="0"
+								                  IsVisible="{Binding !$parent[NavigationView].HideTitle}"
+								                  Name="PART_TitlePresenter"
+								                  MinHeight="75"
+								                  Content="{Binding $parent[NavigationView].Title}"
+                                  ContentTemplate="{Binding $parent[NavigationView].TitleTemplate}"/>
+                <ScrollViewer Grid.Row="1" HorizontalContentAlignment="Left"
 								              AllowAutoHide="True"
 								              HorizontalScrollBarVisibility="Disabled">
-									<Grid RowDefinitions="auto,*">
-										<ContentPresenter Grid.Row="1"
+                  <Grid RowDefinitions="auto,*">
+                    <ContentPresenter Grid.Row="1"
 										                  Name="PART_SelectedContentPresenter"
 										                  Content="{Binding $parent[NavigationView].SelectedContent}"
 										                  ContentTemplate="{Binding $parent[NavigationView].SelectedContentTemplate}" />
-									</Grid>
-								</ScrollViewer>
-							</Grid>
-						</Border>
-					</SplitView>
-					<Button
+                  </Grid>
+                </ScrollViewer>
+              </Grid>
+            </Border>
+          </SplitView>
+          <Button
 					        Name="PART_HeaderItem"
 					        Background="Transparent"
 					        Width="{Binding $parent[NavigationView].CompactPaneLength}"
@@ -146,41 +162,38 @@
 					        HorizontalContentAlignment="Center"
 					        ClickMode="Release"
 					        VerticalAlignment="Top">
-						<Image Source="{Binding $parent[NavigationView].Icon}"/>
-					</Button>
-					<ContentPresenter
+            <Image Source="{Binding $parent[NavigationView].Icon}"/>
+          </Button>
+          <ContentPresenter
 						Grid.Column="1"
 						IsVisible="{Binding $parent[NavigationView].HeaderVisible}"
 						Name="PART_HeaderPresenter"
-						HorizontalAlignment="Left"
 						Content="{Binding $parent[NavigationView].Header}"
-						Margin="{StaticResource NavigationViewHeaderMargin}"
-						TextBlock.FontSize="14"
-						TextBlock.FontFamily="Segoe UI"/>
-				</Grid>
-			</ControlTemplate>
-		</Setter>
-	</Style>
-	
-	<Style Selector="NavigationView /template/ AuraContentPresenter#PART_TitlePresenter[ContentIsString=true]">
-		<Setter Property="Padding" Value="20" />
-	</Style>
-	<Style Selector="NavigationView:normal /template/ ContentPresenter#PART_SelectedContentPresenter">
-		<Style.Animations>
-			<Animation Duration="0:0:0.3" FillMode="Forward" Easing="CubicEaseOut">
-				<KeyFrame Cue="0%">
-					<Setter Property="TranslateTransform.Y" Value="{Binding $self.Bounds.Width}" />
-					<Setter Property="Opacity" Value="0" />
-				</KeyFrame>
-				<KeyFrame Cue="100%">
-					<Setter Property="TranslateTransform.Y" Value="0" />
-					<Setter Property="Opacity" Value="1" />
-				</KeyFrame>
-			</Animation>
-		</Style.Animations>
-	</Style>
-	
-	<!--<Style Selector="NavigationView[IsOpen=true] /template/ ExperimentalAcrylicBorder#PART_AcrylicBorder">
+						Margin="{StaticResource NavigationViewHeaderMargin}"/>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!--<Style Selector="NavigationView /template/ ContentPresenter#PART_TitlePresenter[ContentIsString=true]">
+    <Setter Property="Padding" Value="20" />
+  </Style>-->
+  <Style Selector="NavigationView:normal /template/ ContentPresenter#PART_SelectedContentPresenter">
+    <Style.Animations>
+      <Animation Duration="0:0:0.3" FillMode="Forward" Easing="CubicEaseOut">
+        <KeyFrame Cue="0%">
+          <Setter Property="TranslateTransform.Y" Value="{Binding $self.Bounds.Width}" />
+          <Setter Property="Opacity" Value="0" />
+        </KeyFrame>
+        <KeyFrame Cue="100%">
+          <Setter Property="TranslateTransform.Y" Value="0" />
+          <Setter Property="Opacity" Value="1" />
+        </KeyFrame>
+      </Animation>
+    </Style.Animations>
+  </Style>
+
+  <!--<Style Selector="NavigationView[IsOpen=true] /template/ ExperimentalAcrylicBorder#PART_AcrylicBorder">
 		<Setter Property="Width" Value="{Binding $parent[NavigationView].OpenPaneLength}" />
 	</Style>
 
@@ -188,8 +201,8 @@
 		<Setter Property="Width" Value="{Binding $parent[NavigationView].CompactPaneLength}" />
 	</Style>-->
 
-	<Style Selector="NavigationViewItemBase.header /template/ ContentPresenter#PART_ContentPresenter">
-		<Setter Property="TextBlock.FontWeight" Value="SemiBold" />
-		<Setter Property="Padding" Value="5" />
-	</Style>
+  <Style Selector="NavigationViewItemBase.header /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="TextBlock.FontWeight" Value="SemiBold" />
+    <Setter Property="Padding" Value="5" />
+  </Style>
 </Styles>
\ No newline at end of file
diff --git a/src/Aura.UI.FluentTheme/Controls/ProgressRing.xaml b/src/Aura.UI.FluentTheme/Controls/ProgressRing.xaml
index 3c7f5c4..ac76c53 100644
--- a/src/Aura.UI.FluentTheme/Controls/ProgressRing.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/ProgressRing.xaml
@@ -53,8 +53,7 @@
 
 	<Style Selector="ProgressRing[IsIndeterminate=True] /template/ AuraArc.rc">
 		<Style.Animations>
-			<Animation Duration="0:0:.75" FillMode="Both"
-					   RepeatCount="Infinite" Easing="SplineEasing"
+			<Animation Duration="0:0:.75" FillMode="Both" Easing="SplineEasing"
 					   IterationCount="Infinite">
 				<KeyFrame Cue="0%">
 					<Setter Property="StartAngle" Value="0" />
diff --git a/src/Aura.UI.FluentTheme/Controls/RibbonGroupStyles.xaml b/src/Aura.UI.FluentTheme/Controls/RibbonGroupStyles.xaml
index 3c0fe3f..21f4256 100644
--- a/src/Aura.UI.FluentTheme/Controls/RibbonGroupStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/RibbonGroupStyles.xaml
@@ -35,12 +35,11 @@
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
 							<Border Padding="5" HorizontalAlignment="Center">
-								<ContentPresenter Content="{TemplateBinding Header}"
+								<ContentPresenter Name="PART_ContentPresenter"
+												Content="{TemplateBinding Header}"
 											  ContentTemplate="{TemplateBinding HeaderTemplate}"
 											  HorizontalAlignment="Stretch"
-											  HorizontalContentAlignment="Center"
-											  TextBlock.FontSize="12"
-											  VerticalAlignment="Center" />
+											  HorizontalContentAlignment="Center"/>
 							</Border>
 							<Button Grid.Column="1"
 											Name="PART_MiniButton" Padding="5"
@@ -56,6 +55,12 @@
 			</ControlTemplate>
 		</Setter>
 	</Style>
+
+  <Style Selector="CardCollection /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="FontSize" Value="12"/>
+    <Setter Property="VerticalAlignment" Value="Center"/>											  
+  </Style>
+  
 	<Style Selector="RibbonGroup:disabled /template/ Grid#PART_Container">
 		<Setter Property="Opacity" Value="{DynamicResource RibbonGroupDisabledOpacity}" />
 	</Style>
diff --git a/src/Aura.UI.FluentTheme/Controls/RibbonStyles.xaml b/src/Aura.UI.FluentTheme/Controls/RibbonStyles.xaml
index 82ba7cc..5fae65c 100644
--- a/src/Aura.UI.FluentTheme/Controls/RibbonStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/RibbonStyles.xaml
@@ -44,7 +44,13 @@
 		<DrawingImage x:Key="Octicons.TriangleDown">
 			<GeometryDrawing  Brush="{DynamicResource RibbonGroupForeground}" Geometry="M0 5l6 6 6-6H0z" />
 		</DrawingImage>
- 	</Styles.Resources>
+ 	</Styles.Resources>    
+  <Style Selector="Ribbon /template/ ContentPresenter#PART_HeaderPresenter">
+    <Setter Property="FontWeight" Value="Bold"/>
+    <Setter Property="HorizontalAlignment" Value="Center"/>
+    <Setter Property="VerticalAlignment" Value="Center"/>
+		<Setter Property="Padding" Value="10"/>
+  </Style>
 	<Style Selector="Ribbon">
 		<Setter Property="ExpansionState" Value="Total" />
 		<Setter Property="VerticalAlignment" Value="Top" />
@@ -71,25 +77,21 @@
 								<Grid.RowDefinitions>
 									<RowDefinition Height="*" />
 								</Grid.RowDefinitions>
-								<ContentPresenter Grid.Column="0"
-								                  Content="{TemplateBinding Header}"
-								                  HorizontalAlignment="Center"
-								                  VerticalAlignment="Center"
-												  TextBlock.FontWeight="Bold"
-								                  Padding="10" />
+								<ContentPresenter Name="PART_HeaderPresenter"
+																	Grid.Column="0"
+								                  Content="{TemplateBinding Header}"/>
 								<ShadowButton Grid.Column="1"
-								                Name="PART_LeftButton"
-								                Content="{TemplateBinding LeftContent}"
+								              Name="PART_LeftButton"
+								              Content="{TemplateBinding LeftContent}"
                               IsVisible="{TemplateBinding LeftContentVisible}"
-								                Classes="BorderButtons"
-								                CornerRadius="0" />
+								              Classes="BorderButtons"
+								              CornerRadius="0" />
 								<ScrollViewer Grid.Column="2" HorizontalScrollBarVisibility="Auto"
 								              VerticalAlignment="Stretch" BorderThickness="0"
 								              Padding="0" Margin="0">
 									<ItemsPresenter
 										VerticalAlignment="Stretch"
 										Name="PART_ItemsPresenter"
-										Items="{TemplateBinding Items}"
 										ItemsPanel="{TemplateBinding ItemsPanel}"
 										Classes="BorderButtons" />
 								</ScrollViewer>
@@ -140,6 +142,7 @@
 			</ControlTemplate>
 		</Setter>
 	</Style>
+  
 
 	<Style Selector="ExperimentalAcrylicBorder#PART_RibbonAcrylicBorder">
 		<Setter Property="Material" Value="{StaticResource RibbonMaterial}" />