From 19211f3ce56f51a0952aa1c44ebd73f397a35f3f Mon Sep 17 00:00:00 2001
From: Nebuleux_cp <XceedBoucherS@users.noreply.github.com>
Date: Tue, 6 Mar 2012 20:43:15 +0000
Subject: [PATCH] Merge .NET 4.0 solution changes into .NET 3.5 solution.

---
 .../BusyIndicator/Themes/Generic.xaml         |   2 +-
 .../CalculatorUpDown/Themes/Generic.xaml      |   8 +-
 .../Chromes/Themes/Generic.xaml               | 464 ++++++++----------
 .../DateTimePicker/Themes/Generic.xaml        |  16 +-
 .../DateTimeUpDown/Themes/Generic.xaml        |  13 +-
 .../Magnifier/Themes/Generic.xaml             |  84 ++--
 .../MessageBox/Themes/Generic.xaml            |   2 +-
 .../PropertyGrid/Themes/Generic.xaml          |   6 +-
 .../SplitButton/Themes/Generic.xaml           |   3 +-
 .../TimePicker/Themes/Generic.xaml            |   5 +-
 .../WPFToolkit.Extended.csproj                |   3 +
 11 files changed, 292 insertions(+), 314 deletions(-)

diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
index 01119b0a..d73f6104 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
@@ -101,7 +101,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False"/>
                         <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}"/>
                         <ContentPresenter x:Name="busycontent">
                             <ContentPresenter.Content>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
index c5af6bee..7ed5e0ce 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -81,7 +81,7 @@
                             <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                                 <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                        Background="{TemplateBinding Background}"
+                                                        Background="Transparent"
                                                         ContextMenu="{TemplateBinding ContextMenu}"
                                                         FontFamily="{TemplateBinding FontFamily}" 
                                                         FontSize="{TemplateBinding FontSize}" 
@@ -90,8 +90,10 @@
                                                         FontWeight="{TemplateBinding FontWeight}" 
                                                         Foreground="{TemplateBinding Foreground}" 
                                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                        IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                                        MinWidth="20" AcceptsReturn="False" 
+                                                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        MinWidth="20" 
+                                                        AcceptsReturn="False"
+                                                        Padding="0"
                                                         TextAlignment="{TemplateBinding TextAlignment}"
                                                         TextWrapping="NoWrap" 
                                                         TabIndex="{TemplateBinding TabIndex}"
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
index 492e2a11..3837be05 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
@@ -1,273 +1,213 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls" >
-
-    <!-- =============================================================================== -->
-    <!-- ButtonChrome                                                                    -->
-    <!-- =============================================================================== -->
-
-    <CornerRadius x:Key="ControlOuterBorderCornerRadius">2.75</CornerRadius>
-    <CornerRadius x:Key="ControlInnerBorderCornerRadius">1.75</CornerRadius>
-
-    <!-- Normal -->
-    <SolidColorBrush x:Key="ControlOuterBorder_Normal" Color="#FF707070" />
-    <LinearGradientBrush x:Key="ControlInnerBorder_Normal" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlBackground_Normal" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#F3F3F3" Offset="0"/>
-        <GradientStop Color="#EBEBEB" Offset="0.5"/>
-        <GradientStop Color="#DDDDDD" Offset="0.5"/>
-        <GradientStop Color="#CDCDCD" Offset="1"/>
-    </LinearGradientBrush>
-
-    <!--Mouse Over-->
-    <SolidColorBrush x:Key="ControlOuterBorder_MouseOver" Color="#3C7FB1" />
-    <LinearGradientBrush x:Key="ControlInnerBorder_MouseOver" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlBackground_MouseOver" 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>
-
-    <!-- Pressed -->
-    <SolidColorBrush x:Key="ControlOuterBorder_Pressed" Color="#2C628B" />
-    <LinearGradientBrush x:Key="ControlInnerBorder_Pressed" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="ControlBackground_Pressed" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#C2E4F6" Offset="0.5"/>
-        <GradientStop Color="#ABDAF3" Offset="0.5"/>
-        <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">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-    <SolidColorBrush x:Key="ControlBackground_Disabled" Color="#F4F4F4" />
-
-    <Style TargetType="{x:Type chrome:ButtonChrome}">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Background" Value="{StaticResource ControlBackground_Normal}" />
-        <Setter Property="BorderBrush" Value="{StaticResource ControlOuterBorder_Normal}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="{StaticResource ControlOuterBorderCornerRadius}" />
-        <Setter Property="InnerCornerRadius" Value="{StaticResource ControlInnerBorderCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
-                    <Grid>
-
-                        <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                            <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{StaticResource ControlInnerBorder_Normal}" />
-                        </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>
-                        <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{StaticResource ControlOuterBorder_Pressed}" Background="{StaticResource ControlBackground_Pressed}">
-                            <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>
-
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
+
+   <!-- =============================================================================== -->
+   <!-- ButtonChrome                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type chrome:ButtonChrome}">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+               <Grid>
+
+                  <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
+                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
+                  </Border>
+                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
+                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
+                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
+                  </Border>
+
+                  <ContentPresenter Margin="{TemplateBinding Padding}"
 										  IsEnabled="{TemplateBinding IsEnabled}"
 										  Content="{TemplateBinding Content}"
 										  ContentStringFormat="{TemplateBinding ContentStringFormat}"
 										  ContentTemplate="{TemplateBinding ContentTemplate}"
 										  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
 
