diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index b8184d4..2fe6a6f 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -119,7 +119,7 @@
             <Setter Property="Cursor" Value="No" />
         </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
@@ -161,106 +161,105 @@
             </Style>
         </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:CalendarView}" TargetType="u:CalendarView">
         <Setter Property="MinHeight" Value="260" />
         <Setter Property="MinWidth" Value="260" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarView">
-                <Panel>
-                    <Grid RowDefinitions="Auto, *">
-                        <Grid
-                            Grid.Row="0"
-                            Margin="0,0,0,16"
-                            ColumnDefinitions="Auto, Auto,*, Auto, Auto">
+                <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto, *">
+                    <Grid
+                        Grid.Row="0"
+                        Margin="0,0,0,16"
+                        ColumnDefinitions="Auto, Auto,*, Auto, Auto">
+                        <Button
+                            Name="{x:Static u:CalendarView.PART_FastPreviousButton}"
+                            Grid.Column="0"
+                            HorizontalContentAlignment="Left"
+                            Foreground="{TemplateBinding Foreground}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource CalendarViewFastForwardGlyph}"
+                                Foreground="{DynamicResource CalendarItemIconForeground}" />
+                        </Button>
+
+                        <Button
+                            Name="{x:Static u:CalendarView.PART_PreviousButton}"
+                            Grid.Column="1"
+                            HorizontalContentAlignment="Left"
+                            Foreground="{TemplateBinding Foreground}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource CalendarItemPreviousIconGlyph}"
+                                Foreground="{DynamicResource CalendarItemIconForeground}" />
+                        </Button>
+
+                        <Grid Grid.Column="2" ColumnDefinitions="*, *">
                             <Button
-                                Name="{x:Static u:CalendarView.PART_FastPreviousButton}"
+                                Name="{x:Static u:CalendarView.PART_YearButton}"
                                 Grid.Column="0"
-                                HorizontalContentAlignment="Left"
+                                HorizontalContentAlignment="Center"
                                 Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessButton}">
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource CalendarViewFastForwardGlyph}"
-                                    Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </Button>
-
+                                Theme="{DynamicResource BorderlessButton}" />
                             <Button
-                                Name="{x:Static u:CalendarView.PART_PreviousButton}"
+                                Name="{x:Static u:CalendarView.PART_MonthButton}"
                                 Grid.Column="1"
-                                HorizontalContentAlignment="Left"
+                                HorizontalContentAlignment="Center"
                                 Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessButton}">
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource CalendarItemPreviousIconGlyph}"
-                                    Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </Button>
-
-                            <Grid Grid.Column="2" ColumnDefinitions="*, *">
-                                <Button
-                                    Name="{x:Static u:CalendarView.PART_YearButton}"
-                                    Grid.Column="0"
-                                    HorizontalContentAlignment="Center"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    Theme="{DynamicResource BorderlessButton}" />
-                                <Button
-                                    Name="{x:Static u:CalendarView.PART_MonthButton}"
-                                    Grid.Column="1"
-                                    HorizontalContentAlignment="Center"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    Theme="{DynamicResource BorderlessButton}" />
-                                <Button
-                                    Name="{x:Static u:CalendarView.PART_HeaderButton}"
-                                    Grid.Column="0"
-                                    Grid.ColumnSpan="2"
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Center"
-                                    IsVisible="True" />
-                            </Grid>
+                                Theme="{DynamicResource BorderlessButton}" />
                             <Button
-                                Name="{x:Static u:CalendarView.PART_NextButton}"
-                                Grid.Column="3"
-                                HorizontalContentAlignment="Left"
-                                Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessButton}">
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource CalendarItemNextIconGlyph}"
-                                    Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </Button>
-                            <Button
-                                Name="{x:Static u:CalendarView.PART_FastNextButton}"
-                                Grid.Column="4"
-                                HorizontalContentAlignment="Left"
-                                Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessButton}">
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource CalendarViewFastBackwardGlyph}"
-                                    Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </Button>
+                                Name="{x:Static u:CalendarView.PART_HeaderButton}"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                IsVisible="True" />
                         </Grid>
-                        <Grid
-                            Name="{x:Static u:CalendarView.PART_MonthGrid}"
-                            Grid.Row="1"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            ColumnDefinitions="*, *, *, *, *, *, *"
-                            RowDefinitions="*, Auto, *, *, *, *, *, *" />
-                        <Grid
-                            Name="{x:Static u:CalendarView.PART_YearGrid}"
-                            Grid.Row="1"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            ColumnDefinitions="*, *, *"
-                            RowDefinitions="*, *, *, *" />
+                        <Button
+                            Name="{x:Static u:CalendarView.PART_NextButton}"
+                            Grid.Column="3"
+                            HorizontalContentAlignment="Left"
+                            Foreground="{TemplateBinding Foreground}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource CalendarItemNextIconGlyph}"
+                                Foreground="{DynamicResource CalendarItemIconForeground}" />
+                        </Button>
+                        <Button
+                            Name="{x:Static u:CalendarView.PART_FastNextButton}"
+                            Grid.Column="4"
+                            HorizontalContentAlignment="Left"
+                            Foreground="{TemplateBinding Foreground}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource CalendarViewFastBackwardGlyph}"
+                                Foreground="{DynamicResource CalendarItemIconForeground}" />
+                        </Button>
                     </Grid>
-                </Panel>
+                    <Grid
+                        Name="{x:Static u:CalendarView.PART_MonthGrid}"
+                        Grid.Row="1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        ColumnDefinitions="*, *, *, *, *, *, *"
+                        RowDefinitions="*, Auto, *, *, *, *, *, *" />
+                    <Grid
+                        Name="{x:Static u:CalendarView.PART_YearGrid}"
+                        Grid.Row="1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        ColumnDefinitions="*, *, *"
+                        RowDefinitions="*, *, *, *" />
+                </Grid>
             </ControlTemplate>
         </Setter>
     </ControlTheme>