diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
index d669a3dd..aed90390 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
@@ -260,14 +260,14 @@ namespace Microsoft.Windows.Controls
             _isSyncingTextAndValueProperties = true;
 
             //this only occures when the user typed in the value
-            if (NumericUpDown.TextProperty == p)
+            if (UpDownBase<T>.TextProperty == p)
             {
-                SetValue(NumericUpDown.ValueProperty, ParseValue(newValue.ToString()));
+                SetValue(UpDownBase<T>.ValueProperty, ParseValue(newValue.ToString()));
             }
 
             //we need to update the text no matter what because the user could have used the spin buttons to change dthe value
             //or typed in the textbox so we need to reformat the entered value.
-            SetValue(NumericUpDown.TextProperty, FormatValue());
+            SetValue(UpDownBase<T>.TextProperty, FormatValue());
 
             _isSyncingTextAndValueProperties = false;
         }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index fe315047..738ae7e2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -145,7 +145,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Core\Primitives\" />
-    <Folder Include="RichTextBox\FormatToolbar\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs
new file mode 100644
index 00000000..b2c2ad99
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ButtonSpinner.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Controls.Primitives;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Represents a spinner control that includes two Buttons.
+    /// </summary>
+    [ContentProperty("Content")]
+    public class ButtonSpinner : Spinner
+    {
+        #region Properties
+
+        #region Content
+
+        /// <summary>
+        /// Identifies the Content dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(ButtonSpinner), new PropertyMetadata(null, OnContentPropertyChanged));
+        public object Content
+        {
+            get { return GetValue(ContentProperty) as object; }
+            set { SetValue(ContentProperty, value); }
+        }
+
+        /// <summary>
+        /// ContentProperty property changed handler.
+        /// </summary>
+        /// <param name="d">ButtonSpinner that changed its Content.</param>
+        /// <param name="e">Event arguments.</param>
+        private static void OnContentPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ButtonSpinner source = d as ButtonSpinner;
+            source.OnContentChanged(e.OldValue, e.NewValue);
+        }
+
+        #endregion //Content
+
+        private ButtonBase _increaseButton;
+        /// <summary>
+        /// Gets or sets the IncreaseButton template part.
+        /// </summary>
+        private ButtonBase IncreaseButton
+        {
+            get { return _increaseButton; }
+            set
+            {
+                if (_increaseButton != null)
+                {
+                    _increaseButton.Click -= OnButtonClick;
+                }
+
+                _increaseButton = value;
+
+                if (_increaseButton != null)
+                {
+                    _increaseButton.Click += OnButtonClick;
+                }
+            }
+        }
+
+
+        private ButtonBase _decreaseButton;
+        /// <summary>
+        /// Gets or sets the DecreaseButton template part.
+        /// </summary>
+        private ButtonBase DecreaseButton
+        {
+            get { return _decreaseButton; }
+            set
+            {
+                if (_decreaseButton != null)
+                {
+                    _decreaseButton.Click -= OnButtonClick;
+                }
+
+                _decreaseButton = value;
+
+                if (_decreaseButton != null)
+                {
+                    _decreaseButton.Click += OnButtonClick;
+                }
+            }
+        }
+
+        #endregion //Properties
+
+        #region Constructors
+
+        static ButtonSpinner()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonSpinner), new FrameworkPropertyMetadata(typeof(ButtonSpinner)));
+        }
+
+        #endregion //Constructors
+
+        #region Base Class Overrides
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            IncreaseButton = GetTemplateChild("IncreaseButton") as ButtonBase;
+            DecreaseButton = GetTemplateChild("DecreaseButton") as ButtonBase;
+
+            SetButtonUsage();
+        }
+
+        #endregion //Base Class Overrides
+
+        /// <summary>
+        /// Occurs when the Content property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value of the Content property.</param>
+        /// <param name="newValue">The new value of the Content property.</param>
+        protected virtual void OnContentChanged(object oldValue, object newValue) { }
+
+        /// <summary>
+        /// Handle click event of IncreaseButton and DecreaseButton template parts,
+        /// translating Click to appropriate Spin event.
+        /// </summary>
+        /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
+        /// <param name="e">Event args.</param>
+        private void OnButtonClick(object sender, RoutedEventArgs e)
+        {
+            SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
+            OnSpin(new SpinEventArgs(direction));
+        }
+
+        /// <summary>
+        /// Cancel LeftMouseButtonUp events originating from a button that has
+        /// been changed to disabled.
+        /// </summary>
+        /// <param name="e">The data for the event.</param>
+        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonUp(e);
+
+            Point mousePosition;
+            if (IncreaseButton != null && IncreaseButton.IsEnabled == false)
+            {
+                mousePosition = e.GetPosition(IncreaseButton);
+                if (mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
+                    mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight)
+                {
+                    e.Handled = true;
+                }
+            }
+
+            if (DecreaseButton != null && DecreaseButton.IsEnabled == false)
+            {
+                mousePosition = e.GetPosition(DecreaseButton);
+                if (mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
+                    mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight)
+                {
+                    e.Handled = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when valid spin direction changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected override void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue)
+        {
+            SetButtonUsage();
+        }
+
+        /// <summary>
+        /// Disables or enables the buttons based on the valid spin direction.
+        /// </summary>
+        private void SetButtonUsage()
+        {
+            // buttonspinner adds buttons that spin, so disable accordingly.
+            if (IncreaseButton != null)
+            {
+                IncreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase);
+            }
+
+            if (DecreaseButton != null)
+            {
+                DecreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease);
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs
new file mode 100644
index 00000000..aaa121fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinDirection.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Represents spin directions that could be initiated by the end-user.
+    /// </summary>
+    /// <QualityBand>Preview</QualityBand>
+    public enum SpinDirection
+    {
+        /// <summary>
+        /// Represents a spin initiated by the end-user in order to Increase a value.
+        /// </summary>
+        Increase = 0,
+
+        /// <summary>
+        /// Represents a spin initiated by the end-user in order to Decrease a value.
+        /// </summary>
+        Decrease = 1
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs
new file mode 100644
index 00000000..f8a89385
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/SpinEventArgs.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Provides data for the Spinner.Spin event.
+    /// </summary>
+    /// <QualityBand>Preview</QualityBand>
+    public class SpinEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets the SpinDirection for the spin that has been initiated by the 
+        /// end-user.
+        /// </summary>
+        public SpinDirection Direction { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the SpinEventArgs class.
+        /// </summary>
+        /// <param name="direction">Spin direction.</param>
+        public SpinEventArgs(SpinDirection direction)
+            : base()
+        {
+            Direction = direction;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs
new file mode 100644
index 00000000..20b8d1cb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Spinner.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Base class for controls that represents controls that can spin.
+    /// </summary>
+    public abstract class Spinner : Control
+    {
+        #region Properties
+
+        /// <summary>
+        /// Identifies the ValidSpinDirection dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register("ValidSpinDirection", typeof(ValidSpinDirections), typeof(Spinner), new PropertyMetadata(ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged));
+        public ValidSpinDirections ValidSpinDirection
+        {
+            get { return (ValidSpinDirections)GetValue(ValidSpinDirectionProperty); }
+            set { SetValue(ValidSpinDirectionProperty, value); }
+        }
+
+        /// <summary>
+        /// ValidSpinDirectionProperty property changed handler.
+        /// </summary>
+        /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
+        /// <param name="e">Event arguments.</param>
+        private static void OnValidSpinDirectionPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Spinner source = (Spinner)d;
+            ValidSpinDirections oldvalue = (ValidSpinDirections)e.OldValue;
+            ValidSpinDirections newvalue = (ValidSpinDirections)e.NewValue;
+            source.OnValidSpinDirectionChanged(oldvalue, newvalue);
+        }
+
+        #endregion //Properties
+
+        /// <summary>
+        /// Occurs when spinning is initiated by the end-user.
+        /// </summary>
+        public event EventHandler<SpinEventArgs> Spin;
+
+        /// <summary>
+        /// Initializes a new instance of the Spinner class.
+        /// </summary>
+        protected Spinner() { }
+
+        /// <summary>
+        /// Raises the OnSpin event when spinning is initiated by the end-user.
+        /// </summary>
+        /// <param name="e">Spin event args.</param>
+        protected virtual void OnSpin(SpinEventArgs e)
+        {
+            ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
+
+            if ((ValidSpinDirection & valid) != valid)
+            {
+                // spin is not allowed.
+                throw new InvalidOperationException("Spin action is not valid at this moment.");
+            }
+
+            EventHandler<SpinEventArgs> handler = Spin;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Called when valid spin direction changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue) { }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs
new file mode 100644
index 00000000..d744620d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/ValidSpinDirections.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Represents spin directions that are valid.
+    /// </summary>
+    [Flags]
+    public enum ValidSpinDirections
+    {
+        /// <summary>
+        /// Can not increase nor decrease.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Can increase.
+        /// </summary>
+        Increase = 1,
+
+        /// <summary>
+        /// Can decrease.
+        /// </summary>
+        Decrease = 2
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
new file mode 100644
index 00000000..263ca034
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
@@ -0,0 +1,215 @@
+using System;
+using System.Collections;
+using System.Windows.Media;
+using System.Windows.Documents;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls.Core
+{
+    /// <summary>
+    /// An adorner that can display one and only one UIElement.  
+    /// That element can be a panel, which contains multiple other elements.
+    /// The element is added to the adorner's visual and logical trees, enabling it to 
+    /// particpate in dependency property value inheritance, amongst other things.
+    /// </summary>
+    internal class UIElementAdorner<TElement>
+        : Adorner
+        where TElement : UIElement
+    {
+        #region Fields
+
+        TElement _child = null;
+        double _offsetLeft = 0;
+        double _offsetTop = 0;
+
+        #endregion // Fields
+
+        #region Constructor
+
+        /// <summary>
+        /// Constructor. 
+        /// </summary>
+        /// <param name="adornedElement">The element to which the adorner will be bound.</param>
+        public UIElementAdorner(UIElement adornedElement)
+            : base(adornedElement)
+        {
+        }
+
+        #endregion // Constructor
+
+        #region Public Interface
+
+        #region Child
+
+        /// <summary>
+        /// Gets/sets the child element hosted in the adorner.
+        /// </summary>
+        public TElement Child
+        {
+            get { return _child; }
+            set
+            {
+                if (value == _child)
+                    return;
+
+                if (_child != null)
+                {
+                    base.RemoveLogicalChild(_child);
+                    base.RemoveVisualChild(_child);
+                }
+
+                _child = value;
+
+                if (_child != null)
+                {
+                    base.AddLogicalChild(_child);
+                    base.AddVisualChild(_child);
+                }
+            }
+        }
+
+        #endregion // Child
+
+        #region GetDesiredTransform
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        /// <param name="transform"></param>
+        /// <returns></returns>
+        public override GeneralTransform GetDesiredTransform(GeneralTransform transform)
+        {
+            GeneralTransformGroup result = new GeneralTransformGroup();
+            result.Children.Add(base.GetDesiredTransform(transform));
+            result.Children.Add(new TranslateTransform(_offsetLeft, _offsetTop));
+            return result;
+        }
+
+        #endregion // GetDesiredTransform
+
+        #region OffsetLeft
+
+        /// <summary>
+        /// Gets/sets the horizontal offset of the adorner.
+        /// </summary>
+        public double OffsetLeft
+        {
+            get { return _offsetLeft; }
+            set
+            {
+                _offsetLeft = value;
+                UpdateLocation();
+            }
+        }
+
+        #endregion // OffsetLeft
+
+        #region SetOffsets
+
+        /// <summary>
+        /// Updates the location of the adorner in one atomic operation.
+        /// </summary>
+        public void SetOffsets(double left, double top)
+        {
+            _offsetLeft = left;
+            _offsetTop = top;
+            this.UpdateLocation();
+        }
+
+        #endregion // SetOffsets
+
+        #region OffsetTop
+
+        /// <summary>
+        /// Gets/sets the vertical offset of the adorner.
+        /// </summary>
+        public double OffsetTop
+        {
+            get { return _offsetTop; }
+            set
+            {
+                _offsetTop = value;
+                UpdateLocation();
+            }
+        }
+
+        #endregion // OffsetTop
+
+        #endregion // Public Interface
+
+        #region Protected Overrides
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        /// <param name="constraint"></param>
+        /// <returns></returns>
+        protected override Size MeasureOverride(Size constraint)
+        {
+            if (_child == null)
+                return base.MeasureOverride(constraint);
+
+            _child.Measure(constraint);
+            return _child.DesiredSize;
+        }
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <returns></returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (_child == null)
+                return base.ArrangeOverride(finalSize);
+
+            _child.Arrange(new Rect(finalSize));
+            return finalSize;
+        }
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        protected override IEnumerator LogicalChildren
+        {
+            get
+            {
+                ArrayList list = new ArrayList();
+                if (_child != null)
+                    list.Add(_child);
+                return list.GetEnumerator();
+            }
+        }
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        protected override Visual GetVisualChild(int index)
+        {
+            return _child;
+        }
+
+        /// <summary>
+        /// Override.
+        /// </summary>
+        protected override int VisualChildrenCount
+        {
+            get { return _child == null ? 0 : 1; }
+        }
+
+        #endregion // Protected Overrides
+
+        #region Private Helpers
+
+        void UpdateLocation()
+        {
+            AdornerLayer adornerLayer = base.Parent as AdornerLayer;
+            if (adornerLayer != null)
+                adornerLayer.Update(base.AdornedElement);
+        }
+
+        #endregion // Private Helpers
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs
new file mode 100644
index 00000000..b2b9dd9f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs
@@ -0,0 +1,187 @@
+using System;
+using System.Windows;
+using System.Globalization;
+
+namespace Microsoft.Windows.Controls
+{
+
+    public class NumericUpDown : UpDownBase<double>
+    {
+        #region Properties
+
+        #region Minimum
+
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register("Minimum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(Double.MinValue, OnMinimumPropertyChanged));
+        public double Minimum
+        {
+            get { return (double)GetValue(MinimumProperty); }
+            set { SetValue(MinimumProperty, value); }
+        }
+
+        private static void OnMinimumPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        protected virtual void OnMinimumChanged(double oldValue, double newValue)
+        {
+        }
+        #endregion Minimum
+
+        #region Maximum
+
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register("Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(Double.MaxValue, OnMaximumPropertyChanged));
+        public double Maximum
+        {
+            get { return (double)GetValue(MaximumProperty); }
+            set { SetValue(MaximumProperty, value); }
+        }
+
+        private static void OnMaximumPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        protected virtual void OnMaximumChanged(double oldValue, double newValue)
+        {
+        }
+        #endregion Maximum
+
+        #region Increment
+
+        public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register("Increment", typeof(double), typeof(NumericUpDown), new PropertyMetadata(1d, OnIncrementPropertyChanged));
+        public double Increment
+        {
+            get { return (double)GetValue(IncrementProperty); }
+            set { SetValue(IncrementProperty, value); }
+        }
+
+        private static void OnIncrementPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        protected virtual void OnIncrementChanged(double oldValue, double newValue)
+        {
+        }
+
+        #endregion
+
+        #region FormatString
+
+        public static readonly DependencyProperty StringFormatProperty = DependencyProperty.Register("FormatString", typeof(string), typeof(NumericUpDown), new PropertyMetadata("F0", OnStringFormatPropertyPropertyChanged));
+        public string FormatString
+        {
+            get { return (string)GetValue(StringFormatProperty); }
+            set { SetValue(StringFormatProperty, value); }
+        }
+
+        private static void OnStringFormatPropertyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            NumericUpDown nud = d as NumericUpDown;
+            nud.OnStringFormatChanged(e.OldValue.ToString(), e.NewValue.ToString());
+        }
+
+        protected virtual void OnStringFormatChanged(string oldValue, string newValue)
+        {
+            Text = FormatValue();
+        }
+
+        #endregion //FormatString
+
+        #endregion
+
+        #region Constructors
+
+        public NumericUpDown()
+            : base()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(NumericUpDown), new FrameworkPropertyMetadata(typeof(NumericUpDown)));
+        }
+
+        #endregion //Constructors
+
+        #region Base Class Overrides
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            SetValidSpinDirection();
+        }
+
+        protected override void OnValueChanged(RoutedPropertyChangedEventArgs<double> e)
+        {
+            SetValidSpinDirection();
+        }
+
+        protected override double ParseValue(string text)
+        {
+            NumberFormatInfo info = NumberFormatInfo.GetInstance(CultureInfo.CurrentCulture);
+            if (text.Contains(info.PercentSymbol))
+                return TryParcePercent(text, info);
+            else
+                return TryParceDouble(text, info);
+        }
+
+        protected internal override string FormatValue()
+        {
+            return Value.ToString(FormatString, CultureInfo.CurrentCulture);
+        }
+
+        protected override void OnIncrement()
+        {
+            Value = (double)((decimal)Value + (decimal)Increment);
+        }
+
+        protected override void OnDecrement()
+        {
+            Value = (double)((decimal)Value - (decimal)Increment);
+        }
+
+        #endregion //Base Class Overrides
+
+        #region Methods
+
+        /// <summary>
+        /// Sets the valid spin direction based on current value, minimum and maximum.
+        /// </summary>
+        private void SetValidSpinDirection()
+        {
+            ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+            if (Value < Maximum)
+            {
+                validDirections = validDirections | ValidSpinDirections.Increase;
+            }
+
+            if (Value > Minimum)
+            {
+                validDirections = validDirections | ValidSpinDirections.Decrease;
+            }
+
+            if (Spinner != null)
+            {
+                Spinner.ValidSpinDirection = validDirections;
+            }
+        }
+
+        private double TryParcePercent(string text, NumberFormatInfo info)
+        {
+            double result;
+            text = text.Replace(info.PercentSymbol, null);
+            result = TryParceDouble(text, info);
+            return result / 100;
+        }
+
+        private double TryParceDouble(string text, NumberFormatInfo info)
+        {
+            double result;
+            if (!double.TryParse(text, NumberStyles.Any, info, out result))
+            {
+                //an error occured now lets reset our value, text, and the text in the textbox
+                result = Value;
+                TextBox.Text = Text = FormatValue();
+            }
+            return result;
+        }
+
+        #endregion //Methods
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
index 27f007dd..ab1c805a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Windows.Controls
         #region Private Members
 
         private bool _textHasLoaded;
-        bool isInvokePending;
+        private bool isInvokePending;
 
         #endregion //Private Members
 
@@ -24,36 +24,16 @@ namespace Microsoft.Windows.Controls
         public RichTextBox(System.Windows.Documents.FlowDocument document)
             : base(document)
         {
-            
-        }  
-       
-        #endregion //Constructors
 
-        #region Properties
+        }
 
-        private ITextFormatter _textFormatter;
-        /// <summary>
-        /// The ITextFormatter the is used to format the text of the RichTextBox.
-        /// Deafult formatter is the RtfFormatter
-        /// </summary>
-        public ITextFormatter TextFormatter
-        {
-            get
-            {
-                if (_textFormatter == null)
-                    _textFormatter = new RtfFormatter(); //default is rtf
+        #endregion //Constructors
 
-                return _textFormatter;
-            }
-            set
-            {
-                _textFormatter = value;
-            }
-        }
+        #region Properties
 
         #region Text
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(RichTextBox), new FrameworkPropertyMetadata(String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback(OnTextPropertyChanged), new CoerceValueCallback(CoerceTextProperty), true, System.Windows.Data.UpdateSourceTrigger.LostFocus));
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(RichTextBox), new FrameworkPropertyMetadata(String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus));
         public string Text
         {
             get { return (string)GetValue(TextProperty); }
@@ -78,6 +58,30 @@ namespace Microsoft.Windows.Controls
 
         #endregion //Text
 
+        #region TextFormatter
+
+        private ITextFormatter _textFormatter;
+        /// <summary>
+        /// The ITextFormatter the is used to format the text of the RichTextBox.
+        /// Deafult formatter is the RtfFormatter
+        /// </summary>
+        public ITextFormatter TextFormatter
+        {
+            get
+            {
+                if (_textFormatter == null)
+                    _textFormatter = new RtfFormatter(); //default is rtf
+
+                return _textFormatter;
+            }
+            set
+            {
+                _textFormatter = value;
+            }
+        }
+
+        #endregion //TextFormatter
+
         #endregion //Properties
 
         #region Methods
@@ -112,6 +116,7 @@ namespace Microsoft.Windows.Controls
         private void RichTextBox_Loaded(object sender, RoutedEventArgs e)
         {
             Binding binding = BindingOperations.GetBinding(this, TextProperty);
+
             if (binding != null)
             {
                 if (binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus)
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
new file mode 100644
index 00000000..46c38afe
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Microsoft.Windows.Controls
+{
+    public interface IRichTextBoxFormatBar
+    {
+        /// <summary>
+        /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
+        /// </summary>
+        global::System.Windows.Controls.RichTextBox Target { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png
new file mode 100644
index 00000000..8fb36a1a
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png
new file mode 100644
index 00000000..1030a021
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png
new file mode 100644
index 00000000..8259a9e1
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png
new file mode 100644
index 00000000..c5499bce
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png
new file mode 100644
index 00000000..51dffb73
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png
new file mode 100644
index 00000000..cb8e400a
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png
new file mode 100644
index 00000000..72689482
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
new file mode 100644
index 00000000..6d919c41
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -0,0 +1,203 @@
+<UserControl x:Class="Microsoft.Windows.Controls.RichTextBoxFormatBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              Background="Transparent"
+              IsTabStop="False"
+             x:Name="_window">
+    <UserControl.Effect>
+        <DropShadowEffect BlurRadius="5" Opacity=".25" />
+    </UserControl.Effect>
+
+    <UserControl.Resources>
+
+        <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+        
+        <ControlTemplate x:Key="ThumbControlTemplate" TargetType="{x:Type Thumb}">
+            <Border Background="Transparent" Cursor="Hand" ToolTip="Click to Drag">
+                <StackPanel VerticalAlignment="Center" Width="75">
+                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5" >
+                        <Line.Stroke>
+                            <SolidColorBrush Color="Gray" />
+                        </Line.Stroke>
+                    </Line>
+                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                        <Line.Stroke>
+                            <SolidColorBrush Color="Gray" />
+                        </Line.Stroke>
+                    </Line>
+                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                        <Line.Stroke>
+                            <SolidColorBrush Color="Gray" />
+                        </Line.Stroke>
+                    </Line>
+                </StackPanel>
+            </Border>
+        </ControlTemplate>    
+
+        <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+        <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
+            <GradientStop Offset="0" Color="#FFFEFBF4" />
+            <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+            <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+            <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+            <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+            <GradientStop Offset="1" Color="#FFFFEBAA" />
+        </LinearGradientBrush>
+
+        <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+        <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
+            <GradientStop Offset="0" Color="#FFFFDCA0" />
+            <GradientStop Offset="0.18" Color="#FFFFD692" />
+            <GradientStop Offset="0.39" Color="#FFFFC45D" />
+            <GradientStop Offset="1" Color="#FFFFD178" />
+        </LinearGradientBrush>
+
+        <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+        <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
+            <GradientStop Offset="0" Color="#FFE3C085" />
+            <GradientStop Offset="0.19" Color="#FFF4CC89" />
+            <GradientStop Offset="0.36" Color="#FFF5C777" />
+            <GradientStop Offset="0.36" Color="#FFF5BB56" />
+            <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+            <GradientStop Offset="1" Color="#FFF3E28D" />
+        </LinearGradientBrush>
+
+        <Style x:Key="FormatBarToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Height" Value="22" />
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
+            <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
+            <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ToggleButton}">
+                        <Grid SnapsToDevicePixels="True">
+                            <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
+                            <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                                <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                                    <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                                        <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
+                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                           VerticalAlignment="Center"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                                    </StackPanel>
+                                </Border>
+                            </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                            </Trigger>
+
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
+                                <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
+                            </Trigger>
+
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="InnerBorder">
+                                    <Setter.Value>
+                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                            <GradientStop Color="#FFE7CBAD" Offset="0"/>
+                                            <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
+                                            <GradientStop Color="#FFFFD38C" Offset="0.36"/>
+                                            <GradientStop Color="#FFFFC75A" Offset="0.36"/>
+                                            <GradientStop Color="#FFFFEFA5" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
+                            </Trigger>
+
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsChecked" Value="True"/>
+                                    <Condition Property="IsMouseOver" Value="True"/>
+                                </MultiTrigger.Conditions>
+                                <Setter Property="Background" TargetName="MiddleBorder">
+                                    <Setter.Value>
+                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                            <GradientStop Color="#40FFFEFE" Offset="0"/>
+                                            <GradientStop Color="#40FFFEFE" Offset="0.39"/>
+                                            <GradientStop Color="#20FFCE68" Offset="0.39"/>
+                                            <GradientStop Color="#20FFCE68" Offset="0.69"/>
+                                            <GradientStop Color="#10FFFFFF" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+    </UserControl.Resources>
+
+    <Border CornerRadius="3" BorderThickness="1" BorderBrush="Gray" Background="WhiteSmoke">
+        <Grid Margin="5,0,5,5">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <Thumb x:Name="_dragWidget" Height="10" 
+                   Template="{StaticResource ThumbControlTemplate}"
+                   DragDelta="DragWidget_DragDelta"/>
+
+            <StackPanel Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+                    <ComboBox x:Name="_cmbFontFamilies" IsEditable="True" Width="110"
+                      SelectionChanged="FontFamily_SelectionChanged"/>
+                    <ComboBox x:Name="_cmbFontSizes" IsEditable="True" Width="45"
+                      SelectionChanged="FontSize_SelectionChanged"/>
+                </StackPanel>
+
+                <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+                    <ToggleButton x:Name="_btnBold" Style="{StaticResource FormatBarToggleButtonStyle}"
+                    Command="EditingCommands.ToggleBold" CommandTarget="{Binding ElementName=_window, Path=Target}">
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bold16.png" />
+                    </ToggleButton>
+                    <ToggleButton x:Name="_btnItalic" Style="{StaticResource FormatBarToggleButtonStyle}"
+                    Command="{x:Static EditingCommands.ToggleItalic}" CommandTarget="{Binding ElementName=_window, Path=Target}">
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Italic16.png" />
+                    </ToggleButton>
+                    <ToggleButton x:Name="_btnUnderline" Style="{StaticResource FormatBarToggleButtonStyle}"
+                    Command="{x:Static EditingCommands.ToggleUnderline}" CommandTarget="{Binding ElementName=_window, Path=Target}">
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Underline16.png" />
+                    </ToggleButton>
+
+                    <Separator />
+
+                    <RadioButton x:Name="_btnAlignLeft" Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.AlignLeft}"  CommandTarget="{Binding ElementName=_window, Path=Target}" >
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+                    </RadioButton>
+                    <RadioButton x:Name="_btnAlignCenter" Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.AlignCenter}"  CommandTarget="{Binding ElementName=_window, Path=Target}" >
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+                    </RadioButton>
+                    <RadioButton x:Name="_btnAlignRight" Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.AlignRight}"  CommandTarget="{Binding ElementName=_window, Path=Target}" >
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+                    </RadioButton>
+
+                </StackPanel>
+
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
new file mode 100644
index 00000000..65e78914
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Controls.Primitives;
+using Microsoft.Windows.Controls.Core;
+
+namespace Microsoft.Windows.Controls
+{
+    /// <summary>
+    /// Interaction logic for RichTextBoxFormatBar.xaml
+    /// </summary>
+    public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
+    {
+        #region Properties
+
+        #region RichTextBox
+
+        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register("Target", typeof(global::System.Windows.Controls.RichTextBox), typeof(RichTextBoxFormatBar), new PropertyMetadata(null, OnRichTextBoxPropertyChanged));
+        public global::System.Windows.Controls.RichTextBox Target
+        {
+            get { return (global::System.Windows.Controls.RichTextBox)GetValue(TargetProperty); }
+            set { SetValue(TargetProperty, value); }
+        }
+
+        private static void OnRichTextBoxPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
+            formatBar.HookupRichTextBoxEvents();
+        }
+
+        private void HookupRichTextBoxEvents()
+        {
+            Target.SelectionChanged += RichTextBox_SelectionChanged;
+        }
+
+        #endregion //RichTextBox
+
+        public static double[] FontSizes
+        {
+            get
+            {
+                return new double[] { 
+		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
+		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
+		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
+		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
+		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
+		            };
+            }
+        }
+
+        #endregion
+        
+        #region Constructors
+
+        public RichTextBoxFormatBar()
+        {
+            InitializeComponent();
+            Loaded += FormatToolbar_Loaded;
+        }
+
+        #endregion //Constructors
+
+        #region Event Hanlders
+
+        void FormatToolbar_Loaded(object sender, RoutedEventArgs e)
+        {
+            _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies;
+            _cmbFontSizes.ItemsSource = FontSizes;
+        }
+
+        private void FontFamily_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count == 0)
+                return;
+
+            FontFamily editValue = (FontFamily)e.AddedItems[0];
+            ApplyPropertyValueToSelectedText(TextElement.FontFamilyProperty, editValue);
+        }
+
+        private void FontSize_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count == 0)
+                return;
+
+            ApplyPropertyValueToSelectedText(TextElement.FontSizeProperty, e.AddedItems[0]);
+        }
+
+        void RichTextBox_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+            UpdateVisualState();
+        }
+
+        private void DragWidget_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            ProcessMove(e);
+        }
+
+        #endregion //Event Hanlders
+
+        #region Methods
+
+        private void UpdateVisualState()
+        {
+            UpdateToggleButtonState();
+            UpdateSelectedFontFamily();
+            UpdateSelectedFontSize();
+        }
+
+        private void UpdateToggleButtonState()
+        {
+            UpdateItemCheckedState(_btnBold, TextElement.FontWeightProperty, FontWeights.Bold);
+            UpdateItemCheckedState(_btnItalic, TextElement.FontStyleProperty, FontStyles.Italic);
+            UpdateItemCheckedState(_btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline);
+
+            UpdateItemCheckedState(_btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left);
+            UpdateItemCheckedState(_btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center);
+            UpdateItemCheckedState(_btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right);
+        }
+
+        void UpdateItemCheckedState(ToggleButton button, DependencyProperty formattingProperty, object expectedValue)
+        {
+            object currentValue = Target.Selection.GetPropertyValue(formattingProperty);
+            button.IsChecked = (currentValue == DependencyProperty.UnsetValue) ? false : currentValue != null && currentValue.Equals(expectedValue);
+        }
+
+        private void UpdateSelectedFontFamily()
+        {
+            object value = Target.Selection.GetPropertyValue(TextElement.FontFamilyProperty);
+            FontFamily currentFontFamily = (FontFamily)((value == DependencyProperty.UnsetValue) ? null : value);
+            if (currentFontFamily != null)
+            {
+                _cmbFontFamilies.SelectedItem = currentFontFamily;
+            }
+        }
+
+        private void UpdateSelectedFontSize()
+        {
+            object value = Target.Selection.GetPropertyValue(TextElement.FontSizeProperty);
+            _cmbFontSizes.SelectedValue = (value == DependencyProperty.UnsetValue) ? null : value;
+        }
+
+        void ApplyPropertyValueToSelectedText(DependencyProperty formattingProperty, object value)
+        {
+            if (value == null)
+                return;
+
+            Target.Selection.ApplyPropertyValue(formattingProperty, value);
+        }
+
+        private void ProcessMove(DragDeltaEventArgs e)
+        {
+            AdornerLayer layer = AdornerLayer.GetAdornerLayer(Target);
+            UIElementAdorner<Control> adorner = layer.GetAdorners(Target)[0] as UIElementAdorner<Control>;
+            adorner.SetOffsets(adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange);
+        }
+
+        #endregion //Methods
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
new file mode 100644
index 00000000..1b03394f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -0,0 +1,187 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using Microsoft.Windows.Controls.Core;
+using System.Windows.Input;
+
+namespace Microsoft.Windows.Controls
+{
+    public class RichTextBoxFormatBarManager : DependencyObject
+    {
+        #region Members
+
+        private global::System.Windows.Controls.RichTextBox _richTextBox;
+        private UIElementAdorner<Control> _adorner;
+        private IRichTextBoxFormatBar _toolbar;
+
+        #endregion //Members
+
+        #region Properties
+
+        #region FormatBar
+
+        public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached("FormatBar", typeof(IRichTextBoxFormatBar), typeof(RichTextBox), new PropertyMetadata(null, OnFormatBarPropertyChanged));
+        public static void SetFormatBar(UIElement element, IRichTextBoxFormatBar value)
+        {
+            element.SetValue(FormatBarProperty, value);
+        }
+        public static IRichTextBoxFormatBar GetFormatBar(UIElement element)
+        {
+            return (IRichTextBoxFormatBar)element.GetValue(FormatBarProperty);
+        }
+
+        private static void OnFormatBarPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
+            if (rtb == null)
+                throw new Exception("A FormatBar can only be applied to a RichTextBox.");
+
+            RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
+            manager.AttachFormatBarToRichtextBox(rtb, e.NewValue as IRichTextBoxFormatBar);
+        }
+
+        #endregion //FormatBar
+
+        bool AdornerIsVisible
+        {
+            get { return _adorner.Visibility == Visibility.Visible; }
+        }
+
+        #endregion //Properties
+
+        #region Event Handlers
+
+        void RichTextBox_MouseButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Released)
+            {
+                TextRange selectedText = new TextRange(_richTextBox.Selection.Start, _richTextBox.Selection.End);
+                if (selectedText.Text.Length > 0 && !String.IsNullOrEmpty(selectedText.Text))
+                {
+                    ShowAdorner();
+                }
+                else
+                {
+                    HideAdorner();
+                }
+            }
+
+            e.Handled = true;
+        }
+
+        void RichTextBox_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+            //if the mouse moves outside the richtextbox bounds hide the adorner
+            //though this deosn't always work, especially if the user moves the mouse very quickly.
+            //need to find a better solution, but this will work for now.
+            Point p = e.GetPosition(_richTextBox);
+            if (p.X <= 5.0 || p.X >= _richTextBox.ActualWidth - 5 || p.Y <= 3.0 || p.Y >= _richTextBox.ActualHeight - 3)
+                HideAdorner();
+        }
+
+        void RichTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
+            //so we just give it focus again and it seems to do the trick of re-highlighting it.
+            if (!_richTextBox.IsFocused)
+                _richTextBox.Focus();
+        }
+
+        #endregion //Event Handlers
+
+        #region Methods
+
+        /// <summary>
+        /// Attaches a FormatBar to a RichtextBox
+        /// </summary>
+        /// <param name="richTextBox">The RichtextBox to attach to.</param>
+        /// <param name="formatBar">The Formatbar to attach.</param>
+        private void AttachFormatBarToRichtextBox(global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar)
+        {
+            _richTextBox = richTextBox;
+            _richTextBox.PreviewMouseMove += RichTextBox_PreviewMouseMove;
+            //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
+            //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
+            //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
+            _richTextBox.AddHandler(Mouse.MouseUpEvent, new MouseButtonEventHandler(RichTextBox_MouseButtonUp), true);
+            _richTextBox.TextChanged += RichTextBox_TextChanged;
+
+            _adorner = new UIElementAdorner<Control>(_richTextBox);
+
+            formatBar.Target = _richTextBox;
+            _toolbar = formatBar;
+        }
+
+        /// <summary>
+        /// Shows the FormatBar
+        /// </summary>
+        void ShowAdorner()
+        {
+            VerifyAdornerLayer();
+
+            Control adorningEditor = _toolbar as Control;
+            _adorner.Child = adorningEditor;
+            _adorner.Visibility = Visibility.Visible;
+
+            PositionFormatBar(adorningEditor);
+        }
+
+        /// <summary>
+        /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
+        /// </summary>
+        /// <param name="adorningEditor"></param>
+        private void PositionFormatBar(Control adorningEditor)
+        {
+            Point mousePosition = Mouse.GetPosition(_richTextBox);
+
+            double left = mousePosition.X;
+            double top = (mousePosition.Y - 15) - adorningEditor.ActualHeight;
+
+            //top
+            if (top < 0)
+            {
+                top = mousePosition.Y + 10;
+            }
+
+            //right boundary
+            if (left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20)
+            {
+                left = left - (adorningEditor.ActualWidth - (_richTextBox.ActualWidth - left));
+            }
+
+            _adorner.SetOffsets(left, top);
+        }
+
+        /// <summary>
+        /// Ensures that the IRichTextFormatBar is in the adorner layer.
+        /// </summary>
+        /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
+        bool VerifyAdornerLayer()
+        {
+            if (_adorner.Parent != null)
+                return true;
+
+            AdornerLayer layer = AdornerLayer.GetAdornerLayer(_richTextBox);
+            if (layer == null)
+                return false;
+
+            layer.Add(_adorner);
+            return true;
+        }
+
+        /// <summary>
+        /// Hides the IRichTextFormatBar that is in the adornor layer.
+        /// </summary>
+        void HideAdorner()
+        {
+            if (AdornerIsVisible)
+            {
+                _adorner.Visibility = Visibility.Collapsed;
+                _adorner.Child = null;
+            }
+        }
+
+        #endregion //Methods
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
index f4db4256..7ad95cc4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -362,14 +362,14 @@
                                         <!-- Buttons -->
                                         <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
                                             <Grid x:Name="OkGrid" Visibility="Collapsed">
