From aea83887c6b04e94e0604c98888a1455749d492c Mon Sep 17 00:00:00 2001
From: IGvaleries <vsuszynski@infragistics.com>
Date: Thu, 2 Jan 2025 12:35:58 -0500
Subject: [PATCH] update for 24.2 (using build 24.2.53)

---
 DefaultStyles/Dashboards/generic.shared.xaml  |   19 +
 DefaultStyles/Dashboards/generic.xaml         |   19 +
 .../DataPresenter/DataPresenterGeneric.xaml   |    4 +-
 .../DataPresenter/DataPresenterRoyale.xaml    |    4 +-
 DefaultStyles/DataVisualization/Classic.xaml  |   15 +
 .../DataVisualization/generic.shared.xaml     |   14 +
 .../FormulaEditor/generic.inbox.xaml          |  376 +++++-
 DefaultStyles/FormulaEditor/generic.xaml      |    2 +-
 DefaultStyles/MaskInput/generic.xaml          |    2 +-
 DefaultStyles/Menu/generic.xaml               |    3 +-
 DefaultStyles/ScheduleDialogs/generic.xaml    |   24 +-
 DefaultStyles/XamCalendar/generic.mobile.xaml |    4 +-
 DefaultStyles/XamCalendar/generic.xaml        |    2 +-
 .../XamDataChart/LegendTemplates.xaml         |   58 +-
 .../XamDataChart/generic.shared.xaml          |   98 +-
 DefaultStyles/XamDataChart/generic.xaml       |   98 +-
 DefaultStyles/XamGrid/generic.xaml            |    2 +-
 DefaultStyles/XamTimeline/generic.xaml        | 1055 +----------------
 18 files changed, 687 insertions(+), 1112 deletions(-)
 create mode 100644 DefaultStyles/Dashboards/generic.shared.xaml
 create mode 100644 DefaultStyles/Dashboards/generic.xaml

diff --git a/DefaultStyles/Dashboards/generic.shared.xaml b/DefaultStyles/Dashboards/generic.shared.xaml
new file mode 100644
index 0000000..84cfe73
--- /dev/null
+++ b/DefaultStyles/Dashboards/generic.shared.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="http://schemas.infragistics.com/xaml">
+    
+    <Style TargetType="{x:Type local:XamDashboardTile}">
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:XamDashboardTile}">
+                    <ContentControl x:Name="PART_CONTENT">
+
+                    </ContentControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/DefaultStyles/Dashboards/generic.xaml b/DefaultStyles/Dashboards/generic.xaml
new file mode 100644
index 0000000..84cfe73
--- /dev/null
+++ b/DefaultStyles/Dashboards/generic.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="http://schemas.infragistics.com/xaml">
+    
+    <Style TargetType="{x:Type local:XamDashboardTile}">
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:XamDashboardTile}">
+                    <ContentControl x:Name="PART_CONTENT">
+
+                    </ContentControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/DefaultStyles/DataPresenter/DataPresenterGeneric.xaml b/DefaultStyles/DataPresenter/DataPresenterGeneric.xaml
index 837ce4e..29a044c 100644
--- a/DefaultStyles/DataPresenter/DataPresenterGeneric.xaml
+++ b/DefaultStyles/DataPresenter/DataPresenterGeneric.xaml
@@ -498,7 +498,7 @@
 								IsInFieldChooser="{TemplateBinding IsSourceFromFieldChooser}"
 								IsInGroupByArea="{TemplateBinding IsSourceFromGroupByArea}"
 								Opacity=".5"/>
-                            <!--JJD 1/06/16 - v23.2 Field Grouping -->
+                            <!--JJD 1/06/16 - Field Grouping -->
                             <igDP:FieldGroupLabelPresenter
 								x:Name="fieldGroupLabelPresenter"
 								FieldGroup="{TemplateBinding FieldGroup}"
@@ -519,7 +519,7 @@
 							<Setter TargetName="labelPresenter" Property="Visibility" Value="Collapsed"/>
 							<Setter TargetName="cellPresenter" Property="Visibility" Value="Visible"/>
 						</Trigger>
-                        <!--JJD 1/06/16 - v23.2 Field Grouping -->
+                        <!--JJD 1/06/16 - Field Grouping -->
                         <Trigger Property="IsFieldGroup" Value="true">
                             <Setter TargetName="fieldGroupLabelPresenter" Property="Visibility" Value="Visible"/>
 							<Setter TargetName="labelPresenter" Property="Visibility" Value="Collapsed"/>
diff --git a/DefaultStyles/DataPresenter/DataPresenterRoyale.xaml b/DefaultStyles/DataPresenter/DataPresenterRoyale.xaml
index 888e488..424a205 100644
--- a/DefaultStyles/DataPresenter/DataPresenterRoyale.xaml
+++ b/DefaultStyles/DataPresenter/DataPresenterRoyale.xaml
@@ -32,7 +32,7 @@
 								IsInFieldChooser="{TemplateBinding IsSourceFromFieldChooser}"
 								IsInGroupByArea="{TemplateBinding IsSourceFromGroupByArea}"
 								Opacity=".5"/>
-							<!--JJD 1/06/16 - v23.2 Field Grouping -->
+							<!--JJD 1/06/16 - Field Grouping -->
                             <igDP:FieldGroupLabelPresenter
 								x:Name="fieldGroupLabelPresenter"
 								FieldGroup="{TemplateBinding FieldGroup}"
@@ -53,7 +53,7 @@
 							<Setter TargetName="labelPresenter" Property="Visibility" Value="Collapsed"/>
 							<Setter TargetName="cellPresenter" Property="Visibility" Value="Visible"/>
 						</Trigger>
-						<!--JJD 1/06/16 - v23.2 Field Grouping -->
+						<!--JJD 1/06/16 - Field Grouping -->
                         <Trigger Property="IsFieldGroup" Value="true">
                             <Setter TargetName="fieldGroupLabelPresenter" Property="Visibility" Value="Visible"/>
                             <Setter TargetName="labelPresenter" Property="Visibility" Value="Collapsed"/>
diff --git a/DefaultStyles/DataVisualization/Classic.xaml b/DefaultStyles/DataVisualization/Classic.xaml
index c81dc45..f1358c8 100644
--- a/DefaultStyles/DataVisualization/Classic.xaml
+++ b/DefaultStyles/DataVisualization/Classic.xaml
@@ -3,6 +3,7 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:local="http://schemas.infragistics.com/xaml"
+  xmlns:layouts="http://schemas.infragistics.com/xaml"
   xmlns:ig="http://schemas.infragistics.com/xaml"
   xmlns:igWindows="http://infragistics.com/Windows"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -1556,4 +1557,18 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+
+    <Style TargetType="{x:Type layouts:XamPopup}">
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type layouts:XamPopup}">
+                    <ContentControl x:Name="PART_CONTENT">
+
+                    </ContentControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DefaultStyles/DataVisualization/generic.shared.xaml b/DefaultStyles/DataVisualization/generic.shared.xaml
index 3b3397d..72d32e2 100644
--- a/DefaultStyles/DataVisualization/generic.shared.xaml
+++ b/DefaultStyles/DataVisualization/generic.shared.xaml
@@ -5,6 +5,7 @@
     xmlns:System="clr-namespace:System;assembly=mscorlib" 
     xmlns:igPrimitives="http://schemas.infragistics.com/xaml/primitives" 
     xmlns:local="http://schemas.infragistics.com/xaml"
+    xmlns:layouts="http://schemas.infragistics.com/xaml"
     xmlns:ig="http://schemas.infragistics.com/xaml"
     xmlns:maps="http://schemas.infragistics.com/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -1267,4 +1268,17 @@
     </Setter>
   </Style>
   <Style BasedOn="{StaticResource XamMultiScaleImageStyle}" TargetType="maps:XamMultiScaleImage" />