-                    </Grid>
-                    <ControlTemplate.Triggers>
-
-                        <!-- If button is disabled, not checked, and is rendered normal -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="False" />
-                                <Condition Property="RenderChecked" Value="False" />
-                            </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>
-
-                        <!-- if button is enabled and pressed -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderPressed" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderMouseOver" Value="True" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
-                        <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_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.Conditions>
-                                <Condition Property="RenderFocused" Value="True" />
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderPressed" Value="False" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if not rendered normally -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderNormal" 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>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+               <ControlTemplate.Triggers>
+
+                  <!-- If button is disabled, not checked, and is rendered normal -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is enabled and pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
+                  <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="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderFocused" Value="True" />
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if not rendered normally -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderNormal" 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>
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
index a3f507cc..73fe2d93 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -81,7 +81,7 @@
                                 <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                                     <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="{TemplateBinding Background}"
+                                                Background="Transparent"
                                                 FontFamily="{TemplateBinding FontFamily}" 
                                                 FontSize="{TemplateBinding FontSize}" 
                                                 FontStretch="{TemplateBinding FontStretch}"
@@ -89,8 +89,10 @@
                                                 FontWeight="{TemplateBinding FontWeight}" 
                                                 Foreground="{TemplateBinding Foreground}" 
                                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                                MinWidth="20" AcceptsReturn="False" 
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20" 
+                                                AcceptsReturn="False"
+                                                Padding="0"
                                                 TextAlignment="{TemplateBinding TextAlignment}"
                                                 TextWrapping="NoWrap" 
                                                 TabIndex="{TemplateBinding TabIndex}"
@@ -101,14 +103,18 @@
                                 <ToggleButton x:Name="_calendarToggleButton" Grid.Column="1" Background="White"
                                               IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
                                               Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
+                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
                             </Grid>
                             <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
                                 <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
                                     <StackPanel>
                                         <toolkit:Calendar x:Name="Part_Calendar" BorderThickness="0" />
                                         <local:TimePicker x:Name="Part_TimeUpDown" 
-                                                          Format="ShortTime" 
+                                                          Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                          Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                          Format="{TemplateBinding TimeFormat}"
+                                                          FormatString="{TemplateBinding TimeFormatString}"
                                                           Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
                                                           Watermark="{TemplateBinding TimeWatermark}"
                                                           WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"/>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
index 08eacb0c..c2539fb1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -1,9 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
-                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
-
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
     <DataTemplate x:Key="DefaultWatermarkTemplate">
         <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
@@ -27,7 +24,7 @@
                     <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                         <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="{TemplateBinding Background}"
+                                                Background="Transparent"
                                                 ContextMenu="{TemplateBinding ContextMenu}"
                                                 FontFamily="{TemplateBinding FontFamily}" 
                                                 FontSize="{TemplateBinding FontSize}" 