-                                                <Button x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" IsDefault="True">OK</Button>
+                                                <Button x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0">OK</Button>
                                             </Grid>
                                             <Grid x:Name="OkCancelGrid" Visibility="Collapsed">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="Auto"/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <Button x:Name="PART_OkButton1" MinWidth="65" Margin="6,0,0,0" IsDefault="True">OK</Button>
+                                                <Button x:Name="PART_OkButton1" MinWidth="65" Margin="6,0,0,0">OK</Button>
                                                 <Button Grid.Column="1" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0">Cancel</Button>
                                             </Grid>
                                             <Grid x:Name="YesNoGrid" Visibility="Collapsed">
@@ -377,7 +377,7 @@
                                                     <ColumnDefinition Width="Auto"/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <Button x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" IsDefault="True">Yes</Button>
+                                                <Button x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0">Yes</Button>
                                                 <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0">No</Button>
                                             </Grid>
                                             <Grid x:Name="YesNoCancelGrid" Visibility="Collapsed">
@@ -386,7 +386,7 @@
                                                     <ColumnDefinition Width="Auto"/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <Button x:Name="PART_YesButton1" MinWidth="65" Margin="6,0,0,0" IsDefault="True">Yes</Button>
+                                                <Button x:Name="PART_YesButton1" MinWidth="65" Margin="6,0,0,0">Yes</Button>
                                                 <Button Grid.Column="1" x:Name="PART_NoButton1" MinWidth="65" Margin="6,0,0,0">No</Button>
                                                 <Button Grid.Column="2" x:Name="PART_CancelButton1" MinWidth="65" Margin="6,0,0,0">Cancel</Button>
                                             </Grid>