+
+  <Style TargetType="{x:Type layouts:XamPopup}">
+
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type layouts:XamPopup}">
+          <ContentControl x:Name="PART_CONTENT">
+
+          </ContentControl>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DefaultStyles/FormulaEditor/generic.inbox.xaml b/DefaultStyles/FormulaEditor/generic.inbox.xaml
index 2c85569..7b88e89 100644
--- a/DefaultStyles/FormulaEditor/generic.inbox.xaml
+++ b/DefaultStyles/FormulaEditor/generic.inbox.xaml
@@ -1,14 +1,366 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!--                             IMPORTANT NOTE:                                -->
-  <!--                                                                            -->
-  <!-- Leave this file empty because it will be replaced by generic.inbox.sl.xaml -->
-  <!-- or generic.inbox.wpf.xaml, depending on which product is building.         -->
-  <!--                                                                            -->
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <Style TargetType="{x:Type ComboBoxItem}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ComboBoxItem}">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Selected">
+							<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="Border">
+								<EasingColorKeyFrame KeyTime="0" Value="#FFBA3535"/>
+							</ColorAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Grid SnapsToDevicePixels="true">
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal"/>
+								<VisualState x:Name="MouseOver">
+									<Storyboard>
+										<ThicknessAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderThickness)" Storyboard.TargetName="Border">
+											<EasingThicknessKeyFrame KeyTime="0" Value="0"/>
+										</ThicknessAnimationUsingKeyFrames>
+										<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="Border">
+											<EasingColorKeyFrame KeyTime="0" Value="#FFE5F2F6"/>
+										</ColorAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="Disabled"/>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Unfocused"/>
+								<VisualState x:Name="Focused"/>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="SelectionStates">
+								<VisualState x:Name="Unselected"/>
+								<VisualState x:Name="Selected">
+									<Storyboard>
+										<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="Border">
+											<EasingColorKeyFrame KeyTime="0" Value="#FFC4E2EC"/>
+										</ColorAnimationUsingKeyFrames>
+										<ThicknessAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderThickness)" Storyboard.TargetName="Border">
+											<EasingThicknessKeyFrame KeyTime="0" Value="1"/>
+										</ThicknessAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="SelectedUnfocused"/>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Border x:Name="Border" Background="#FFFEFEFE" BorderThickness="0" BorderBrush="#FF6DBDD1" CornerRadius="2"/>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="5,2"/>
+					</Grid>					
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Resource dictionary entries should be defined here. -->
+	<Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+		<Setter Property="OverridesDefaultStyle" Value="true"/>
+		<Setter Property="IsTabStop" Value="false"/>
+		<Setter Property="Focusable" Value="false"/>
+		<Setter Property="ClickMode" Value="Press"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ToggleButton}">
+					<Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+						<Path x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0,1,0,0" VerticalAlignment="Center">
+							<Path.Data>
+								<!-- Resource dictionary entries should be defined here. -->
+								<Geometry>M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+							</Path.Data>
+						</Path>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="true">
+							
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+		
+		<Style x:Key="ComboBoxStyle" TargetType="{x:Type ComboBox}">
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Margin="4,4,21,4" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>		
+		<Setter Property="Background" Value="#FF1F3B53"/>
+    	<Setter Property="BorderBrush">
+    		<Setter.Value>
+    			<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+    				<GradientStop Color="#FFA3AEB9" Offset="0"/>
+    				<GradientStop Color="#FF8399A9" Offset="0.375"/>
+    				<GradientStop Color="#FF718597" Offset="0.375"/>
+    				<GradientStop Color="#FF617584" Offset="1"/>
+    			</LinearGradientBrush>
+    		</Setter.Value>
+    	</Setter>																								
+		<Setter Property="BorderThickness" Value="1"/>
+		<Setter Property="Height" Value="20"/>
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+		<Setter Property="Padding" Value="4,3"/>
+		<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+		<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ComboBox}">
+					<Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*"/>
+							<ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+						</Grid.ColumnDefinitions>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal"/>
+								<VisualState x:Name="MouseOver"/>
+								<VisualState x:Name="Disabled"/>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Unfocused"/>
+								<VisualState x:Name="Focused"/>
+								<VisualState x:Name="FocusedDropDown"/>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="EditStates">
+								<VisualState x:Name="Editable"/>
+								<VisualState x:Name="Uneditable"/>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+							<Border x:Name="Shdw" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=MainGrid}" CornerRadius="2">
+								<Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" CornerRadius="2">
+									<ScrollViewer x:Name="DropDownScrollViewer">
+										<Grid RenderOptions.ClearTypeHint="Enabled">
+											<Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+												<Rectangle x:Name="OpaqueRect" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+											</Canvas>
+											<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Margin="1,2"/>
+										</Grid>
+									</ScrollViewer>
+								</Border>
+							</Border>
+						</Popup>
+						<ToggleButton BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding Property=BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+							<ToggleButton.Style>
+								<Style TargetType="{x:Type ToggleButton}">
+									<Setter Property="OverridesDefaultStyle" Value="true"/>
+									<Setter Property="IsTabStop" Value="false"/>
+									<Setter Property="Focusable" Value="false"/>
+									<Setter Property="ClickMode" Value="Press"/>
+									<Setter Property="Template">
+										<Setter.Value>
+											<ControlTemplate TargetType="{x:Type ToggleButton}">
+												<Grid HorizontalAlignment="Stretch" Width="Auto">
+													<VisualStateManager.VisualStateGroups>
+														<VisualStateGroup x:Name="CommonStates">
+															<VisualState x:Name="Normal"/>
+															<VisualState x:Name="MouseOver">
+																<Storyboard>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="BackgroundOverlay">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																</Storyboard>
+															</VisualState>
+															<VisualState x:Name="Pressed">
+																<Storyboard>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="BackgroundOverlay2">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="Highlight">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																	<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+																		<EasingColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
+																	</ColorAnimationUsingKeyFrames>
+																</Storyboard>
+															</VisualState>
+															<VisualState x:Name="Disabled"/>
+														</VisualStateGroup>
+														<VisualStateGroup x:Name="FocusStates">
+															<VisualState x:Name="Unfocused"/>
+															<VisualState x:Name="Focused">
+																<Storyboard>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="Highlight">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="BackgroundOverlay2">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																	<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+																		<EasingColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
+																	</ColorAnimationUsingKeyFrames>
+																</Storyboard>
+															</VisualState>
+														</VisualStateGroup>
+														<VisualStateGroup x:Name="CheckStates">
+															<VisualState x:Name="Checked">
+																<Storyboard>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="BackgroundOverlay2">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																	<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+																		<EasingColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
+																	</ColorAnimationUsingKeyFrames>
+																	<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="Highlight">
+																		<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
+																	</DoubleAnimationUsingKeyFrames>
+																</Storyboard>
+															</VisualState>
+															<VisualState x:Name="Unchecked"/>
+															<VisualState x:Name="Indeterminate"/>
+														</VisualStateGroup>
+														<VisualStateGroup x:Name="ValidationStates">
+															<VisualState x:Name="Valid"/>
+															<VisualState x:Name="InvalidFocused"/>
+															<VisualState x:Name="InvalidUnfocused"/>
+														</VisualStateGroup>
+													</VisualStateManager.VisualStateGroups>
+						
+													<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,2,2,0" Margin="0"/>
+													<Border x:Name="BackgroundOverlay" Background="#FF448DCA" BorderBrush="#FF448DCA" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,2,2,0" Opacity="0"/>
+													<Border x:Name="BackgroundOverlay2" Background="#FF448DCA" BorderBrush="#00000000" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,2,2,0" Opacity="0"/>
+													<Border x:Name="BackgroundGradient" BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="0,1,1,0" Margin="{TemplateBinding BorderThickness}">
+														<Border.Background>
+															<LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
+																<GradientStop Color="#FFFFFFFF" Offset="0"/>
+																<GradientStop Color="#F9FFFFFF" Offset="0.375"/>
+																<GradientStop Color="#E5FFFFFF" Offset="0.625"/>
+																<GradientStop Color="#C6FFFFFF" Offset="1"/>
+															</LinearGradientBrush>
+														</Border.Background>
+													</Border>
+													<Border x:Name="BackgroundOverlay3" Background="#FF448DCA" BorderBrush="#00000000" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,2,2,0" Opacity="0"/>
+													<Border x:Name="BackgroundGradient2" BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="0,1,1,0" Margin="{TemplateBinding BorderThickness}" Opacity="0">
+														<Border.Background>
+															<LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
+																<GradientStop Color="#FFFFFFFF" Offset="0"/>
+																<GradientStop Color="#F9FFFFFF" Offset="0.375"/>
+																<GradientStop Color="#E5FFFFFF" Offset="0.625"/>
+																<GradientStop Color="#C6FFFFFF" Offset="1"/>
+															</LinearGradientBrush>
+														</Border.Background>
+													</Border>
+													<Border x:Name="Highlight" BorderBrush="#FF6DBDD1" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,1,1,0" Margin="{TemplateBinding BorderThickness}" IsHitTestVisible="false" Opacity="0"/>
+													<Border x:Name="FocusVisualElement" BorderBrush="#FF6DBDD1" BorderThickness="1" CornerRadius="1" Margin="1" IsHitTestVisible="false" Visibility="Collapsed"/>
+													<Grid Width="17" HorizontalAlignment="Right">
+														<Border HorizontalAlignment="Stretch" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+															<Grid Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0">
+																<Path x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center">
+																	<Path.Data>
+																		<!-- Resource dictionary entries should be defined here. -->
+																		<Geometry>M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+																	</Path.Data>
+																</Path>
+															</Grid>
+														</Border>
+													</Grid>
+												</Grid>
+											</ControlTemplate>
+										</Setter.Value>
+									</Setter>
+								</Style>
+							</ToggleButton.Style>
+						</ToggleButton>
+						<ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Bottom" Margin="5,0,5,3"/>
+					</Grid>
+					
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>		
+		<Style.Triggers>
+			<Trigger Property="IsEditable" Value="true">
+				<Setter Property="BorderBrush">
+					<Setter.Value>
+						<LinearGradientBrush EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+							<GradientStop Color="#ABADB3" Offset="0.05"/>
+							<GradientStop Color="#E2E3EA" Offset="0.07"/>
+							<GradientStop Color="#E3E9EF" Offset="1"/>
+						</LinearGradientBrush>
+					</Setter.Value>
+				</Setter>
+				<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+				<Setter Property="IsTabStop" Value="false"/>
+				<Setter Property="Padding" Value="3"/>
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="{x:Type ComboBox}">
+							<Grid x:Name="Placement" SnapsToDevicePixels="true">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="*"/>
+									<ColumnDefinition Width="Auto"/>
+								</Grid.ColumnDefinitions>
+								<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+									<Border x:Name="Shdw" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=Placement}">
+										<Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+											<ScrollViewer x:Name="DropDownScrollViewer">
+												<Grid RenderOptions.ClearTypeHint="Enabled">
+													<Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+														<Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+													</Canvas>
+													<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+												</Grid>
+											</ScrollViewer>
+										</Border>
+									</Border>
+								</Popup>
+								<Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2"/>
+								<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+									<TextBox.Style>
+										<Style TargetType="{x:Type TextBox}">
+											<Setter Property="OverridesDefaultStyle" Value="true"/>
+											<Setter Property="AllowDrop" Value="true"/>
+											<Setter Property="MinWidth" Value="0"/>
+											<Setter Property="MinHeight" Value="0"/>
+											<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+											<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+											<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+											<Setter Property="Template">
+												<Setter.Value>
+													<ControlTemplate TargetType="{x:Type TextBox}">
+														<ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+													</ControlTemplate>
+												</Setter.Value>
+											</Setter>
+										</Style>
+									</TextBox.Style>
+								</TextBox>
+								<ToggleButton Grid.Column="1" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
+							</Grid>
+							<ControlTemplate.Triggers>
+								<Trigger Property="IsKeyboardFocusWithin" Value="true"/>
+								<Trigger Property="IsDropDownOpen" Value="true"/>
+								<Trigger Property="HasItems" Value="false"/>
+								<Trigger Property="IsEnabled" Value="false"/>
+								<Trigger Property="IsGrouping" Value="true"/>
+								<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true"/>
+								<Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+									<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+									<Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+								</Trigger>
+							</ControlTemplate.Triggers>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
   
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/DefaultStyles/FormulaEditor/generic.xaml b/DefaultStyles/FormulaEditor/generic.xaml
index 7c0495a..7e229fd 100644
--- a/DefaultStyles/FormulaEditor/generic.xaml
+++ b/DefaultStyles/FormulaEditor/generic.xaml
@@ -25,7 +25,7 @@
     <!-- ======================== -->
     <ResourceDictionary.MergedDictionaries>
         <!-- Need absolute reference as mentioned here: https://connect.microsoft.com/VisualStudio/feedback/details/487563/generic-xaml-relative-source-path-doesnt-work?wa=wsignin1.0 -->
