diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Calendar.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Calendar.axaml
index f29e1374..6865c09d 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Calendar.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Calendar.axaml
@@ -1,10 +1,3 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers">
     <Style Selector="Calendar">
@@ -22,11 +15,11 @@
                 Value="{DynamicResource ThemeBackgroundBrush}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <StackPanel Name="Root"
+                <StackPanel Name="PART_Root"
                             HorizontalAlignment="Center"
                             ClipToBounds="True">
 
-                    <CalendarItem Name="CalendarItem"
+                    <CalendarItem Name="PART_CalendarItem"
                                   Background="{TemplateBinding Background}"
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarItem.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarItem.axaml
index 1309fb93..b1890bc0 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarItem.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/CalendarItem.axaml
@@ -1,10 +1,3 @@
-<!--
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
--->
-
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
@@ -78,21 +71,21 @@
                              Margin="0"/>
 todo: while it's not needed it also does not work when set in the style-->
 
-                            <Button Name="PreviousButton"
+                            <Button Name="PART_PreviousButton"
                                     Classes="CalendarHeader CalendarNavigation"
                                     IsVisible="False"
                                     HorizontalAlignment="Left"
                                     Content="&lt;"
                                     Margin="1,0,-1,-1" />
 
-                            <Button Name="HeaderButton"
+                            <Button Name="PART_HeaderButton"
                                     Classes="CalendarHeader"
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center" />
 
-                            <Button Name="NextButton"
+                            <Button Name="PART_NextButton"
                                     Classes="CalendarHeader CalendarNavigation"
                                     Grid.Row="0"
                                     Grid.Column="2"
@@ -101,7 +94,7 @@ todo: while it's not needed it also does not work when set in the style-->
                                     Content="&gt;"
                                     Margin="0,0,1,-1" />
 
-                            <Grid Name="MonthView"
+                            <Grid Name="PART_MonthView"
                                   Grid.Row="1"
                                   Grid.ColumnSpan="3"
                                   Grid.Column="0"
@@ -127,7 +120,7 @@ todo: while it's not needed it also does not work when set in the style-->
                                 </Grid.ColumnDefinitions>
                             </Grid>
 
-                            <Grid Name="YearView"
+                            <Grid Name="PART_YearView"
                                   Grid.Row="1"
                                   Grid.ColumnSpan="3"
                                   Grid.Column="0"