diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/ButtonChrome.cs
index c289d094..b6c2b9e1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/ButtonChrome.cs
@@ -24,7 +24,13 @@ namespace Microsoft.Windows.Controls.Chromes
 
         protected virtual void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
         {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
+            //we always want the InnerBorderRadius to be one less than the CornerRadius
+            CornerRadius newInnerCornerRadius = new CornerRadius(Math.Max(0, newValue.TopLeft - 1), 
+                                                                 Math.Max(0, newValue.TopRight - 1), 
+                                                                 Math.Max(0, newValue.BottomRight - 1), 
+                                                                 Math.Max(0, newValue.BottomLeft - 1));
+
+            InnerCornerRadius = newInnerCornerRadius;
         }
 
         #endregion //CornerRadius
@@ -52,29 +58,6 @@ namespace Microsoft.Windows.Controls.Chromes
 
         #endregion //InnerCornerRadius
 
-        #region RenderActive
-
-        public static readonly DependencyProperty RenderActiveProperty = DependencyProperty.Register("RenderActive", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderActiveChanged));
-        public bool RenderActive
-        {
-            get { return (bool)GetValue(RenderActiveProperty); }
-            set { SetValue(RenderActiveProperty, value); }
-        }
-
-        private static void OnRenderActiveChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderActiveChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderActiveChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderActive
-
         #region RenderChecked
 
         public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register("RenderChecked", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderCheckedChanged));
@@ -213,52 +196,6 @@ namespace Microsoft.Windows.Controls.Chromes
 
         #endregion //RenderPressed
 
-        #region RenderSelected
-
-        public static readonly DependencyProperty RenderSelectedProperty = DependencyProperty.Register("RenderSelected", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderSelectedChanged));
-        public bool RenderSelected
-        {
-            get { return (bool)GetValue(RenderSelectedProperty); }
-            set { SetValue(RenderSelectedProperty, value); }
-        }
-
-        private static void OnRenderSelectedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderSelectedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderSelectedChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderSelected
-
-        #region RenderHighlighted
-
-        public static readonly DependencyProperty RenderHighlightedProperty = DependencyProperty.Register("RenderHighlighted", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderHighlightedChanged));
-        public bool RenderHighlighted
-        {
-            get { return (bool)GetValue(RenderHighlightedProperty); }
-            set { SetValue(RenderHighlightedProperty, value); }
-        }
-
-        private static void OnRenderHighlightedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderHighlightedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderHighlightedChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }        
-
-        #endregion //RenderHighlighted
-
         #region Contsructors
 
         static ButtonChrome()
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 5971827f..19f21fc1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -1132,109 +1132,64 @@
     <!-- SplitButton                                                                     -->
     <!-- =============================================================================== -->
 
-    <Style x:Key="SplitButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{StaticResource SpinButtonNormalCenterFillKey}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource SpinButtonNormalOuterBorderFillKey}"/>
-        <Setter Property="Foreground" Value="{StaticResource SpinButtonGlyphNormalForegroundFillKey}"/>
-        <Setter Property="BorderThickness" Value="1, 1, 0, 1"/>
-        <Setter Property="Padding" Value="3,1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="2,0,0,2">
-                        <Grid>
-                            <Border x:Name="innerBd" BorderBrush="{StaticResource SpinButtonNormalInnerBorderFillKey}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,0,0,2"/>
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{StaticResource SpinButtonHottrackInnerBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource SpinButtonHottrackCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource SpinButtonHottrackOuterBorderFillKey}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource SpinButtonPressedOuterBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource SpinButtonPressedCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{StaticResource SpinButtonPressedInnerBorderFillKey}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False"/>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="SplitButtonDropDownStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{StaticResource SpinButtonNormalCenterFillKey}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource SpinButtonNormalOuterBorderFillKey}"/>
-        <Setter Property="Foreground" Value="{StaticResource SpinButtonGlyphNormalForegroundFillKey}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="3,1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="0,2,2,0">
-                        <Grid>
-                            <Border x:Name="innerBd" BorderBrush="{StaticResource SpinButtonNormalInnerBorderFillKey}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,2,2,0"/>
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{StaticResource SpinButtonHottrackInnerBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource SpinButtonHottrackCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource SpinButtonHottrackOuterBorderFillKey}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource SpinButtonPressedOuterBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource SpinButtonPressedCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{StaticResource SpinButtonPressedInnerBorderFillKey}"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource SpinButtonPressedOuterBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource SpinButtonPressedCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{StaticResource SpinButtonPressedInnerBorderFillKey}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False"/>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style TargetType="{x:Type local:SplitButton}">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="3"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:SplitButton}">
                     <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <Border x:Name="OuterBorder" Background="{TemplateBinding Background}" CornerRadius="2">