-        <ResourceDictionary Source="generic.shared.xaml" />
+        <ResourceDictionary Source="/Infragistics.WPF.Controls.Interactions.XamFormulaEditor;component/Themes/generic.shared.xaml" />
      </ResourceDictionary.MergedDictionaries>
      
      
diff --git a/DefaultStyles/MaskInput/generic.xaml b/DefaultStyles/MaskInput/generic.xaml
index a68b87d..c9271d4 100644
--- a/DefaultStyles/MaskInput/generic.xaml
+++ b/DefaultStyles/MaskInput/generic.xaml
@@ -25,7 +25,7 @@
     <!-- ======================== -->
     <ResourceDictionary.MergedDictionaries>
         <!-- Need absolute reference as mentioned here: https://connect.microsoft.com/VisualStudio/feedback/details/487563/generic-xaml-relative-source-path-doesnt-work?wa=wsignin1.0 -->
-        <ResourceDictionary Source="generic.shared.xaml" />
+        <ResourceDictionary Source="/Infragistics.WPF.Controls.Editors.XamMaskedInput;component/Themes/generic.shared.xaml" />
      </ResourceDictionary.MergedDictionaries>
      
      
diff --git a/DefaultStyles/Menu/generic.xaml b/DefaultStyles/Menu/generic.xaml
index 501e9e1..f2eed75 100644
--- a/DefaultStyles/Menu/generic.xaml
+++ b/DefaultStyles/Menu/generic.xaml
@@ -1,5 +1,4 @@
-
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:igBasePrim="http://schemas.infragistics.com/xaml/primitives"
diff --git a/DefaultStyles/ScheduleDialogs/generic.xaml b/DefaultStyles/ScheduleDialogs/generic.xaml
index 59154e0..18cfa48 100644
--- a/DefaultStyles/ScheduleDialogs/generic.xaml
+++ b/DefaultStyles/ScheduleDialogs/generic.xaml
@@ -4,12 +4,26 @@
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <!--                             IMPORTANT NOTE:                                -->
     <!--                                                                            -->
-    <!-- Do not place any resources in this file as it gets overwritten in the      -->
-    <!-- pre-build step with the appropriate platform-specific ResourceDictionary   -->
-    <!-- (i.e., generic.sl.xaml or generic.wpf.xaml).  Shared resources should      -->
-    <!-- be placed in generic.shared.xaml which is merged into each platform        -->
-    <!-- specific ResourceDictionary                                                -->
+    <!-- Only place WPF-specific resources in this ResourceDictionary.  This file   -->
+    <!-- gets copied in the pre-build step so that it overwrites generic.xaml       -->
+    <!-- (which by default has no content).                                         -->
+    <!--                                                                            -->
+    <!-- Note that this ResourceDictionary merges in the contents of                -->
+    <!-- generic.shared.xaml which contains resources that work in both SL and WPF. -->
     <!--                                                                            -->
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 
+    
+    <!-- ======================== -->
+    <!-- Shared Resources         -->
+    <!-- ======================== -->
+    <ResourceDictionary.MergedDictionaries>
+        <!-- Need absolute reference as mentioned here: https://connect.microsoft.com/VisualStudio/feedback/details/487563/generic-xaml-relative-source-path-doesnt-work?wa=wsignin1.0 -->
+        <ResourceDictionary Source="/Infragistics.WPF.Controls.SchedulesDialogs;component/Themes/generic.shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- ======================== -->
+    <!-- WPF-specific Resources   -->
+    <!-- ======================== -->
+
 </ResourceDictionary>
diff --git a/DefaultStyles/XamCalendar/generic.mobile.xaml b/DefaultStyles/XamCalendar/generic.mobile.xaml
index ada2d09..c2ec2d3 100644
--- a/DefaultStyles/XamCalendar/generic.mobile.xaml
+++ b/DefaultStyles/XamCalendar/generic.mobile.xaml
@@ -5,8 +5,8 @@
 	xmlns:igPrimLocal="http://schemas.infragistics.com/xaml/primitives"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-    xmlns:igPrim="http://schemas.infragistics.com/xaml/primitives;assembly=InfragisticsWP7.v23.2" 
-    xmlns:ig="http://schemas.infragistics.com/xaml;assembly=InfragisticsWP7.v23.2">
+    xmlns:igPrim="http://schemas.infragistics.com/xaml/primitives;assembly=InfragisticsWP7.v24.2" 
+    xmlns:ig="http://schemas.infragistics.com/xaml;assembly=InfragisticsWP7.v24.2">
 
 	<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 	<!--                             IMPORTANT NOTE:                                -->
diff --git a/DefaultStyles/XamCalendar/generic.xaml b/DefaultStyles/XamCalendar/generic.xaml
index 988e91b..10f4e41 100644
--- a/DefaultStyles/XamCalendar/generic.xaml
+++ b/DefaultStyles/XamCalendar/generic.xaml
@@ -25,7 +25,7 @@
     <!-- ======================== -->
     <ResourceDictionary.MergedDictionaries>
         <!-- Need absolute reference as mentioned here: https://connect.microsoft.com/VisualStudio/feedback/details/487563/generic-xaml-relative-source-path-doesnt-work?wa=wsignin1.0 -->
-        <ResourceDictionary Source="generic.shared.xaml" />
+        <ResourceDictionary Source="/Infragistics.WPF.Controls.Editors.XamCalendar;component/Themes/generic.shared.xaml" />
      </ResourceDictionary.MergedDictionaries>
      
      
diff --git a/DefaultStyles/XamDataChart/LegendTemplates.xaml b/DefaultStyles/XamDataChart/LegendTemplates.xaml
index 5f830bf..194dd14 100644
--- a/DefaultStyles/XamDataChart/LegendTemplates.xaml
+++ b/DefaultStyles/XamDataChart/LegendTemplates.xaml
@@ -39,7 +39,7 @@
                       Content="{Binding}">
       <ContentPresenter.ContentTemplate>
         <DataTemplate>
-          <Ellipse Stroke="{Binding ItemOutline}" Fill="{Binding ItemBrush}"/>
+          <Ellipse Stroke="{Binding ActualItemBadgeOutline}" Fill="{Binding ItemBrush}"/>
         </DataTemplate>
       </ContentPresenter.ContentTemplate>
     </ContentPresenter>
@@ -82,13 +82,13 @@
             Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
            Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}" >
         <Ellipse Style="{StaticResource LegendItemBadgeStretchStyle}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"
+                 Fill="{Binding ActualItemBadgeBrush}"
                  Opacity="{Binding Series.ActualAreaFillOpacity}"
                  Stroke="Transparent"
                  StrokeThickness="{Binding Series.ActualThickness}"/>
         <Ellipse Style="{StaticResource LegendItemBadgeStretchStyle}"
                  Fill="Transparent"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