@@ -923,4 +923,184 @@
         </Setter>
     </Style>
 
+    <!-- =============================================================================== -->
+    <!-- ButtonSpinner                                                                   -->
+    <!-- =============================================================================== -->
+
+    <SolidColorBrush x:Key="SpinButtonGlyphNormalForegroundFillKey" Color="#FF000000" />
+
+    <DataTemplate x:Key="IncreaseGlyph">
+        <Path Width="7" Height="4" Data="M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z" Fill="{StaticResource SpinButtonGlyphNormalForegroundFillKey}"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="DecreaseGlyph">
+        <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="{StaticResource SpinButtonGlyphNormalForegroundFillKey}"/>
+    </DataTemplate>
+
+    <SolidColorBrush x:Key="SpinButtonNormalOuterBorderFillKey" Color="#FFABADB3"/>
+    <LinearGradientBrush x:Key="SpinButtonNormalInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFfcfcfc"/>
+                <GradientStop Offset="0.69" Color="#FFf9f9f9"/>
+                <GradientStop Offset="0.69" Color="#FFf3f3f3"/>
+                <GradientStop Offset="1" Color="#FFf3f3f3"/>
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SpinButtonNormalCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFf2f2f2"/>
+                <GradientStop Offset="0.69" Color="#FFe8e8e8"/>
+                <GradientStop Offset="0.69" Color="#FFd1d1d1"/>
+                <GradientStop Offset="1" Color="#FFd1d1d1"/>
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <SolidColorBrush x:Key="SpinButtonHottrackOuterBorderFillKey" Color="#FF3C7FB1"/>
+    <LinearGradientBrush x:Key="SpinButtonHottrackInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFfafdfe" Offset="0" />
+                <GradientStop Color="#FFf5fbfe" Offset="0.5" />
+                <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
+                <GradientStop Color="#FFe8f5fc" Offset="1" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SpinButtonHottrackCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFeaf6fd" Offset="0" />
+                <GradientStop Color="#FFd9f0fc" Offset="0.5" />
+                <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
+                <GradientStop Color="#FFa7d9f5" Offset="1" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SpinButtonPressedOuterBorderFillKey" Color="#FF2C628B"/>
+    <LinearGradientBrush x:Key="SpinButtonPressedInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FF9eb0ba" Offset="0" />
+                <GradientStop Color="#FF9abacb" Offset="0.5" />
+                <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
+                <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
+                <GradientStop Color="#FF68b2da" Offset="1" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SpinButtonPressedCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFe5f4fc" Offset="0" />
+                <GradientStop Color="#FFc4e5f6" Offset="0.5" />
+                <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
+                <GradientStop Color="#FF68b3db" Offset="1" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <Style x:Key="SpinButtonStyle" TargetType="{x:Type RepeatButton}">
+        <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 RepeatButton}">
+                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="0">
+                        <Grid>
+                            <Border x:Name="innerBd" BorderBrush="{StaticResource SpinButtonNormalInnerBorderFillKey}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="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="IsEnabled" Value="False"/>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:ButtonSpinner}">
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush">
+            <Setter.Value>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="#FFA3AEB9" Offset="0" />
+                    <GradientStop Color="#FF8399A9" Offset="0.375" />
+                    <GradientStop Color="#FF718597" Offset="0.375" />
+                    <GradientStop Color="#FF617584" Offset="1" />
+                </LinearGradientBrush>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+                    <Grid>
+                        <Border x:Name="ElementContainer" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                            <DockPanel Focusable="False">
+                                <Grid DockPanel.Dock="Right">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="1" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+                                    <RepeatButton x:Name="IncreaseButton" SnapsToDevicePixels="True" Grid.Row="0"  Style="{StaticResource SpinButtonStyle}" ContentTemplate="{StaticResource IncreaseGlyph}" ClickMode="Press" />
+                                    <RepeatButton x:Name="DecreaseButton" SnapsToDevicePixels="True" Grid.Row="2" Style="{StaticResource SpinButtonStyle}" ContentTemplate="{StaticResource DecreaseGlyph}" ClickMode="Press" />
+                                </Grid>
+                                <ContentControl x:Name="presentationSite" Focusable="False"
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Content="{TemplateBinding Content}" />
+                            </DockPanel>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- =============================================================================== -->
+    <!-- NumericUpDown                                                                   -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:NumericUpDown}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:NumericUpDown}">
+                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False">
+                        <TextBox x:Name="Text" BorderThickness="0" 
+                                 FontFamily="{TemplateBinding FontFamily}" 
+                                 FontSize="{TemplateBinding FontSize}" 
+                                 FontStretch="{TemplateBinding FontStretch}"
+                                 FontStyle="{TemplateBinding FontStyle}" 
+                                 FontWeight="{TemplateBinding FontWeight}" 
+                                 Foreground="{TemplateBinding Foreground}" 
+                                 MinWidth="20" AcceptsReturn="False" 
+                                 TextAlignment="Right" TextWrapping="NoWrap" 
+                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </local:ButtonSpinner>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
new file mode 100644
index 00000000..aed90390
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
@@ -0,0 +1,321 @@
+using System;
+using System.Windows.Input;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls
+{
+    public abstract class UpDownBase<T> : Control
+    {
+        #region Members
+
+        /// <summary>
+        /// Name constant for Text template part.
+        /// </summary>
+        internal const string ElementTextName = "Text";
+
+        /// <summary>
+        /// Name constant for Spinner template part.
+        /// </summary>
+        internal const string ElementSpinnerName = "Spinner";
+
+        /// <summary>
+        /// Flags if the Text and Value properties are in the process of being sync'd
+        /// </summary>
+        bool _isSyncingTextAndValueProperties;
+
+        #endregion //Members
+
+        #region Properties
+
+        #region Value
+
+        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(T), typeof(UpDownBase<T>), new FrameworkPropertyMetadata(default(T), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValuePropertyChanged));
+        public virtual T Value
+        {
+            get { return (T)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpDownBase<T> udb = (UpDownBase<T>)d;
+            T oldValue = (T)e.OldValue;
+            T newValue = (T)e.NewValue;
+
+            udb.SyncTextAndValueProperties(e.Property, e.NewValue);
+
+            RoutedPropertyChangedEventArgs<T> changedArgs = new RoutedPropertyChangedEventArgs<T>(oldValue, newValue);
+            udb.OnValueChanged(changedArgs);
+        }
+
+        protected virtual void OnValueChanged(RoutedPropertyChangedEventArgs<T> e)
+        {
+            if (ValueChanged != null)
+                ValueChanged(this, e);
+        }
+
+        #endregion //Value
+
+        #region Text
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(UpDownBase<T>), new FrameworkPropertyMetadata("0", FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged));
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        private static void OnTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpDownBase<T> udb = (UpDownBase<T>)d;
+            udb.SyncTextAndValueProperties(e.Property, e.NewValue);
+        }
+
+        #endregion //Text
+
+        #region IsEditable
+
+        public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register("IsEditable", typeof(bool), typeof(UpDownBase<T>), new PropertyMetadata(true, OnIsEditablePropertyChanged));
+        public bool IsEditable
+        {
+            get { return (bool)GetValue(IsEditableProperty); }
+            set { SetValue(IsEditableProperty, value); }
+        }
+
+        private static void OnIsEditablePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpDownBase<T> source = d as UpDownBase<T>;
+            source.OnIsEditableChanged((bool)e.OldValue, (bool)e.NewValue);
+        }
+
+        protected virtual void OnIsEditableChanged(bool oldValue, bool newValue)
+        {
+            if (TextBox != null)
+                TextBox.IsReadOnly = !IsEditable;
+        }
+
+        #endregion //IsEditable
+
+        internal TextBox TextBox { get; private set; }
+
+        private Spinner _spinner;
+        internal Spinner Spinner
+        {
+            get { return _spinner; }
+            private set
+            {
+                _spinner = value;
+                _spinner.Spin += OnSpinnerSpin;
+            }
+        }
+
+        #endregion //Properties
+
+        #region Constructors
+
+        protected UpDownBase() { }
+
+        #endregion //Constructors
+
+        #region Base Class Overrides
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            TextBox = GetTemplateChild(ElementTextName) as TextBox;
+            Spinner = GetTemplateChild(ElementSpinnerName) as Spinner;
+
+            if (TextBox != null)
+                TextBox.IsReadOnly = !IsEditable;
+        }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        DoIncrement();
+                        e.Handled = true;
+                        break;
+                    }
+                case Key.Down:
+                    {
+                        DoDecrement();
+                        e.Handled = true;
+                        break;
+                    }
+                case Key.Enter:
+                    {
+                        SyncTextAndValueProperties(UpDownBase<T>.TextProperty, TextBox.Text);
+                        break;
+                    }
+            }
+        }
+
+        protected override void OnMouseWheel(MouseWheelEventArgs e)
+        {
+            base.OnMouseWheel(e);
+
+            if (!e.Handled)
+            {
+                if (e.Delta < 0)
+                {
+                    DoDecrement();
+                }
+                else if (0 < e.Delta)
+                {
+                    DoIncrement();
+                }
+
+                e.Handled = true;
+            }
+        }
+
+        #endregion //Base Class Overrides
+
+        #region Methods
+
+        #region Abstract
+
+        /// <summary>
+        /// Called by ApplyValue to parse user input.
+        /// </summary>
+        /// <param name="text">User input.</param>
+        /// <returns>Value parsed from user input.</returns>
+        protected abstract T ParseValue(string text);
+
+        /// <summary>
+        /// Renders the value property into the textbox text.
+        /// </summary>
+        /// <returns>Formatted Value.</returns>
+        protected internal abstract string FormatValue();
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+        /// </summary>
+        protected abstract void OnIncrement();
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+        /// </summary>
+        protected abstract void OnDecrement();
+
+        #endregion //Abstract
+
+        #region Protected
+
+        /// <summary>
+        /// GetValue override to return Value property as object type.
+        /// </summary>
+        /// <returns>The Value property as object type.</returns>
+        protected object GetValue()
+        {
+            return Value;
+        }
+
+        /// <summary>
+        /// SetValue override to set value to Value property.
+        /// </summary>
+        /// <param name="value">New value.</param>
+        protected void SetValue(object value)
+        {
+            Value = (T)value;
+        }
+
+        #endregion //Protected
+
+        #region Private
+
+        /// <summary>
+        /// Performs an increment if conditions allow it.
+        /// </summary>
+        private void DoDecrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease)
+            {
+                OnDecrement();
+            }
+        }
+
+        /// <summary>
+        /// Performs a decrement if conditions allow it.
+        /// </summary>
+        private void DoIncrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase)
+            {
+                OnIncrement();
+            }
+        }
+
+        protected void SyncTextAndValueProperties(DependencyProperty p, object newValue)
+        {
+            //prevents recursive syncing properties
+            if (_isSyncingTextAndValueProperties)
+                return;
+
+            _isSyncingTextAndValueProperties = true;
+
+            //this only occures when the user typed in the value
+            if (UpDownBase<T>.TextProperty == p)
+            {
+                SetValue(UpDownBase<T>.ValueProperty, ParseValue(newValue.ToString()));
+            }
+
+            //we need to update the text no matter what because the user could have used the spin buttons to change dthe value
+            //or typed in the textbox so we need to reformat the entered value.
+            SetValue(UpDownBase<T>.TextProperty, FormatValue());
+
+            _isSyncingTextAndValueProperties = false;
+        }
+
+        #endregion //Private
+
+        #region Virtual
+
+        /// <summary>
+        /// Occurs when the spinner spins.
+        /// </summary>
+        /// <param name="e">Event args.</param>
+        protected virtual void OnSpin(SpinEventArgs e)
+        {
+            if (e == null)
+                throw new ArgumentNullException("e");
+
+            if (e.Direction == SpinDirection.Increase)
+                DoIncrement();
+            else
+                DoDecrement();
+        }
+
+        #endregion //Virtual
+
+        #endregion //Methods
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Event handler for Spinner template part's Spin event.
+        /// </summary>
+        /// <param name="sender">The Spinner template part.</param>
+        /// <param name="e">Event args.</param>
+        private void OnSpinnerSpin(object sender, SpinEventArgs e)
+        {
+            OnSpin(e);
+        }
+
+        #endregion //Event Handlers
+
+        #region Events
+
+        /// <summary>
+        /// Occurs when Value property has changed.
+        /// </summary>
+        public event RoutedPropertyChangedEventHandler<T> ValueChanged;
+
+        #endregion //Events
+    }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index 9b450cc2..bd366366 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -52,6 +52,10 @@
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -59,6 +63,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BusyIndicator\BusyIndicator.cs" />
+    <Compile Include="ButtonSpinner\ButtonSpinner.cs" />
+    <Compile Include="ButtonSpinner\SpinDirection.cs" />
+    <Compile Include="ButtonSpinner\SpinEventArgs.cs" />
+    <Compile Include="ButtonSpinner\Spinner.cs" />
+    <Compile Include="ButtonSpinner\ValidSpinDirections.cs" />
     <Compile Include="ChildWindow\ChildWindow.cs" />
     <Compile Include="ChildWindow\VisualStates.ChildWindow.cs" />
     <Compile Include="ChildWindow\WindowState.cs" />
@@ -66,7 +75,9 @@
     <Compile Include="ColorPicker\HsvColor.cs" />
     <Compile Include="ColorPicker\ColorUtilities.cs" />
     <Compile Include="ColorPicker\ColorSpectrumSlider.cs" />
+    <Compile Include="Core\UIElementAdorner.cs" />
     <Compile Include="MessageBox\MessageBox.cs" />
+    <Compile Include="NumericUpDown\NumericUpDown.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -81,11 +92,17 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="BusyIndicator\VisualStates.BusyIndicator.cs" />
+    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
+      <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
     <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
     <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
     <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
     <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
     <Compile Include="RichTextBox\RichTextBox.cs" />
+    <Compile Include="UpDownBase\UpDownBase.cs" />
     <Compile Include="VisualStates.cs" />
     <Compile Include="MessageBox\VisualStates.MessageBox.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -104,6 +121,18 @@
     <Resource Include="MessageBox\Icons\Question48.png" />
     <Resource Include="MessageBox\Icons\Warning48.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Core\Primitives\" />
+  </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.