diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 6f973586..48f5f0a6 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1946,7 +1946,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="Thumb">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
+						<Storyboard x:Key="StoryboardMouseEnter">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
 							</DoubleAnimationUsingKeyFrames>
@@ -1960,7 +1960,7 @@
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
 							</DoubleAnimationUsingKeyFrames>
 						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
+						<Storyboard x:Key="StoryboardMouseLeave">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
 							</DoubleAnimationUsingKeyFrames>
@@ -1992,10 +1992,10 @@
 							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
 						</Trigger>
 						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
 						</EventTrigger>
 						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
 						</EventTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -2009,7 +2009,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="Thumb">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
+						<Storyboard x:Key="StoryboardMouseEnter">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
 							</DoubleAnimationUsingKeyFrames>
@@ -2023,7 +2023,7 @@
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
 							</DoubleAnimationUsingKeyFrames>
 						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
+						<Storyboard x:Key="StoryboardMouseLeave">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
 							</DoubleAnimationUsingKeyFrames>
@@ -2055,10 +2055,10 @@
 							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
 						</Trigger>
 						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
 						</EventTrigger>
 						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
 						</EventTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -2125,6 +2125,24 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
 		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="*" />
@@ -2135,13 +2153,23 @@
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 			<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
 		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
 		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
+			<Storyboard x:Key="StoryboardMouseOver">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2149,7 +2177,7 @@
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
 			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
+			<Storyboard x:Key="StoryboardCommon">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2174,10 +2202,10 @@
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
 				</Trigger.EnterActions>
 				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
 				</Trigger.ExitActions>
 			</Trigger>
 		</ControlTemplate.Triggers>
@@ -2193,6 +2221,24 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
 		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="*" />
@@ -2206,10 +2252,20 @@
 			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
 			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
 		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
 		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
+			<Storyboard x:Key="StoryboardMouseOver">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2217,7 +2273,7 @@
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
 			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
+			<Storyboard x:Key="StoryboardCommon">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2242,10 +2298,10 @@
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
 				</Trigger.EnterActions>
 				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
 				</Trigger.ExitActions>
 			</Trigger>
 		</ControlTemplate.Triggers>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
index 3d818006..8965a84e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
@@ -23,7 +23,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Thumb">
                     <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
+                        <Storyboard x:Key="StoryboardMouseEnter">
                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8"/>
                             </DoubleAnimationUsingKeyFrames>
@@ -37,7 +37,7 @@
                                 <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0"/>
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
+                        <Storyboard x:Key="StoryboardMouseLeave">
                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2"/>
                             </DoubleAnimationUsingKeyFrames>
@@ -69,10 +69,10 @@
                             <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}"/>
                         </Trigger>
                         <EventTrigger RoutedEvent="MouseEnter">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
+                            <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}"/>
                         </EventTrigger>
                         <EventTrigger RoutedEvent="MouseLeave">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
+                            <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}"/>
                         </EventTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -87,7 +87,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Thumb">
                     <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
+                        <Storyboard x:Key="StoryboardMouseEnter">
                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8"/>
                             </DoubleAnimationUsingKeyFrames>
@@ -101,7 +101,7 @@
                                 <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0"/>
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
+                        <Storyboard x:Key="StoryboardMouseLeave">
                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2"/>
                             </DoubleAnimationUsingKeyFrames>
@@ -133,10 +133,10 @@
                             <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}"/>
                         </Trigger>
                         <EventTrigger RoutedEvent="MouseEnter">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
+                            <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}"/>
                         </EventTrigger>
                         <EventTrigger RoutedEvent="MouseLeave">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
+                            <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}"/>
                         </EventTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -205,6 +205,24 @@
     </Style>
 
     <ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardMouseOver">
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardCommon">
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3"/>
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3"/>
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+        </ControlTemplate.Resources>
         <Grid x:Name="Grid" Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
@@ -215,15 +233,25 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
-            <ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
-            <ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
+            <ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+            <ScrollBar x:Name="PART_HorizontalScrollBar"  Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
         </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
 
     <ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
         <ControlTemplate.Resources>