+                 Stroke="{Binding ActualItemBadgeOutline}"
                  StrokeThickness="{Binding Series.ActualThickness}"  />
           <!-- MT: not using StrokeDashArray="{Binding Series.DashArray}" StrokeDashCap="{Binding Series.DashCap}"
           because they dash array make legend badge shape look like they are incomplete -->
@@ -100,8 +100,8 @@
           Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}" 
          Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}" >
       <Ellipse Style="{StaticResource LegendItemBadgeStretchStyle}"
-               Fill="{Binding Series.ActualLegendItemBadgeBrush}"
-               Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
+               Fill="{Binding ActualItemBadgeBrush}"
+               Stroke="{Binding ActualItemBadgeOutline}"
                StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}" />
     </Grid>
   </DataTemplate>
@@ -138,7 +138,7 @@
           Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}">
       <Line X1="0" Y1="2" Y2="2" X2="{x:Static local:Defaults.LegendBadge_ShapeWidth}" 
             StrokeThickness="{Binding Series.ActualThickness}"
-            Stroke="{Binding Series.ActualLegendItemBadgeBrush}"
+            Stroke="{Binding Series.ActualBrush}"
             StrokeEndLineCap="{Binding Series.EndCap}"
             StrokeStartLineCap="{Binding Series.StartCap}"
             StrokeDashArray="{Binding Series.DashArray}"
@@ -163,7 +163,7 @@
           Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}" 
           Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}">
       <Line X1="0" Y1="2" Y2="2" X2="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
-            Stroke="{Binding Series.ActualLegendItemBadgeBrush}" 
+            Stroke="{Binding ActualItemBadgeBrush}" 
             StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"
             VerticalAlignment="Center"/>   
     </Grid>
@@ -175,7 +175,7 @@
           Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}" 
           Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}">
       <Line X1="0" Y1="2" Y2="2" X2="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
-            Stroke="{Binding Series.ActualLegendItemBadgeBrush}"
+            Stroke="{Binding ActualItemBadgeBrush}"
             StrokeThickness="{Binding Series.ActualThickness}"
             StrokeEndLineCap="{Binding Series.EndCap}"
             StrokeStartLineCap="{Binding Series.StartCap}"
@@ -189,7 +189,7 @@
           Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}" 
           Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}">
       <Line X1="0" Y1="2" Y2="2" X2="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
-            Stroke="{Binding Series.ActualLegendItemBadgeBrush}"
+            Stroke="{Binding ActualItemBadgeBrush}"
             StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"
             VerticalAlignment="Center"/>
     </Grid>
@@ -205,11 +205,11 @@
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}"
                  StrokeThickness="{Binding Series.ActualThickness}"
                  Stroke="Transparent"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"
+                 Fill="{Binding ActualItemBadgeBrush}"
                  Opacity="{Binding Series.ActualAreaFillOpacity}"/> 
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}"
                  StrokeThickness="{Binding Series.ActualThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
+                 Stroke="{Binding ActualItemBadgeOutline}"
                  Fill="Transparent" />
           <!-- MT: not using StrokeDashArray="{Binding Series.DashArray}" StrokeDashCap="{Binding Series.DashCap}"
           because they dash array make legend badge shape look like they are incomplete -->
@@ -221,8 +221,8 @@
          Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}">
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}"
                  StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"/>
+                 Stroke="{Binding ActualItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}"/>
     </Grid>
   </DataTemplate>
 
@@ -237,7 +237,7 @@
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="0.5*"/>
           </Grid.ColumnDefinitions>
-          <Rectangle Grid.Column="0" Stroke="Transparent" StrokeThickness="0" Fill="{Binding Series.ActualLegendItemBadgeBrush}"    />
+          <Rectangle Grid.Column="0" Stroke="Transparent" StrokeThickness="0" Fill="{Binding ActualItemBadgeBrush}"    />
           <Rectangle Grid.Column="1" Stroke="Transparent" StrokeThickness="0" Fill="{Binding Series.NegativeBrush}"  />
         </Grid>
         <!--MT: ignoring positive/negative outlines because this shape is too small to render them-->
@@ -246,7 +246,7 @@
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="0.5*"/>
           </Grid.ColumnDefinitions>
-          <Rectangle Grid.Column="0" Stroke="{Binding Series.ActualLegendItemBadgeOutline}"   StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
+          <Rectangle Grid.Column="0" Stroke="{Binding ActualItemBadgeOutline}"   StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
           <Rectangle Grid.Column="1" Stroke="{Binding Series.NegativeOutline}" StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
         </Grid>--> 
       </Grid>
@@ -256,8 +256,8 @@
     <Grid Style="{StaticResource LegendItemBadgeContainerStyle}" >
       <Rectangle Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
                  Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}" 
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}" 
+                 Stroke="{Binding ActualItemBadgeOutline}"
                  StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"/>
     </Grid>
   </DataTemplate>
@@ -273,7 +273,7 @@
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="0.5*"/>
           </Grid.ColumnDefinitions>
-          <Rectangle Grid.Column="0" Stroke="Transparent" StrokeThickness="0" Fill="{Binding Series.ActualLegendItemBadgeBrush}"    />
+          <Rectangle Grid.Column="0" Stroke="Transparent" StrokeThickness="0" Fill="{Binding ActualItemBadgeBrush}"    />
           <Rectangle Grid.Column="1" Stroke="Transparent" StrokeThickness="0" Fill="{Binding Series.NegativeBrush}"  />
         </Grid>
         <!--MT: ignoring positive/negative outlines because this shape is too small to render them-->
@@ -282,7 +282,7 @@
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="0.5*"/>
           </Grid.ColumnDefinitions>
-          <Rectangle Grid.Column="0" Stroke="{Binding Series.ActualLegendItemBadgeOutline}" StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
+          <Rectangle Grid.Column="0" Stroke="{Binding ActualItemBadgeOutline}" StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
           <Rectangle Grid.Column="1" Stroke="{Binding Series.NegativeBrush}" StrokeThickness="{Binding Series.ActualThickness}" Fill="Transparent"  />
         </Grid>--> 
       </Grid>
@@ -292,8 +292,8 @@
     <Grid Style="{StaticResource LegendItemBadgeContainerStyle}" >
       <Rectangle Width="{x:Static local:Defaults.LegendBadge_ShapeWidth}"
                  Height="{x:Static local:Defaults.LegendBadge_ShapeHeight}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}" 
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}" 
+                 Stroke="{Binding ActualItemBadgeOutline}"
                  StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"/>
     </Grid>
   </DataTemplate>
@@ -310,8 +310,8 @@
         </Grid.RowDefinitions>
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}" Grid.Row="1"
                  StrokeThickness="{Binding Series.ActualThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"/> 
+                 Stroke="{Binding ActualItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}"/> 
     </Grid>
   </DataTemplate>
   <DataTemplate x:Key="LegendBadgeTemplate_BarShape_Simplified"> <!-- no Series.DashArray, Series.ActualThickness, Series.ActualAreaFillOpacity-->
@@ -325,8 +325,8 @@
         </Grid.RowDefinitions>
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}" Grid.Row="1"
                  StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"/>
+                 Stroke="{Binding ActualItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}"/>
     </Grid>
   </DataTemplate>
   
@@ -342,8 +342,8 @@
       </Grid.ColumnDefinitions>
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}" Grid.Column="1"
                  StrokeThickness="{Binding Series.ActualThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"/> 
+                 Stroke="{Binding ActualItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}"/> 
     </Grid>
   </DataTemplate>
   <DataTemplate x:Key="LegendBadgeTemplate_ColumnShape_Simplified"> <!-- no Series.DashArray, Series.ActualThickness, Series.ActualAreaFillOpacity-->
@@ -357,8 +357,8 @@
       </Grid.ColumnDefinitions>
       <Rectangle Style="{StaticResource LegendItemBadgeStretchStyle}" Grid.Column="1"
                  StrokeThickness="{x:Static local:Defaults.LegendBadge_ShapeThickness}"
-                 Stroke="{Binding Series.ActualLegendItemBadgeOutline}"
-                 Fill="{Binding Series.ActualLegendItemBadgeBrush}"/>
+                 Stroke="{Binding ActualItemBadgeOutline}"
+                 Fill="{Binding ActualItemBadgeBrush}"/>
     </Grid>
   </DataTemplate>
   
diff --git a/DefaultStyles/XamDataChart/generic.shared.xaml b/DefaultStyles/XamDataChart/generic.shared.xaml
index 1ac94e9..feb68a6 100644
--- a/DefaultStyles/XamDataChart/generic.shared.xaml
+++ b/DefaultStyles/XamDataChart/generic.shared.xaml
@@ -764,7 +764,7 @@
 
   <!-- Discrete LegendItemTemplate - used by ItemLegend with Bubble Series-->
   <DataTemplate x:Key="DiscreteLegendItemTemplate">