-                            <Border x:Name="InnerBorder" Background="Transparent" CornerRadius="2">
+                        <chrome:ButtonChrome x:Name="ControlChrome" RenderEnabled="{TemplateBinding IsEnabled}"/>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Button x:Name="PART_ActionButton" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                                <Button.Template>
+                                    <ControlTemplate TargetType="Button">
+                                        <ContentPresenter />
+                                    </ControlTemplate>
+                                </Button.Template>
                                 <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Button x:Name="PART_ActionButton" Style="{StaticResource SplitButtonStyle}" >
-                                        <ContentPresenter Name="Content" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
-                                    </Button>
-                                    <ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" IsTabStop="False"                                                  
-                                                  Style="{StaticResource SplitButtonDropDownStyle}"
+                                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                         CornerRadius="2.75, 0, 0, 2.75"                                                         
+                                                         RenderNormal="False"
+                                                         RenderEnabled="{TemplateBinding IsEnabled}"
+											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											             RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}" />
+                                    <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                                </Grid>
+                            </Button>
+                            <ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" IsTabStop="False"
                                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                                  IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-                                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False">
-                                            <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                        </Grid>
-                                    </ToggleButton>
+                                                  IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
+                                <ToggleButton.Template>
+                                    <ControlTemplate TargetType="ToggleButton">
+                                        <ContentPresenter />
+                                    </ControlTemplate>
+                                </ToggleButton.Template>
+                                <Grid>
+                                    <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                                                         CornerRadius="0, 2.75, 2.75, 0"
+                                                         RenderNormal="False"
+                                                         RenderChecked="{TemplateBinding IsOpen}"
+                                                         RenderEnabled="{TemplateBinding IsEnabled}"
+											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											             RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}" />
+                                    <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                        <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
+                                    </Grid>
                                 </Grid>
-                            </Border>
-                        </Border>
+                            </ToggleButton>
+                        </Grid>
 
                         <Popup x:Name="PART_Popup" 
                                HorizontalOffset="1"
-                               VerticalOffset="-1"
+                               VerticalOffset="1"
                                AllowsTransparency="True"
                                StaysOpen="False"
                                Placement="Bottom"
@@ -1247,9 +1202,6 @@
                         </Popup>
 
                     </Grid>
-                    <ControlTemplate.Triggers>
-                        
-                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -1301,6 +1253,16 @@
         <GradientStop Color="#90CBEB" Offset="1"/>
     </LinearGradientBrush>
 
+    <!-- Focused -->
+    <SolidColorBrush x:Key="ControlOuterBorder_Focused" Color="#FF707070" />
+    <SolidColorBrush x:Key="ControlInnerBorder_Focused" Color="#F900CCFF" />
+    <LinearGradientBrush x:Key="ControlBackground_Focused" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEAF6FD" Offset="0"/>
+        <GradientStop Color="#FFD9F0FC" Offset="0.50"/>
+        <GradientStop Color="#FFBEE6FD" Offset="0.50"/>
+        <GradientStop Color="#FFA7D9F5" Offset="1"/>
+    </LinearGradientBrush>
+
     <!-- Disabled -->
     <SolidColorBrush x:Key="ControlOuterBorder_Disabled" Color="#ADB2B5" />
     <LinearGradientBrush x:Key="ControlInnerBorder_Disabled" EndPoint="0,1" StartPoint="0,0">
@@ -1309,78 +1271,6 @@
     </LinearGradientBrush>
     <SolidColorBrush x:Key="ControlBackground_Disabled" Color="#F4F4F4" />
 