-            <Storyboard x:Key="Storyboard1">
+            <Storyboard x:Key="StoryboardMouseOver">
                 <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
                     <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
                 </DoubleAnimationUsingKeyFrames>
@@ -231,7 +259,7 @@
                     <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
                 </DoubleAnimationUsingKeyFrames>
             </Storyboard>
-            <Storyboard x:Key="Storyboard2">
+            <Storyboard x:Key="StoryboardCommon">
                 <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
                     <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
                 </DoubleAnimationUsingKeyFrames>
@@ -256,10 +284,10 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}"/>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}"/>
                 </Trigger.ExitActions>
             </Trigger>
         </ControlTemplate.Triggers>
@@ -277,6 +305,24 @@
     </Style>
 
     <ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardMouseOver">
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardCommon">
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3"/>
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                    <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3"/>
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+        </ControlTemplate.Resources>
         <Grid x:Name="Grid" Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
@@ -290,11 +336,21 @@
             <ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
             <ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
         </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
         <ControlTemplate.Resources>
-            <Storyboard x:Key="Storyboard1">
+            <Storyboard x:Key="StoryboardMouseOver">
                 <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
                     <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
                 </DoubleAnimationUsingKeyFrames>
@@ -302,7 +358,7 @@
                     <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8"/>
                 </DoubleAnimationUsingKeyFrames>
             </Storyboard>
-            <Storyboard x:Key="Storyboard2">
+            <Storyboard x:Key="StoryboardCommon">
                 <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
                     <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
                 </DoubleAnimationUsingKeyFrames>
@@ -327,10 +383,10 @@
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}"/>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}"/>
                 </Trigger.ExitActions>
             </Trigger>
         </ControlTemplate.Triggers>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 12a7c6a1..378ea8c6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1946,7 +1946,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="Thumb">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
+						<Storyboard x:Key="StoryboardMouseEnter">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
 							</DoubleAnimationUsingKeyFrames>
@@ -1960,7 +1960,7 @@
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
 							</DoubleAnimationUsingKeyFrames>
 						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
+						<Storyboard x:Key="StoryboardMouseLeave">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
 							</DoubleAnimationUsingKeyFrames>
@@ -1992,10 +1992,10 @@
 							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
 						</Trigger>
 						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
 						</EventTrigger>
 						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
 						</EventTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -2009,7 +2009,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="Thumb">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
+						<Storyboard x:Key="StoryboardMouseEnter">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
 							</DoubleAnimationUsingKeyFrames>
@@ -2023,7 +2023,7 @@
 								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
 							</DoubleAnimationUsingKeyFrames>
 						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
+						<Storyboard x:Key="StoryboardMouseLeave">
 							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
 								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
 							</DoubleAnimationUsingKeyFrames>
@@ -2055,10 +2055,10 @@
 							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
 						</Trigger>
 						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
 						</EventTrigger>
 						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
 						</EventTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -2125,6 +2125,24 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
 		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="*" />
@@ -2135,13 +2153,23 @@
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 			<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
 		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
 		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
+			<Storyboard x:Key="StoryboardMouseOver">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2149,7 +2177,7 @@
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
 			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
+			<Storyboard x:Key="StoryboardCommon">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2174,10 +2202,10 @@
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
 				</Trigger.EnterActions>
 				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
 				</Trigger.ExitActions>
 			</Trigger>
 		</ControlTemplate.Triggers>
@@ -2193,6 +2221,24 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
 		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="*" />
@@ -2206,10 +2252,20 @@
 			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
 			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
 		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
 		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
+			<Storyboard x:Key="StoryboardMouseOver">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2217,7 +2273,7 @@
 					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
 				</DoubleAnimationUsingKeyFrames>
 			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
+			<Storyboard x:Key="StoryboardCommon">
 				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
 					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
 				</DoubleAnimationUsingKeyFrames>
@@ -2242,10 +2298,10 @@
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
 				</Trigger.EnterActions>
 				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
 				</Trigger.ExitActions>
 			</Trigger>
 		</ControlTemplate.Triggers>