@@ -36,8 +33,10 @@
                                                 FontWeight="{TemplateBinding FontWeight}" 
                                                 Foreground="{TemplateBinding Foreground}" 
                                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                                MinWidth="20" AcceptsReturn="False" 
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
                                                 TextAlignment="{TemplateBinding TextAlignment}"
                                                 TextWrapping="NoWrap" 
                                                 TabIndex="{TemplateBinding TabIndex}"
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
index bcbf1567..f039723e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
@@ -3,37 +3,61 @@
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:magConverters="clr-namespace:Microsoft.Windows.Controls.Mag.Converters">
 
-    <!-- =============================================================================== -->
-    <!-- Magnifier                                                                       -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- Magnifier                                                                       -->
+   <!-- =============================================================================== -->
 
-    <magConverters:RadiusConverter x:Key="RadiusConverter"/>
-    <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
+   <magConverters:RadiusConverter x:Key="RadiusConverter"/>
+   <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
 
-    <Style TargetType="{x:Type local:Magnifier}">
-        <Setter Property="IsHitTestVisible" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Magnifier}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
-                        </Grid.RowDefinitions>
-                        <Ellipse Width="{Binding Path=MagnifierWidth, RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=MagnifierHeight, RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Background}"/>
-                        <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-                            <Ellipse.Fill>
-                                <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" 
-                                             ViewboxUnits="Absolute"
-                                             Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Ellipse.Fill>
-                        </Ellipse>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
+         </Grid.RowDefinitions>
+         <Ellipse Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
+                  Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}" 
+                  Fill="{TemplateBinding Background}"/>
+         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
+                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Ellipse.Fill>
+               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" 
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
+            </Ellipse.Fill>
+         </Ellipse>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Canvas Background="{TemplateBinding Background}"
+              Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
+              Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}">
+         <Rectangle Width="{Binding Path=Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                    Height="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}}"
+                    Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
+                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Rectangle.Fill>
+               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
+            </Rectangle.Fill>
+         </Rectangle>
+      </Canvas>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Magnifier}">
+      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Style.Triggers>
+         <Trigger Property="FrameType" Value="Circle">
+            <Setter Property="Template" Value="{StaticResource CircleTemplate}"/>
+         </Trigger>
+         <Trigger Property="FrameType" Value="Rectangle">
+            <Setter Property="Template" Value="{StaticResource RectangleTemplate}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
index bcc86f60..91375b76 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
@@ -259,7 +259,7 @@
                                             <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
                                             <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
                                             <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
-                                            <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" />
+                                            <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
                                         </Grid>
                                     </Grid>
                                 </Border>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
index fe9277ec..39ef11f6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
@@ -399,7 +399,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
-                                <Grid Background="#BCC7D8" Margin="4">
+                                <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
                                     <StackPanel Orientation="Horizontal" Margin="1" >
                                         <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" 
                                                      Style="{StaticResource OptionsToggleButtonStyle}" ToolTip="Categorized">
@@ -412,7 +412,7 @@
                                     </StackPanel>
                                 </Grid>
 
-                                <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1"  >
+                                <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
@@ -420,7 +420,7 @@
                                         </Grid.ColumnDefinitions>
                                         <extToolkit:WatermarkTextBox x:Name="_txtFilter" Background="Transparent" 
                                                                  Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-                                                                 Watermark="Search">
+                                                                 Watermark="{TemplateBinding FilterWatermark}">
                                             <extToolkit:WatermarkTextBox.Style>
                                                 <Style TargetType="Control">
                                                     <Setter Property="BorderThickness" Value="0" />
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
index 4c73fa89..badaf914 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
@@ -31,12 +31,13 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
         <Setter Property="Padding" Value="3"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:SplitButton}">
                     <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ControlChrome" RenderEnabled="{TemplateBinding IsEnabled}">
+                        <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
index 28844a2c..8da68dd8 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -101,7 +101,10 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" BorderThickness="1,1,0,1"  
+                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                                      BorderThickness="1,1,0,1"
+                                                      Background="{TemplateBinding Background}"
+                                                      Foreground="{TemplateBinding Foreground}"
                                                       ContextMenu="{TemplateBinding ContextMenu}"
                                                       AllowSpin="{TemplateBinding AllowSpin}"
                                                       Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index f5596be2..937d9c45 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -667,6 +667,9 @@
   <ItemGroup>
     <Resource Include="TokenizedTextBox\Images\delete8.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CollectionEditor\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.