-
-
-    <!-- MouseOver Checked -->
-    <!--<LinearGradientBrush x:Key="ControlOuterBorder_MouseOverChecked" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FF282828"/>
-        <GradientStop Color="#FF5F5F5F" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlInnerBorder_MouseOverChecked" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFB69A78"/>
-        <GradientStop Color="#FFFFE17A" Offset="0.169"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlBackground_MouseOverChecked" EndPoint="0.5,1"
-			StartPoint="0.5,0">
-        <GradientStop Color="#FFFFE8AB" Offset="0" />
-        <GradientStop Color="#FFFFE08F" Offset="0.5" />
-        <GradientStop Color="#FFFEAF27" Offset="0.5" />
-        <GradientStop Color="#FFFFE74E" Offset="1" />
-    </LinearGradientBrush>-->
-
-    <!-- Active -->
-    <!--<SolidColorBrush x:Key="ControlOuterBorder_Active" Color="#FFFFC92B" />
-    <SolidColorBrush x:Key="ControlInnerBorder_Active" Color="#FFFFFFFF" />
-    <LinearGradientBrush x:Key="ControlBackground_Active" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFFFFEF3"/>
-        <GradientStop Color="#FFFAF0AF" Offset="1"/>
-    </LinearGradientBrush>-->
-
-    <!-- Focused -->
-    <!--<SolidColorBrush x:Key="ControlOuterBorder_Focused" Color="#FFFFC92B" />
-    <SolidColorBrush x:Key="ControlInnerBorder_Focused" Color="Transparent" />
-    <SolidColorBrush x:Key="ControlBackground_Focused" Color="Transparent" />-->
-
-    <!-- Disabled Checked -->
-    <!--<LinearGradientBrush x:Key="ControlOuterBorder_DisabledChecked" EndPoint="0.5,1"
-			StartPoint="0.5,0">
-        <GradientStop Color="#FF282828" />
-        <GradientStop Color="#FF5F5F5F" Offset="1" />
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlInnerBorder_DisabledChecked" EndPoint="0.5,1"
-			StartPoint="0.5,0">
-        <GradientStop Color="#FFB69A78" />
-        <GradientStop Color="#FFFFE17A" Offset="0.126" />
-    </LinearGradientBrush>
-    <SolidColorBrush x:Key="ControlBackground_DisabledChecked" Color="#FFE2F0FD" />-->
-
-    <!-- Checked -->
-    <!--<SolidColorBrush x:Key="ControlOuterBorder_Checked" Color="#FFFFC92B" />
-    <SolidColorBrush x:Key="ControlInnerBorder_Checked" Color="#FFFFFFFF" />
-    <LinearGradientBrush x:Key="ControlBackground_Checked" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFFFDCAB" Offset="0" />
-        <GradientStop Color="#FFFFD18F" Offset="0.5" />
-        <GradientStop Color="#FFFE9227" Offset="0.5" />
-        <GradientStop Color="#FFFFD74E" Offset="1" />
-    </LinearGradientBrush>-->
-
-    <!-- Highlighted -->
-    <!--<SolidColorBrush x:Key="ControlOuterBorder_Highlighted" Color="#FFFFC92B" />
-    <SolidColorBrush x:Key="ControlInnerBorder_Highlighted" Color="#FFFFFFFF" />
-    <LinearGradientBrush x:Key="ControlBackground_Highlighted" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFFFFBA3" Offset="1"/>
-        <GradientStop Color="#FFFFFBDA" Offset="0"/>
-    </LinearGradientBrush>-->
-
-    <!-- Selected -->
-    <!--<SolidColorBrush x:Key="ControlOuterBorder_Selected" Color="#FFFFC92B" />
-    <SolidColorBrush x:Key="ControlInnerBorder_Selected" Color="#FFFFFFFF" />
-    <LinearGradientBrush x:Key="ControlBackground_Selected" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFFCE79F" Offset="1"/>
-        <GradientStop Color="#FFFDD3A8"/>
-    </LinearGradientBrush>-->
-
-
     <Style TargetType="{x:Type chrome:ButtonChrome}">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -1399,10 +1289,6 @@
                             <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Normal}" />
                         </Border>
 