-    <StackPanel Orientation="Horizontal" Margin="{StaticResource LegendItemMargin}" Visibility="{Binding Series.Visibility}">
+    <StackPanel Orientation="Horizontal" Background="Transparent" Margin="{StaticResource LegendItemMargin}" Visibility="{Binding Series.Visibility}">
       <ContentPresenter Content="{Binding}" 
                         ContentTemplate="{Binding Series.ActualLegendItemBadgeTemplate}"
                         Margin="{StaticResource LegendItemBadgeMargin}"/>
@@ -774,7 +774,7 @@
                       FontWeight="{Binding Series.ActualLegend.ItemsFontWeight}"
                       FontSize="{Binding Series.ActualLegend.ItemsFontSize}"
                       FontFamily="{Binding Series.ActualLegend.ItemsFontFamily}">
-        <ContentPresenter Content="{Binding ItemLabel, TargetNullValue=Series Item}"/>
+        <ContentPresenter Content="{Binding LegendLabel, TargetNullValue=Series Item}"/>
       </ContentControl>
     </StackPanel>
   </DataTemplate>
@@ -1050,6 +1050,8 @@
     <Setter Property="ShadowDirection" Value="315"/>
     <!-- do not set a default value for Outline, or else the XamDataChart.Outlines property will be ineffective. -->
     <Setter Property="LegendItemTemplate" Value="{StaticResource LegendItemTemplate}" />
+    <Setter Property="DiscreteLegendItemTemplate" Value="{StaticResource DiscreteLegendItemTemplate}"/>
+    
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="local:Series">
@@ -2084,9 +2086,97 @@
     <Setter Property="CrosshairsAnnotationXAxisTextColor"  Value="{x:Static local:Defaults.CrosshairXAxisAnnotationTextColor}"/>
     
   </Style>
-    
 
-  <!-- ************ Shape Styles for Scatter(*)Series ******************* -->
+
+    <!-- ******************* Data Pie Chart Style ******************* -->
+    <Style TargetType="local:XamDataPieChart">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:XamDataPieChart">
+                    <local:XamDataChart x:Name="DataChart" Background="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Brushes" Value="{StaticResource ChartBrushes}" />
+        <Setter Property="Outlines" Value="{StaticResource ChartOutlines}" />
+        <Setter Property="MarkerBrushes" Value="{StaticResource MarkerBrushes}" />
+        <Setter Property="MarkerOutlines" Value="{StaticResource MarkerOutlines}" />
+        <Setter Property="Background" Value="{StaticResource ChartBackgroundBrush}" />
+        <Setter Property="TitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="TitleFontSize" Value="{StaticResource ChartTitleFontSize}" />
+        <Setter Property="TitleFontStyle" Value="{x:Static shared:FontDefaults.ChartFontStyle}" />
+        <Setter Property="TitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="TitleAlignment" Value="Center" />
+        <Setter Property="TitleMargin" Value="0 0 0 5" />
+        <Setter Property="SubtitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="SubtitleFontSize" Value="{StaticResource ChartSmallFontSize}" />
+        <Setter Property="SubtitleFontStyle" Value="{x:Static shared:FontDefaults.ChartFontStyle}" />
+        <Setter Property="SubtitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="SubtitleAlignment" Value="Center" />
+        <Setter Property="SubtitleMargin" Value="0 0 0 5" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <!--<Setter Property="Resolution" Value="1" />-->
+        <Setter Property="ToolTipStyle" Value="{StaticResource ToolTipStyle}" />
+
+        <Setter Property="ValueAxisMajorStroke" Value="{x:Null}" />
+        <Setter Property="ValueAxisTickLength" Value="0" />
+        <Setter Property="ValueAxisLabelFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="ValueAxisLabelFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="ValueAxisLabelMargin" Value="{x:Static shared:FontDefaults.ChartYAxisLabelsMargin}" />
+        <Setter Property="ValueAxisLabelForeground" Value="{StaticResource AxisLabelsBrush}" />
+        <Setter Property="ValueAxisTitleFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="ValueAxisTitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="ValueAxisTitleAngle" Value="-90" />
+        <Setter Property="ValueAxisLabelVisibility" Value="Collapsed" />
+        <Setter Property="ValueAxisTitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="AngleAxisLabelFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="AngleAxisLabelFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="AngleAxisLabelMargin" Value="{x:Static shared:FontDefaults.ChartXAxisLabelsMargin}" />
+        <Setter Property="AngleAxisLabelForeground" Value="{StaticResource AxisLabelsBrush}" />
+        <Setter Property="AngleAxisTitleFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="AngleAxisTitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="AngleAxisTitleAngle" Value="0" />
+        <Setter Property="AngleAxisTitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="AngleAxisLabelVisibility" Value="Collapsed" />
+
+
+        <Setter Property="AngleAxisTickLength"          Value="{x:Static local:AxisDefaults.CategoryAxis_TickLength}" />
+        <Setter Property="AngleAxisTickStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_TickStroke}" />
+        <Setter Property="AngleAxisTickStroke"          Value="{x:Null}" />
+        <Setter Property="AngleAxisStroke"              Value="Transparent" />
+        <Setter Property="AngleAxisMajorStroke" Value="Transparent" />
+
+        <Setter Property="ValueAxisTickStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_TickStroke}" />
+        <Setter Property="ValueAxisTickStroke" Value="{x:Null}" />
+        <Setter Property="ValueAxisStroke" Value="Transparent" />
+        <Setter Property="ValueAxisStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_LineStroke}" />
+        <Setter Property="ValueAxisMajorStroke" Value="Transparent" />
+        <Setter Property="ValueAxisMajorStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_MajorStroke}" />
+        <Setter Property="ValueAxisMinorStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_MinorStroke}" />
+
+        <Setter Property="AutoCalloutsVisible" Value="True"
+                />
+        <!--<Setter Property="CalloutCollisionMode" Value="RadialOutsideEnd" />-->
+
+        <!--<Setter Property="HighlightedLegendItemVisibility" Value="Collapsed" />-->
+        <Setter Property="DataToolTipGroupingMode" Value="Grouped" />
+        <Setter Property="DataToolTipGroupedPositionModeX" Value="TrackRight" />
+        <Setter Property="CrosshairsDisplayMode" Value="None" />
+        <Setter Property="CalloutsUseItemColorForOutline" Value="True" />
+        <Setter Property="CalloutsStrokeThickness" Value="2" />
+        <Setter Property="CalloutsBackground" Value="White" />
+        <Setter Property="IsHorizontalZoomEnabled" Value="False" />
+        <Setter Property="IsVerticalZoomEnabled" Value="False" />
+        <Setter Property="CalloutsUseAutoContrastingLabelColors" Value="True" />
+        <Setter Property="AnimateSeriesWhenAxisRangeChanges" Value="True" />
+
+        <Setter Property="HighlightingMode" Value="FadeOthersSpecific" />
+        <Setter Property="HighlightingBehavior" Value="NearestItemsAndSeries" />
+    </Style>
+
+
+    <!-- ************ Shape Styles for Scatter(*)Series ******************* -->
   <Style TargetType="local:ShapeControl" x:Key="ShapeStyle_ScatterControlSeries"> 
     <!-- TODO add ScatterControlSeries.ShapeThickness property and bind it in this template 
       because Series.Thickness (double) does not affect BorderThickness property: --> 
diff --git a/DefaultStyles/XamDataChart/generic.xaml b/DefaultStyles/XamDataChart/generic.xaml
index 1ac94e9..feb68a6 100644
--- a/DefaultStyles/XamDataChart/generic.xaml
+++ b/DefaultStyles/XamDataChart/generic.xaml
@@ -764,7 +764,7 @@
 
   <!-- Discrete LegendItemTemplate - used by ItemLegend with Bubble Series-->
   <DataTemplate x:Key="DiscreteLegendItemTemplate">
-    <StackPanel Orientation="Horizontal" Margin="{StaticResource LegendItemMargin}" Visibility="{Binding Series.Visibility}">
+    <StackPanel Orientation="Horizontal" Background="Transparent" Margin="{StaticResource LegendItemMargin}" Visibility="{Binding Series.Visibility}">
       <ContentPresenter Content="{Binding}" 
                         ContentTemplate="{Binding Series.ActualLegendItemBadgeTemplate}"
                         Margin="{StaticResource LegendItemBadgeMargin}"/>
@@ -774,7 +774,7 @@
                       FontWeight="{Binding Series.ActualLegend.ItemsFontWeight}"
                       FontSize="{Binding Series.ActualLegend.ItemsFontSize}"
                       FontFamily="{Binding Series.ActualLegend.ItemsFontFamily}">
-        <ContentPresenter Content="{Binding ItemLabel, TargetNullValue=Series Item}"/>
+        <ContentPresenter Content="{Binding LegendLabel, TargetNullValue=Series Item}"/>
       </ContentControl>
     </StackPanel>
   </DataTemplate>
@@ -1050,6 +1050,8 @@
     <Setter Property="ShadowDirection" Value="315"/>
     <!-- do not set a default value for Outline, or else the XamDataChart.Outlines property will be ineffective. -->
     <Setter Property="LegendItemTemplate" Value="{StaticResource LegendItemTemplate}" />
