diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
similarity index 95%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/UIElementAdorner.cs
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
index 7b601b47..263ca034 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
@@ -4,7 +4,7 @@ using System.Windows.Media;
 using System.Windows.Documents;
 using System.Windows;
 
-namespace Microsoft.Windows.Controls.Formatting
+namespace Microsoft.Windows.Controls.Core
 {
     /// <summary>
     /// An adorner that can display one and only one UIElement.  
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs
deleted file mode 100644
index 295e419a..00000000
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbarManager.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows;
-
-namespace Microsoft.Windows.Controls.Formatting
-{
-    internal class FormatToolbarManager
-    {
-        RichTextBox _richTextBox;
-        readonly UIElementAdorner<Control> _adorner;
-        FormatToolbar toolbar;
-
-        bool AdornerIsVisible
-        {
-            get { return _adorner.Visibility == Visibility.Visible; }
-        }
-
-        public FormatToolbarManager(RichTextBox richTextBox)
-        {
-            _richTextBox = richTextBox;
-            _adorner = new UIElementAdorner<Control>(richTextBox);
-            toolbar = new FormatToolbar(richTextBox);
-            AttachToRichtextBox();
-        }
-
-        private void AttachToRichtextBox()
-        {
-            _richTextBox.Selection.Changed += Selection_Changed;
-        }
-
-        void Selection_Changed(object sender, EventArgs e)
-        {
-            TextRange selectedText = new TextRange(_richTextBox.Selection.Start, _richTextBox.Selection.End);
-            if (selectedText.Text.Length > 0)
-            {
-                VerifyAdorner();
-            }
-            else
-            {
-                HideAdorner();
-            }
-        }
-
-        //TODO: refactor
-        void VerifyAdorner()
-        {
-            VerifyAdornerLayer();
-
-            Control adorningEditor = toolbar;
-            _adorner.Child = adorningEditor;
-            _adorner.Visibility = Visibility.Visible;
-
-            Rect wordBoundary = _richTextBox.Selection.End.GetPositionAtOffset(0, LogicalDirection.Backward).GetCharacterRect(LogicalDirection.Backward);
-
-            double left = wordBoundary.X;
-            double top = (wordBoundary.Y + wordBoundary.Height) - toolbar.ActualHeight;
-
-            //top boundary
-            if (top < 0)
-            {
-                top = wordBoundary.Y + wordBoundary.Height;
-            }
-
-            //right boundary
-            if (left + toolbar.ActualWidth > _richTextBox.ActualWidth - 20)
-            {
-                left = left - toolbar.ActualWidth;
-                top =  wordBoundary.Y + wordBoundary.Height + 5;
-            }
-
-            //bottom boundary
-            if (top + toolbar.ActualHeight > _richTextBox.ActualHeight - 20)
-            {
-                top = wordBoundary.Y - (toolbar.ActualHeight + wordBoundary.Height);
-            }
-
-            _adorner.SetOffsets(left, top);
-        }
-
-        /// <summary>
-        /// Ensures that the adorner is in the adorner layer.
-        /// </summary>
-        /// <returns>True if the adorner 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;
-        }
-
-        void HideAdorner()
-        {
-            if (this.AdornerIsVisible)
-            {
-                _adorner.Visibility = Visibility.Collapsed;
-                _adorner.Child = null;
-            }
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
index ff9c810d..c8015e32 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Threading;
-using Microsoft.Windows.Controls.Formatting;
 
 namespace Microsoft.Windows.Controls
 {
@@ -12,7 +11,6 @@ namespace Microsoft.Windows.Controls
 
         private bool _textHasLoaded;
         private bool isInvokePending;
-        private FormatToolbarManager _manager;
 
         #endregion //Private Members
 
@@ -33,28 +31,9 @@ namespace Microsoft.Windows.Controls
 
         #region Properties
 
-        #region AllowFormatting
-
-        public static readonly DependencyProperty AllowFormatingProperty = DependencyProperty.Register("AllowFormating", typeof(bool), typeof(RichTextBox), new PropertyMetadata(false, new PropertyChangedCallback(OnAllowFormatingPropertyChanged)));
-        public bool AllowFormating
-        {
-            get { return (bool)GetValue(AllowFormatingProperty); }
-            set { SetValue(AllowFormatingProperty, value); }
-        }
-
-        private static void OnAllowFormatingPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            RichTextBox rtb = (RichTextBox)d;
-
-            if ((bool)e.NewValue)
-                rtb._manager = new FormatToolbarManager(rtb);
-        }
-
-        #endregion //AllowFormatting
-
         #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); }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
new file mode 100644
index 00000000..a39f4105
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Microsoft.Windows.Controls
+{
+    public interface IRichTextBoxFormatBar
+    {
+        global::System.Windows.Controls.RichTextBox RichTextBox { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Bold16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Bold16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/CenterAlign16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Italic16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Italic16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/JustifyAlign16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/LeftAlign16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/RightAlign16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Underline16.png b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/Images/Underline16.png
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
similarity index 87%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
index 314e9102..3c793a16 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -1,7 +1,7 @@
-<UserControl x:Class="Microsoft.Windows.Controls.Formatting.FormatToolbar"
+<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"
+              Background="Transparent"
               IsTabStop="False"
              x:Name="_window">
     <UserControl.Effect>
@@ -10,12 +10,29 @@
 
     <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>
-
-        <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+        </ControlTemplate>    
 
         <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
         <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
@@ -152,30 +169,30 @@
                 <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
                     <ToggleButton x:Name="_btnBold" Style="{StaticResource FormatBarToggleButtonStyle}"
                     Command="EditingCommands.ToggleBold" CommandTarget="{Binding ElementName=_window, Path=RichTextBox}">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/Bold16.png" />
+                        <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=RichTextBox}">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/Italic16.png" />
+                        <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=RichTextBox}">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/Underline16.png" />
+                        <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=RichTextBox}" >
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/LeftAlign16.png" />
+                        <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=RichTextBox}" >
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/CenterAlign16.png" />
+                        <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=RichTextBox}" >
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBox/FormatToolbar/Images/RightAlign16.png" />
+                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
                     </RadioButton>
 
                 </StackPanel>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
similarity index 80%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
index a0cfef85..35356c8b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/FormatToolbar/FormatToolbar.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -4,23 +4,39 @@ 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.Formatting
+namespace Microsoft.Windows.Controls
 {
     /// <summary>
-    /// Interaction logic for FormatToolbar.xaml
+    /// Interaction logic for RichTextBoxFormatBar.xaml
     /// </summary>
-    public partial class FormatToolbar : UserControl
+    public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
     {
         #region Properties
 
-        public static readonly DependencyProperty RichTextBoxProperty = DependencyProperty.Register("RichTextBox", typeof(RichTextBox), typeof(FormatToolbar));
-        public RichTextBox RichTextBox
+        #region RichTextBox
+
+        public static readonly DependencyProperty RichTextBoxProperty = DependencyProperty.Register("RichTextBox", typeof(global::System.Windows.Controls.RichTextBox), typeof(RichTextBoxFormatBar), new PropertyMetadata(null, new PropertyChangedCallback(OnRichTextBoxPropertyChanged)));
+        public global::System.Windows.Controls.RichTextBox RichTextBox
         {
-            get { return (RichTextBox)GetValue(RichTextBoxProperty); }
+            get { return (global::System.Windows.Controls.RichTextBox)GetValue(RichTextBoxProperty); }
             set { SetValue(RichTextBoxProperty, value); }
         }
 
+        private static void OnRichTextBoxPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
+            formatBar.HookupRichTextBoxEvents();
+        }
+
+        private void HookupRichTextBoxEvents()
+        {
+            RichTextBox.SelectionChanged += RichTextBox_SelectionChanged;
+        }
+
+        #endregion //RichTextBox
+
         public double[] FontSizes
         {
             get
@@ -36,15 +52,13 @@ namespace Microsoft.Windows.Controls.Formatting
         }
 
         #endregion
-
+        
         #region Constructors
 
-        public FormatToolbar(RichTextBox richTextBox)
+        public RichTextBoxFormatBar()
         {
             InitializeComponent();
             Loaded += FormatToolbar_Loaded;
-            RichTextBox = richTextBox;
-            RichTextBox.SelectionChanged += RichTextBox_SelectionChanged;
         }
 
         #endregion //Constructors
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
new file mode 100644
index 00000000..18ec1824
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using Microsoft.Windows.Controls.Core;
+
+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_SelectionChanged(object sender, EventArgs e)
+        {
+            TextRange selectedText = new TextRange(_richTextBox.Selection.Start, _richTextBox.Selection.End);
+            if (selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace(selectedText.Text)) 
+            {
+                ShowAdorner();
+            }
+            else
+            {
+                HideAdorner();
+            }
+        }
+
+        #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;
+            _richTextBox.Selection.Changed += RichTextBox_SelectionChanged;
+
+            _adorner = new UIElementAdorner<Control>(_richTextBox);
+
+            formatBar.RichTextBox = _richTextBox;
+            _toolbar = formatBar;
+            
+        }
+
+        void RichTextBox_PreviewMouseMove(object sender, System.Windows.Input.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();
+        }
+
+        /// <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)
+        {
+            Rect wordBoundary = _richTextBox.Selection.End.GetPositionAtOffset(0, LogicalDirection.Backward).GetCharacterRect(LogicalDirection.Backward);
+
+            double left = wordBoundary.X;
+            double top = (wordBoundary.Y + wordBoundary.Height) - adorningEditor.ActualHeight;
+
+            //top boundary
+            if (top < 0)
+            {
+                top = wordBoundary.Y + wordBoundary.Height;
+            }
+
+            //right boundary
+            if (left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20)
+            {
+                left = left - adorningEditor.ActualWidth;
+                top = wordBoundary.Y + wordBoundary.Height + 5;
+            }
+
+            //bottom boundary
+            if (top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 20)
+            {
+                top = wordBoundary.Y - (adorningEditor.ActualHeight + wordBoundary.Height);
+            }
+
+            _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/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index ab297bae..feb35caf 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -53,9 +53,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="RichTextBox\FormatToolbar\FormatToolbar.xaml">
-      <Generator>MSBuild:Compile</Generator>
+    <Page Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -86,11 +86,12 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="BusyIndicator\VisualStates.BusyIndicator.cs" />
-    <Compile Include="RichTextBox\FormatToolbar\FormatToolbarManager.cs" />
-    <Compile Include="RichTextBox\FormatToolbar\FormatToolbar.xaml.cs">
-      <DependentUpon>FormatToolbar.xaml</DependentUpon>
+    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
+      <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
     </Compile>
-    <Compile Include="RichTextBox\FormatToolbar\UIElementAdorner.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
+    <Compile Include="Core\UIElementAdorner.cs" />
     <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
     <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
     <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
@@ -115,13 +116,28 @@
     <Resource Include="MessageBox\Icons\Warning48.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="RichTextBox\FormatToolbar\Images\Bold16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\CenterAlign16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\Italic16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\JustifyAlign16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\LeftAlign16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\RightAlign16.png" />
-    <Resource Include="RichTextBox\FormatToolbar\Images\Underline16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <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.