-                        <!--<Border x:Name="ActiveVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{StaticResource ControlOuterBorder_Active}" Background="{StaticResource ControlBackground_Active}">
-                            <Border x:Name="ActiveInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Active}" />
-                        </Border>-->
-
                         <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{StaticResource ControlOuterBorder_MouseOver}" Background="{StaticResource ControlBackground_MouseOver}">
                             <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_MouseOver}" />
                         </Border>
@@ -1410,35 +1296,23 @@
                             <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Pressed}" />
                         </Border>
 
-                        <!--<Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{StaticResource ControlOuterBorder_Focused}" Background="{StaticResource ControlBackground_Focused}">
-                            <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Focused}"/>
-                        </Border>-->
+                        <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{StaticResource ControlOuterBorder_Focused}" Background="{StaticResource ControlBackground_Focused}">
+                            <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Focused}" />
+                        </Border>
 
                     </Grid>
                     <ControlTemplate.Triggers>
 
-                        <!-- If button is disabled and is checked -->
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="False" />
-                                <Condition Property="RenderChecked" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_DisabledChecked}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_DisabledChecked}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_DisabledChecked}" />
-                        </MultiTrigger>-->
-
                         <!-- If button is disabled, not checked, and is rendered normal -->
-                        <!--<MultiTrigger>
+                        <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="RenderEnabled" Value="False" />
                                 <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderNormal" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Disabled}" />
                             <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_Disabled}" />
                             <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_Disabled}" />
-                        </MultiTrigger>-->
+                        </MultiTrigger>
 
                         <!-- if button is enabled and pressed -->
                         <MultiTrigger>
@@ -1480,19 +1354,6 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <!-- if button is enabled, checked, the mouse is over, but it is not pressed -->
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="True" />
-                                <Condition Property="RenderMouseOver" Value="True" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_MouseOverChecked}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_MouseOverChecked}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_MouseOverChecked}" />
-                        </MultiTrigger>-->
-
                         <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -1536,20 +1397,20 @@
                         </MultiTrigger>
 
                         <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
-                        <!--<MultiTrigger>
+                        <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="RenderEnabled" Value="True" />
                                 <Condition Property="RenderChecked" Value="True" />
                                 <Condition Property="RenderMouseOver" Value="False" />
                                 <Condition Property="RenderPressed" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Checked}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_Checked}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_Checked}" />
-                        </MultiTrigger>-->
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Pressed}" />
+                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_Pressed}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_Pressed}" />
+                        </MultiTrigger>
 
                         <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
-                        <!--<MultiTrigger>
+                        <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="RenderFocused" Value="True" />
                                 <Condition Property="RenderEnabled" Value="True" />
@@ -1588,91 +1449,18 @@
                                     </Storyboard>
                                 </BeginStoryboard>
                             </MultiTrigger.ExitActions>
-                        </MultiTrigger>-->
-
-                        <!-- if the button is enabled, not checked, is active, not pressed, and the mouse is not over -->
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderActive" Value="True" />
-                                <Condition Property="RenderHighlighted" Value="False" />
-                                <Condition Property="RenderSelected" Value="False" />
-                                <Condition Property="RenderPressed" Value="False" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActiveVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ActiveVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActiveVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ActiveVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>-->
-
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderHighlighted" Value="True" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Highlighted}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_Highlighted}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_Highlighted}" />
-                        </MultiTrigger>-->
-
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderHighlighted" Value="False" />
-                                <Condition Property="RenderSelected" Value="True" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Selected}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{StaticResource ControlInnerBorder_Selected}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{StaticResource ControlBackground_Selected}" />
-                        </MultiTrigger>-->
+                        </MultiTrigger>
 
-                        <!--<MultiTrigger>
+                        <!-- if not rendered normally -->
+                        <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="RenderNormal" Value="False" />
-                                <Condition Property="RenderHighlighted" Value="False" />
-                                <Condition Property="RenderSelected" Value="False" />
                                 <Condition Property="RenderChecked" Value="False" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
                             <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
                             <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
-                        </MultiTrigger>-->
+                        </MultiTrigger>
 
                     </ControlTemplate.Triggers>
                 </ControlTemplate>