+    <Setter Property="DiscreteLegendItemTemplate" Value="{StaticResource DiscreteLegendItemTemplate}"/>
+    
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="local:Series">
@@ -2084,9 +2086,97 @@
     <Setter Property="CrosshairsAnnotationXAxisTextColor"  Value="{x:Static local:Defaults.CrosshairXAxisAnnotationTextColor}"/>
     
   </Style>
-    
 
-  <!-- ************ Shape Styles for Scatter(*)Series ******************* -->
+
+    <!-- ******************* Data Pie Chart Style ******************* -->
+    <Style TargetType="local:XamDataPieChart">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:XamDataPieChart">
+                    <local:XamDataChart x:Name="DataChart" Background="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Brushes" Value="{StaticResource ChartBrushes}" />
+        <Setter Property="Outlines" Value="{StaticResource ChartOutlines}" />
+        <Setter Property="MarkerBrushes" Value="{StaticResource MarkerBrushes}" />
+        <Setter Property="MarkerOutlines" Value="{StaticResource MarkerOutlines}" />
+        <Setter Property="Background" Value="{StaticResource ChartBackgroundBrush}" />
+        <Setter Property="TitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="TitleFontSize" Value="{StaticResource ChartTitleFontSize}" />
+        <Setter Property="TitleFontStyle" Value="{x:Static shared:FontDefaults.ChartFontStyle}" />
+        <Setter Property="TitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="TitleAlignment" Value="Center" />
+        <Setter Property="TitleMargin" Value="0 0 0 5" />
+        <Setter Property="SubtitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="SubtitleFontSize" Value="{StaticResource ChartSmallFontSize}" />
+        <Setter Property="SubtitleFontStyle" Value="{x:Static shared:FontDefaults.ChartFontStyle}" />
+        <Setter Property="SubtitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="SubtitleAlignment" Value="Center" />
+        <Setter Property="SubtitleMargin" Value="0 0 0 5" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <!--<Setter Property="Resolution" Value="1" />-->
+        <Setter Property="ToolTipStyle" Value="{StaticResource ToolTipStyle}" />
+
+        <Setter Property="ValueAxisMajorStroke" Value="{x:Null}" />
+        <Setter Property="ValueAxisTickLength" Value="0" />
+        <Setter Property="ValueAxisLabelFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="ValueAxisLabelFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="ValueAxisLabelMargin" Value="{x:Static shared:FontDefaults.ChartYAxisLabelsMargin}" />
+        <Setter Property="ValueAxisLabelForeground" Value="{StaticResource AxisLabelsBrush}" />
+        <Setter Property="ValueAxisTitleFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="ValueAxisTitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="ValueAxisTitleAngle" Value="-90" />
+        <Setter Property="ValueAxisLabelVisibility" Value="Collapsed" />
+        <Setter Property="ValueAxisTitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="AngleAxisLabelFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="AngleAxisLabelFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="AngleAxisLabelMargin" Value="{x:Static shared:FontDefaults.ChartXAxisLabelsMargin}" />
+        <Setter Property="AngleAxisLabelForeground" Value="{StaticResource AxisLabelsBrush}" />
+        <Setter Property="AngleAxisTitleFontSize" Value="{x:Static shared:FontDefaults.ChartFontSize}" />
+        <Setter Property="AngleAxisTitleFontFamily" Value="{x:Static shared:FontDefaults.ChartFontFamily}" />
+        <Setter Property="AngleAxisTitleAngle" Value="0" />
+        <Setter Property="AngleAxisTitleForeground" Value="{StaticResource AxisTitleBrush}" />
+        <Setter Property="AngleAxisLabelVisibility" Value="Collapsed" />
+
+
+        <Setter Property="AngleAxisTickLength"          Value="{x:Static local:AxisDefaults.CategoryAxis_TickLength}" />
+        <Setter Property="AngleAxisTickStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_TickStroke}" />
+        <Setter Property="AngleAxisTickStroke"          Value="{x:Null}" />
+        <Setter Property="AngleAxisStroke"              Value="Transparent" />
+        <Setter Property="AngleAxisMajorStroke" Value="Transparent" />
+
+        <Setter Property="ValueAxisTickStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_TickStroke}" />
+        <Setter Property="ValueAxisTickStroke" Value="{x:Null}" />
+        <Setter Property="ValueAxisStroke" Value="Transparent" />
+        <Setter Property="ValueAxisStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_LineStroke}" />
+        <Setter Property="ValueAxisMajorStroke" Value="Transparent" />
+        <Setter Property="ValueAxisMajorStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_MajorStroke}" />
+        <Setter Property="ValueAxisMinorStrokeThickness" Value="{x:Static local:AxisDefaults.Axis_MinorStroke}" />
+
+        <Setter Property="AutoCalloutsVisible" Value="True"
+                />
+        <!--<Setter Property="CalloutCollisionMode" Value="RadialOutsideEnd" />-->
+
+        <!--<Setter Property="HighlightedLegendItemVisibility" Value="Collapsed" />-->
+        <Setter Property="DataToolTipGroupingMode" Value="Grouped" />
+        <Setter Property="DataToolTipGroupedPositionModeX" Value="TrackRight" />
+        <Setter Property="CrosshairsDisplayMode" Value="None" />
+        <Setter Property="CalloutsUseItemColorForOutline" Value="True" />
+        <Setter Property="CalloutsStrokeThickness" Value="2" />
+        <Setter Property="CalloutsBackground" Value="White" />
+        <Setter Property="IsHorizontalZoomEnabled" Value="False" />
+        <Setter Property="IsVerticalZoomEnabled" Value="False" />
+        <Setter Property="CalloutsUseAutoContrastingLabelColors" Value="True" />
+        <Setter Property="AnimateSeriesWhenAxisRangeChanges" Value="True" />
+
+        <Setter Property="HighlightingMode" Value="FadeOthersSpecific" />
+        <Setter Property="HighlightingBehavior" Value="NearestItemsAndSeries" />
+    </Style>
+
+
+    <!-- ************ Shape Styles for Scatter(*)Series ******************* -->
   <Style TargetType="local:ShapeControl" x:Key="ShapeStyle_ScatterControlSeries"> 
     <!-- TODO add ScatterControlSeries.ShapeThickness property and bind it in this template 
       because Series.Thickness (double) does not affect BorderThickness property: --> 
diff --git a/DefaultStyles/XamGrid/generic.xaml b/DefaultStyles/XamGrid/generic.xaml
index a1316cd..3d079cb 100644
--- a/DefaultStyles/XamGrid/generic.xaml
+++ b/DefaultStyles/XamGrid/generic.xaml
@@ -7695,4 +7695,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/DefaultStyles/XamTimeline/generic.xaml b/DefaultStyles/XamTimeline/generic.xaml
index 600b3d2..b919089 100644
--- a/DefaultStyles/XamTimeline/generic.xaml
+++ b/DefaultStyles/XamTimeline/generic.xaml
@@ -90,1049 +90,17 @@
 
     <!-- ==================== STYLING FOR SCROLLVIEWER USED IN EVENTDETAILS ==================== -->
     <!-- ======================================================================================= -->
-    <Style x:Key="EventDetailsVerticalScrollBarStyle" TargetType="ScrollBar">
-        <Setter Property="MinWidth" Value="17"/>
-        <Setter Property="MinHeight" Value="17"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollBar">
-                    <Grid x:Name="Root">
-                        <Grid.Resources>
-                            <ControlTemplate x:Key="RepeatButtonTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="Transparent">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundAnimation" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundAnimation" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DisabledElement" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value=".7"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Rectangle x:Name="Background" Opacity="0" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint=".5,1" StartPoint=".5,0">
-                                                <GradientStop Color="#FF647480" Offset="1"/>
-                                                <GradientStop Color="#FFAEB7BF" Offset="0"/>
-                                                <GradientStop Color="#FF919EA7" Offset="0.35"/>
-                                                <GradientStop Color="#FF7A8A99" Offset="0.35"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="BackgroundAnimation" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundGradient" Margin="1" Opacity="0" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                                <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    <Path Height="8" Width="4" Data="F1 M 511.047,352.682L 511.047,342.252L 517.145,347.467L 511.047,352.682 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                    <Rectangle x:Name="DisabledElement" Opacity="0" Fill="#FFFFFFFF" RadiusX="2" RadiusY="2"/>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DisabledElement" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value=".7"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Rectangle x:Name="Background" Opacity="0" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint=".5,1" StartPoint=".5,0">
-                                                <GradientStop Color="#FF647480" Offset="1"/>
-                                                <GradientStop Color="#FFAEB7BF" Offset="0"/>
-                                                <GradientStop Color="#FF919EA7" Offset="0.35"/>
-                                                <GradientStop Color="#FF7A8A99" Offset="0.35"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundGradient" Margin="1" Opacity="0" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                                <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    <Path Height="8" Width="4" Data="F1 M 110.692,342.252L 110.692,352.682L 104.594,347.467L 110.692,342.252 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                    <Rectangle x:Name="DisabledElement" Opacity="0" Fill="#FFFFFFFF" RadiusX="2" RadiusY="2"/>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="#00FFFFFF">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF333333"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard/>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard/>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Path x:Name="path" Height="4" Width="8" Data="F1 M 531.107,321.943L 541.537,321.943L 536.322,328.042L 531.107,321.943 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="#00FFFFFF">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF333333"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard/>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Path x:Name="path" Height="4" Width="8" Data="F1 M 541.537,173.589L 531.107,173.589L 536.322,167.49L 541.537,173.589 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalThumbTemplate" TargetType="Thumb">
-                                <Grid>
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ThumbVisual" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="0"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Grid x:Name="ThumbVisual" Margin="1,0,1,0">
-                                        <Rectangle x:Name="Background" Fill="{StaticResource BaseColorBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Stroke="{StaticResource BaseBorderBrush}"/>
-                                        <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="4" RadiusY="4"/>
-                                        <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="4" RadiusY="4"/>
-                                        <Rectangle x:Name="BackgroundGradient" Margin="1" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="3" RadiusY="3">
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush EndPoint="1,.7" StartPoint="0,.7">
-                                                    <GradientStop Color="#FFFFFFFF" Offset="0"/>
-                                                    <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                    <GradientStop Color="#E5FFFFFF" Offset="0.6"/>
-                                                    <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HighlightBrush}" StrokeThickness="1" RadiusX="3" RadiusY="3"/>
-                                    </Grid>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalThumbTemplate" TargetType="Thumb">
-                                <Grid>
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ThumbVisual" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="0"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Grid x:Name="ThumbVisual" Margin="0,1,0,1">
-                                        <Rectangle x:Name="Background" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                            <Rectangle.Stroke>
-                                                <LinearGradientBrush EndPoint=".5,1" StartPoint=".5,0">
-                                                    <GradientStop Color="#FF818F99" Offset="1"/>
-                                                    <GradientStop Color="#FFC2C9CE" Offset="0"/>
-                                                    <GradientStop Color="#FFB3BBC1" Offset="0.35"/>
-                                                    <GradientStop Color="#FF96A4B1" Offset="0.35"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Stroke>
-                                        </Rectangle>
-                                        <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                        <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                        <Rectangle x:Name="BackgroundGradient" Margin="1" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                                    <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                    <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                    <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                    <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    </Grid>
-                                </Grid>
-                            </ControlTemplate>
-                        </Grid.Resources>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver"/>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Opacity">
-                                            <SplineDoubleKeyFrame KeyTime="0" Value="0.5"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="HorizontalRoot">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <Rectangle Grid.ColumnSpan="5" Stroke="#00000000" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                <Rectangle.Fill>
-                                    <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
-                                        <GradientStop Color="#FFF4F6F7" Offset="0"/>
-                                        <GradientStop Color="#FFF0F4F7" Offset="0.344"/>
-                                        <GradientStop Color="#FFDFE3E6" Offset="1"/>
-                                        <GradientStop Color="#FFE9EEF4" Offset="0.527"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <Rectangle Grid.ColumnSpan="5" Fill="{TemplateBinding Background}" Stroke="#00000000" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                            <Rectangle Opacity=".375" Grid.ColumnSpan="5" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                <Rectangle.Stroke>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-                                        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-                                        <GradientStop Color="#FF718597" Offset="0.375"/>
-                                        <GradientStop Color="#FF617584" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Stroke>
-                            </Rectangle>
-                            <Rectangle Margin="1" Grid.ColumnSpan="5" RadiusX="1" RadiusY="1">
-                                <Rectangle.Stroke>
-                                    <LinearGradientBrush EndPoint="0.5,.125" StartPoint=".5,.875">
-                                        <GradientStop Color="#33FFFFFF"/>
-                                        <GradientStop Color="#99FFFFFF" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Stroke>
-                            </Rectangle>
-                            <RepeatButton x:Name="HorizontalSmallDecrease" IsTabStop="False" Template="{StaticResource HorizontalDecrementTemplate}" Margin="1" Width="16" Grid.Column="0" Interval="50"/>
-                            <RepeatButton x:Name="HorizontalLargeDecrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Width="0" Grid.Column="1" Interval="50"/>
-                            <Thumb x:Name="HorizontalThumb" Background="{TemplateBinding Background}" Template="{StaticResource HorizontalThumbTemplate}" MinWidth="18" Width="18" Grid.Column="2"/>
-                            <RepeatButton x:Name="HorizontalLargeIncrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Grid.Column="3" Interval="50"/>
-                            <RepeatButton x:Name="HorizontalSmallIncrease" IsTabStop="False" Template="{StaticResource HorizontalIncrementTemplate}" Margin="1" Width="16" Grid.Column="4" Interval="50"/>
-                        </Grid>
-                        <Grid x:Name="VerticalRoot" Visibility="Collapsed">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <RepeatButton x:Name="VerticalSmallDecrease" IsTabStop="False" Template="{StaticResource VerticalDecrementTemplate}" Height="16" Margin="1" Grid.Row="0" Interval="50"/>
-                            <RepeatButton x:Name="VerticalLargeDecrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Height="0" Grid.Row="1" Interval="50"/>
-                            <Thumb x:Name="VerticalThumb" Template="{StaticResource VerticalThumbTemplate}" Height="18" Margin="4,0,3,0" MinHeight="18" Grid.Row="2"/>
-                            <RepeatButton x:Name="VerticalLargeIncrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Grid.Row="3" Interval="50"/>
-                            <RepeatButton x:Name="VerticalSmallIncrease" IsTabStop="False" Template="{StaticResource VerticalIncrementTemplate}" Height="16" Margin="1" Grid.Row="4" Interval="50"/>
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style x:Key="EventDetailsHorizontalScrollBarStyle" TargetType="ScrollBar">
-        <Setter Property="MinWidth" Value="17"/>
-        <Setter Property="MinHeight" Value="17"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollBar">
-                    <Grid x:Name="Root">
-                        <Grid.Resources>
-                            <ControlTemplate x:Key="RepeatButtonTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="Transparent">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="#00FFFFFF">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF333333"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard/>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Path x:Name="path" Height="8" Width="4" Data="F1 M 511.047,352.682L 511.047,342.252L 517.145,347.467L 511.047,352.682 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="#00FFFFFF">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF333333"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0000000" Storyboard.TargetName="path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#FF6DBDD1"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard/>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Path x:Name="path" Fill="#FF333333" Height="8" Width="4" Data="F1 M 110.692,342.252L 110.692,352.682L 104.594,347.467L 110.692,342.252 Z " Stretch="Uniform"/>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DisabledElement" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value=".7"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Rectangle x:Name="Background" Opacity="0" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint="1,.5" StartPoint="0,.5">
-                                                <GradientStop Color="#FF647480" Offset="1"/>
-                                                <GradientStop Color="#FFAEB7BF" Offset="0"/>
-                                                <GradientStop Color="#FF919EA7" Offset="0.35"/>
-                                                <GradientStop Color="#FF7A8A99" Offset="0.35"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundGradient" Margin="1" Opacity="0" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint="1,.7" StartPoint="0,.7">
-                                                <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    <Path Height="4" Width="8" Data="F1 M 531.107,321.943L 541.537,321.943L 536.322,328.042L 531.107,321.943 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                    <Rectangle x:Name="DisabledElement" Opacity="0" Fill="#FFFFFFFF" RadiusX="2" RadiusY="2"/>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root">
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DisabledElement" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value=".7"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Rectangle x:Name="Background" Opacity="0" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint="1,.5" StartPoint="0,.5">
-                                                <GradientStop Color="#FF647480" Offset="1"/>
-                                                <GradientStop Color="#FFAEB7BF" Offset="0"/>
-                                                <GradientStop Color="#FF919EA7" Offset="0.35"/>
-                                                <GradientStop Color="#FF7A8A99" Offset="0.35"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                    <Rectangle x:Name="BackgroundGradient" Margin="1" Opacity="0" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint="1,.7" StartPoint="0,.7">
-                                                <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    <Path Height="4" Width="8" Data="F1 M 541.537,173.589L 531.107,173.589L 536.322,167.49L 541.537,173.589 Z " Stretch="Uniform">
-                                        <Path.Fill>
-                                            <SolidColorBrush x:Name="ButtonColor" Color="#FF333333"/>
-                                        </Path.Fill>
-                                    </Path>
-                                    <Rectangle x:Name="DisabledElement" Opacity="0" Fill="#FFFFFFFF" RadiusX="2" RadiusY="2"/>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="VerticalThumbTemplate" TargetType="Thumb">
-                                <Grid>
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ThumbVisual" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="0"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Grid x:Name="ThumbVisual" Margin="1,0,1,0">
-                                        <Rectangle x:Name="Background" Fill="#FF1F3B53" StrokeThickness="1" RadiusX="2" RadiusY="2">
-                                            <Rectangle.Stroke>
-                                                <LinearGradientBrush EndPoint="1,.5" StartPoint="0,.5">
-                                                    <GradientStop Color="#FF818F99" Offset="1"/>
-                                                    <GradientStop Color="#FFC2C9CE" Offset="0"/>
-                                                    <GradientStop Color="#FFB3BBC1" Offset="0.35"/>
-                                                    <GradientStop Color="#FF96A4B1" Offset="0.35"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Stroke>
-                                        </Rectangle>
-                                        <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                        <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="2" RadiusY="2"/>
-                                        <Rectangle x:Name="BackgroundGradient" Margin="1" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush EndPoint="1,.7" StartPoint="0,.7">
-                                                    <GradientStop Color="#FFFFFFFF" Offset="0"/>
-                                                    <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                    <GradientStop Color="#E5FFFFFF" Offset="0.6"/>
-                                                    <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="#FF6DBDD1" StrokeThickness="1" RadiusX="1" RadiusY="1"/>
-                                    </Grid>
-                                </Grid>
-                            </ControlTemplate>
-                            <ControlTemplate x:Key="HorizontalThumbTemplate" TargetType="Thumb">
-                                <Grid>
-                                    <VisualStateManager.VisualStateGroups>
-                                        <VisualStateGroup x:Name="CommonStates">
-                                            <VisualState x:Name="Normal"/>
-                                            <VisualState x:Name="MouseOver">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundMouseOver" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#7FFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#CCFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#F2FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Pressed">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundPressed" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#6BFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#C6FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#EAFFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#F4FFFFFF"/>
-                                                    </ColorAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                            <VisualState x:Name="Disabled">
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ThumbVisual" Storyboard.TargetProperty="Opacity">
-                                                        <SplineDoubleKeyFrame KeyTime="0:0:0" Value="0"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </VisualState>
-                                        </VisualStateGroup>
-                                    </VisualStateManager.VisualStateGroups>
-                                    <Grid x:Name="ThumbVisual" Margin="0,1,0,1">
-                                        <Rectangle x:Name="Background" Fill="{StaticResource BaseColorBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Stroke="{StaticResource BaseBorderBrush}"/>
-                                        <Rectangle x:Name="BackgroundMouseOver" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="4" RadiusY="4"/>
-                                        <Rectangle x:Name="BackgroundPressed" Opacity="0" Fill="#FF448DCA" Stroke="#00000000" StrokeThickness="1" RadiusX="4" RadiusY="4"/>
-                                        <Rectangle x:Name="BackgroundGradient" Margin="1" Stroke="#FFFFFFFF" StrokeThickness="1" RadiusX="3" RadiusY="3">
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                                    <GradientStop Color="#FFFFFFFF" Offset="0.013"/>
-                                                    <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                    <GradientStop Color="#E5FFFFFF" Offset="0.603"/>
-                                                    <GradientStop Color="#C6FFFFFF" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="Highlight" Margin="1" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HighlightBrush}" StrokeThickness="1" RadiusX="3" RadiusY="3"/>
-                                    </Grid>
-                                </Grid>
-                            </ControlTemplate>
-                        </Grid.Resources>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver"/>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Opacity">
-                                            <SplineDoubleKeyFrame KeyTime="0" Value="0.5"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="HorizontalRoot">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <RepeatButton x:Name="HorizontalSmallDecrease" IsTabStop="False" Template="{StaticResource HorizontalDecrementTemplate}" Margin="1" Width="16" Grid.Column="0" Interval="50"/>
-                            <RepeatButton x:Name="HorizontalLargeDecrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Width="0" Grid.Column="1" Interval="50"/>
-                            <Thumb x:Name="HorizontalThumb" Background="{TemplateBinding Background}" Template="{StaticResource HorizontalThumbTemplate}" Margin="0,4,0,3" MinWidth="18" Width="18" Grid.Column="2"/>
-                            <RepeatButton x:Name="HorizontalLargeIncrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Grid.Column="3" Interval="50"/>
-                            <RepeatButton x:Name="HorizontalSmallIncrease" IsTabStop="False" Template="{StaticResource HorizontalIncrementTemplate}" Margin="1" Width="16" Grid.Column="4" Interval="50"/>
-                        </Grid>
-                        <Grid x:Name="VerticalRoot" Visibility="Collapsed">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Rectangle Grid.RowSpan="5" Stroke="#00000000" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                <Rectangle.Fill>
-                                    <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-                                        <GradientStop Color="#FFF4F6F7" Offset="0"/>
-                                        <GradientStop Color="#FFF0F4F7" Offset="0.344"/>
-                                        <GradientStop Color="#FFDFE3E6" Offset="1"/>
-                                        <GradientStop Color="#FFE9EEF4" Offset="0.527"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <Rectangle Opacity=".375" Grid.RowSpan="5" StrokeThickness="1" RadiusX="1" RadiusY="1">
-                                <Rectangle.Stroke>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-                                        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-                                        <GradientStop Color="#FF718597" Offset="0.375"/>
-                                        <GradientStop Color="#FF617584" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Stroke>
-                            </Rectangle>
-                            <Rectangle Margin="1" Grid.RowSpan="5" RadiusX="1" RadiusY="1">
-                                <Rectangle.Stroke>
-                                    <LinearGradientBrush EndPoint="0.125,0.5" StartPoint="0.875,0.5">
-                                        <GradientStop Color="#33FFFFFF"/>
-                                        <GradientStop Color="#99FFFFFF" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Stroke>
-                            </Rectangle>
-                            <RepeatButton x:Name="VerticalSmallDecrease" IsTabStop="False" Template="{StaticResource VerticalDecrementTemplate}" Height="16" Margin="1" Grid.Row="0" Interval="50"/>
-                            <RepeatButton x:Name="VerticalLargeDecrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Height="0" Grid.Row="1" Interval="50"/>
-                            <Thumb x:Name="VerticalThumb" Template="{StaticResource VerticalThumbTemplate}" Height="18" MinHeight="18" Grid.Row="2"/>
-                            <RepeatButton x:Name="VerticalLargeIncrease" IsTabStop="False" Template="{StaticResource RepeatButtonTemplate}" Grid.Row="3" Interval="50"/>
-                            <RepeatButton x:Name="VerticalSmallIncrease" IsTabStop="False" Template="{StaticResource VerticalIncrementTemplate}" Height="16" Margin="1" Grid.Row="4" Interval="50"/>
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+       
+    <!--WPF specific styles-->
+
+    <Style x:Key="EventDetailsScrollBarStyle" TargetType="ScrollBar">
     </Style>
-    <Style x:Key="EventDetailsScrollViewerStyle" TargetType="ScrollViewer">
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Top"/>
-        <Setter Property="VerticalScrollBarVisibility" Value="Visible"/>
-        <Setter Property="Padding" Value="4"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0"/>
-                    <GradientStop Color="#FF8399A9" Offset="0.375"/>
-                    <GradientStop Color="#FF718597" Offset="0.375"/>
-                    <GradientStop Color="#FF617584" Offset="1"/>
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollViewer">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2">
-                        <Grid Background="{TemplateBinding Background}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <ScrollContentPresenter x:Name="ScrollContentPresenter" Cursor="{TemplateBinding Cursor}" Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                            <ScrollBar x:Name="VerticalScrollBar" IsTabStop="False" Margin="0,-1,-1,-1" Style="{StaticResource EventDetailsVerticalScrollBarStyle}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Grid.Column="1" Grid.Row="0" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Value="{TemplateBinding VerticalOffset}" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}"/>
-                            <ScrollBar x:Name="HorizontalScrollBar" IsTabStop="False" Height="18" Margin="-1,0,-1,-1" Style="{StaticResource EventDetailsHorizontalScrollBarStyle}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Grid.Column="0" Grid.Row="1" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Value="{TemplateBinding HorizontalOffset}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+
+    <Style x:Key="EventDetailsScrollViewerStyle" TargetType="ScrollViewer">       
     </Style>
 
+    <!--END of WPF specific styles-->
+    
     <!-- ============== END Brushes STYLING FOR SCROLLVIEWER USED IN EVENTDETAILS ============== -->
     <!-- ======================================================================================= -->
 
@@ -1254,8 +222,6 @@
         <Setter Property="EventDetailsTopStyle">
             <Setter.Value>
                 <Style TargetType="local:EventDetails">
-                    <!--<Setter Property="Width" Value="200" />-->
-                    <Setter Property="MaxWidth" Value="200" />
                     <Setter Property="HorizontalAlignment" Value="Left" />
                     <Setter Property="Background" Value="{StaticResource BaseColorBrush}"/>
                     <Setter Property="BorderBrush" Value="{StaticResource BaseBorderBrush}"/>
@@ -1294,8 +260,6 @@
         <Setter Property="EventDetailsBottomStyle">
             <Setter.Value>
                 <Style TargetType="local:EventDetails">
-                    <!--<Setter Property="Width" Value="200" />-->
-                    <Setter Property="MaxWidth" Value="200" />
                     <Setter Property="HorizontalAlignment" Value="Left" />
                     <Setter Property="Background" Value="{StaticResource BaseColorBrush}"/>
                     <Setter Property="BorderBrush" Value="{StaticResource BaseBorderBrush}"/>
@@ -1552,6 +516,7 @@
                 </Style>
             </Setter.Value>
         </Setter>
+        
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:TimelineAxis">
@@ -1854,8 +819,6 @@
 
     <!--EventDetails-->
     <Style TargetType="local:EventDetails">
-        <!--<Setter Property="Width" Value="200" />-->
-        <Setter Property="MaxWidth" Value="200" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Background" Value="{StaticResource BaseColorBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BaseBorderBrush}"/>