diff --git a/Changelog.md b/Changelog.md
index 4438b45f1..a224026df 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,21 @@
 # Changelog for Fluent.Ribbon
 
+## 3.6.1
+
+- ### Bug fixes
+
+  - [#29](../../issues/29) - Backstage flicker
+  - [#112](../../issues/112) - Backstage flicker
+  - [#192](../../issues/192) - Background of RibbonGroupBox can't be set/changed
+  - [#197](../../issues/197) - Some adaptions to better align with Office 2013
+  - [#200](../../issues/200) - KeyTips in SplitButton no longer work
+  - [#201](../../issues/201) - Cannot change Fluent.Button Icon Dynamically
+  - [#202](../../issues/202) - Center the button labels in Office 2013 theme
+  - [#206](../../issues/206) - Center alignment button inside RIbbonGroupBox
+  - [#214](../../issues/214) - Assign a StringFormat binding to a RibbonGroupBox Header
+
+Commits: [v3.6.0...v3.6.1](../../compare/v3.6.0...v3.6.1)
+
 ## 3.6.0
 
 - ### Bug fixes
diff --git a/Fluent/Adorners/KeyTipAdorner.cs b/Fluent/Adorners/KeyTipAdorner.cs
index 9d129e5e6..365f72f48 100644
--- a/Fluent/Adorners/KeyTipAdorner.cs
+++ b/Fluent/Adorners/KeyTipAdorner.cs
@@ -1095,7 +1095,15 @@ protected override Visual GetVisualChild(int index)
         [Conditional("DEBUG")]
         private void Log(string format, params object[] args)
         {
-            Debug.WriteLine("[" + this.AdornedElement.GetType().Name + "] " + string.Format(format, args));
+            var name = this.AdornedElement.GetType().Name;
+
+            var headeredControl = this.AdornedElement as IHeaderedControl;
+            if (headeredControl != null)
+            {
+                name += string.Format(" ({0})", headeredControl.Header);
+            }
+
+            Debug.WriteLine("[" + name + "] " + string.Format(format, args), "KeyTipAdorner");
         }
 
         #endregion
diff --git a/Fluent/AttachedProperties/RibbonProperties.cs b/Fluent/AttachedProperties/RibbonProperties.cs
index 57adf80f2..0c93ac927 100644
--- a/Fluent/AttachedProperties/RibbonProperties.cs
+++ b/Fluent/AttachedProperties/RibbonProperties.cs
@@ -31,6 +31,9 @@ public static void SetTitleBarHeight(UIElement element, double value)
         /// <summary>
         /// Gets TitleBarHeight for element
         /// </summary>
+        [AttachedPropertyBrowsableForType(typeof(Ribbon))]
+        [AttachedPropertyBrowsableForType(typeof(RibbonTitleBar))]
+        [AttachedPropertyBrowsableForType(typeof(RibbonWindow))]
         public static double GetTitleBarHeight(UIElement element)
         {
             return (double)element.GetValue(TitleBarHeightProperty);
diff --git a/Fluent/Controls/BackstageAdorner.cs b/Fluent/Controls/BackstageAdorner.cs
index 8f6440b46..0599a5ae7 100644
--- a/Fluent/Controls/BackstageAdorner.cs
+++ b/Fluent/Controls/BackstageAdorner.cs
@@ -20,8 +20,6 @@ namespace Fluent
     /// </summary>
     internal class BackstageAdorner : Adorner
     {
-        #region Fields
-
         // Backstage
         private readonly Backstage backstage;
 
@@ -31,10 +29,6 @@ internal class BackstageAdorner : Adorner
         // Collection of visual children
         private readonly VisualCollection visualChildren;
 
-        #endregion
-
-        #region Constructors
-
         /// <summary>
         /// Constructor
         /// </summary>
@@ -82,16 +76,6 @@ public void Clear()
             this.visualChildren.Clear();
         }
 
-        #endregion
-
-        // Adorner offset from top of window
-        private double GetTopOffset()
-        {
-            var topOffset = this.backstage.TranslatePoint(new Point(0, this.backstage.ActualHeight), this.AdornedElement).Y;
-            
-            return topOffset;
-        }
-
         #region Layout & Visual Children
 
         /// <summary>
@@ -104,9 +88,7 @@ private double GetTopOffset()
         /// <returns>The actual size used</returns>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var topOffset = this.GetTopOffset();
-
-            this.backstageContent.Arrange(new Rect(0, topOffset, finalSize.Width, Math.Max(0, finalSize.Height - topOffset)));
+            this.backstageContent.Arrange(new Rect(0, 0, finalSize.Width, Math.Max(0, finalSize.Height)));
             return finalSize;
         }
 
@@ -119,10 +101,8 @@ protected override Size ArrangeOverride(Size finalSize)
         /// </returns>
         protected override Size MeasureOverride(Size constraint)
         {
-            var topOffset = this.GetTopOffset();
-
             // TODO: fix it! (below ugly workaround) in measureoverride we cannot get RenderSize, we must use DesiredSize
-            this.backstageContent.Measure(new Size(this.AdornedElement.RenderSize.Width, Math.Max(0, this.AdornedElement.RenderSize.Height - topOffset)));
+            this.backstageContent.Measure(new Size(this.AdornedElement.RenderSize.Width, Math.Max(0, this.AdornedElement.RenderSize.Height)));
             return this.AdornedElement.RenderSize;
         }
 
diff --git a/Fluent/Controls/Button.cs b/Fluent/Controls/Button.cs
index ae4d9dab9..9957f4b56 100644
--- a/Fluent/Controls/Button.cs
+++ b/Fluent/Controls/Button.cs
@@ -164,6 +164,25 @@ public bool IsDefinitive
 
         #endregion
 
+        #region CornerRadius
+
+        /// <summary>
+        /// Gets or sets the CornerRadius for the element
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)this.GetValue(CornerRadiusProperty); }
+            set { this.SetValue(CornerRadiusProperty, value); }
+        }
+
+        /// <summary>
+        /// Using a DependencyProperty as the backing store for CornerRadius.  This enables animation, styling, binding, etc...
+        /// </summary>
+        public static readonly DependencyProperty CornerRadiusProperty =
+            DependencyProperty.Register("CornerRadius", typeof(CornerRadius), typeof(Button), new PropertyMetadata(default(CornerRadius)));
+
+        #endregion CornerRadius
+
         #endregion
 
         #region Constructors
diff --git a/Fluent/Controls/RibbonGroupBox.cs b/Fluent/Controls/RibbonGroupBox.cs
index 0fff507ea..4ee381b8c 100644
--- a/Fluent/Controls/RibbonGroupBox.cs
+++ b/Fluent/Controls/RibbonGroupBox.cs
@@ -232,9 +232,9 @@ private void UpdateScalableControlSubscribing(bool registerEvents)
         /// <summary>
         /// Gets or sets group box header
         /// </summary>
-        public object Header
+        public string Header
         {
-            get { return this.GetValue(HeaderProperty); }
+            get { return (string)this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }
 
@@ -242,7 +242,14 @@ public object Header
         /// Using a DependencyProperty as the backing store for Header.  This enables animation, styling, binding, etc...
         /// </summary>
         public static readonly DependencyProperty HeaderProperty =
-            RibbonControl.HeaderProperty.AddOwner(typeof(RibbonGroupBox));
+            DependencyProperty.Register("Header", typeof(string), typeof(RibbonGroupBox), new UIPropertyMetadata());
+
+        object IHeaderedControl.Header
+        {
+            get { return this.Header; }
+
+            set { this.Header = (string)value; }
+        }
 
         #endregion
 
diff --git a/Fluent/Controls/SplitButton.cs b/Fluent/Controls/SplitButton.cs
index 36559a893..a08b7108a 100644
--- a/Fluent/Controls/SplitButton.cs
+++ b/Fluent/Controls/SplitButton.cs
@@ -40,20 +40,16 @@ protected override IEnumerator LogicalChildren
         {
             get
             {
-                if (this.Icon != null)
+                var baseEnumerator = base.LogicalChildren;
+                while (baseEnumerator.MoveNext())
                 {
-                    yield return this.Icon;
+                    yield return baseEnumerator.Current;
                 }
 
                 if (this.button != null)
                 {
                     yield return this.button;
                 }
-
-                foreach (var item in this.Items)
-                {
-                    yield return item;
-                }
             }
         }
 
diff --git a/Fluent/Converters/ObjectToImageConverter.cs b/Fluent/Converters/ObjectToImageConverter.cs
index 1045f4366..385dcdd96 100644
--- a/Fluent/Converters/ObjectToImageConverter.cs
+++ b/Fluent/Converters/ObjectToImageConverter.cs
@@ -62,7 +62,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
             var image = new Image
             {
-                Source = ExtractImage(imageSource, desiredSize)
+                // We have to use a frozen instance. Otherwise we run into trouble if the same instance is used in multiple locations.
+                // In case of BitmapImage it even gets worse when using the same Uri...
+                Source = (ImageSource)ExtractImage(imageSource, desiredSize).GetAsFrozen()
             };
 
             return image;
diff --git a/Fluent/Converters/ThicknessConverter.cs b/Fluent/Converters/ThicknessConverter.cs
index ebac62bd7..c79a7f2d3 100644
--- a/Fluent/Converters/ThicknessConverter.cs
+++ b/Fluent/Converters/ThicknessConverter.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Globalization;
+    using System.Linq;
     using System.Windows;
     using System.Windows.Data;
 
@@ -10,6 +11,8 @@
     /// </summary>
     public class ThicknessConverter : IMultiValueConverter
     {
+        private static readonly System.Windows.ThicknessConverter systemThicknessConverter = new System.Windows.ThicknessConverter();
+
         #region Implementation of IMultiValueConverter
 
         /// <summary>
@@ -21,10 +24,17 @@ public class ThicknessConverter : IMultiValueConverter
         /// <param name="values">The array of values that the source bindings in the <see cref="T:System.Windows.Data.MultiBinding"/> produces. The value <see cref="F:System.Windows.DependencyProperty.UnsetValue"/> indicates that the source binding has no value to provide for conversion.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            return new Thickness(System.Convert.ToDouble(values[0]),
-                                       System.Convert.ToDouble(values[1]),
-                                       System.Convert.ToDouble(values[2]),
-                                       System.Convert.ToDouble(values[3]));
+            if (values.Any(x => x == DependencyProperty.UnsetValue))
+            {
+                if (parameter != null)
+                {
+                    return (Thickness)systemThicknessConverter.ConvertFromString((string)parameter);
+                }
+
+                return new Thickness();
+            }
+
+            return new Thickness(System.Convert.ToDouble(values[0]), System.Convert.ToDouble(values[1]), System.Convert.ToDouble(values[2]), System.Convert.ToDouble(values[3]));
         }
 
         /// <summary>
diff --git a/Fluent/Internal/DoubleUtil.cs b/Fluent/Internal/DoubleUtil.cs
index 57113297f..87d03e438 100644
--- a/Fluent/Internal/DoubleUtil.cs
+++ b/Fluent/Internal/DoubleUtil.cs
@@ -31,11 +31,9 @@ public static bool AreClose(double value1, double value2)
             }
 
             // This computes (|value1-value2| / (|value1| + |value2| + 10.0)) &lt; DBL_EPSILON
-            double eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * DBL_EPSILON;
-            double delta = value1 - value2;
+            var eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * DBL_EPSILON;
+            var delta = value1 - value2;
             return (-eps < delta) && (eps > delta);
         }
-
-        public static readonly double Zero = 0D;
     }
 }
\ No newline at end of file
diff --git a/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml b/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml
index 5557502b3..faa777864 100644
--- a/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml
+++ b/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml
@@ -18,7 +18,6 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center" />
             <StackPanel x:Name="stackPanel1"
-                        Margin="0,-2,0,0"
                         Orientation="Horizontal"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center">
@@ -65,7 +64,7 @@
                         Value="Center" />
                 <Setter Property="Margin"
                         TargetName="stackPanel1"
-                        Value="3,-2,0,0" />
+                        Value="3,0,0,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="stackPanel1"
                         Value="Center" />
diff --git a/Fluent/Themes/Office2010/Controls/BackstageTabControl.xaml b/Fluent/Themes/Office2010/Controls/BackstageTabControl.xaml
index 00954245d..b53c34507 100644
--- a/Fluent/Themes/Office2010/Controls/BackstageTabControl.xaml
+++ b/Fluent/Themes/Office2010/Controls/BackstageTabControl.xaml
@@ -1,11 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Fluent="clr-namespace:Fluent">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Office2010\Controls\ScrollBarWhite.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Office2010\Controls\BackstageControls.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
+                    xmlns:Fluent="clr-namespace:Fluent"                    
+                    xmlns:Converters="clr-namespace:Fluent.Converters">
     <ControlTemplate x:Key="BackstageButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
         <Grid Background="#00000000">
@@ -75,6 +71,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="BackstageButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="FocusVisualStyle"
@@ -90,6 +87,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource BackstageFontBrush}" />
     </Style>
+    
     <Style TargetType="{x:Type Fluent:SeparatorTabItem}"
            x:Key="BackstageSeparatorTabItemStyle">
         <Setter Property="Template">
@@ -155,8 +153,16 @@
                        BasedOn="{StaticResource BackstageSeparatorTabItemStyle}" />
             </ResourceDictionary>
         </ControlTemplate.Resources>
-        <Grid Margin="0"
-              Background="{DynamicResource BackstageBackgroundBrush}">
+        <Grid Background="{DynamicResource BackstageBackgroundBrush}">
+            <Grid.Margin>
+                <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
+                    <Binding Source="0" />
+                    <Binding RelativeSource="{RelativeSource Self}"
+                             Path="(Fluent:RibbonProperties.TitleBarHeight)" />
+                    <Binding Source="0" />
+                    <Binding Source="0" />
+                </MultiBinding>
+            </Grid.Margin>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition MinWidth="107"
                                   Width="Auto" />
@@ -247,8 +253,11 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="BackstageStyle"
            TargetType="{x:Type Fluent:BackstageTabControl}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="True" />        
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Template"
@@ -259,5 +268,17 @@
                 Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:Backstage}}, FallbackValue=Red}" />
         <Setter Property="ItemsPanelBackground"
                 Value="{DynamicResource BackstagePanelBackgroundBrush}" />
+        <Setter Property="Margin">
+            <Setter.Value>
+                <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}"
+                              ConverterParameter="0 0 0 0">
+                    <Binding Source="0" />
+                    <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Fluent:Backstage}}"
+                             Path="ActualHeight" />
+                    <Binding Source="0" />
+                    <Binding Source="0" />
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Fluent/Themes/Office2010/Controls/Button.xaml b/Fluent/Themes/Office2010/Controls/Button.xaml
index c9defe757..d7391b65c 100644
--- a/Fluent/Themes/Office2010/Controls/Button.xaml
+++ b/Fluent/Themes/Office2010/Controls/Button.xaml
@@ -8,19 +8,19 @@
     <ControlTemplate x:Key="RibbonButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
         <Border x:Name="border"
-                BorderThickness="1"
-                CornerRadius="2"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}"
+				CornerRadius="{TemplateBinding CornerRadius}"
+				BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 Height="Auto"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Stretch">
             <Border x:Name="border1"
                     Height="Auto"
-                    BorderBrush="{DynamicResource TransparentBrush}"
-                    BorderThickness="1"
-                    CornerRadius="2"
-                    Background="{DynamicResource TransparentBrush}">
+				    CornerRadius="{TemplateBinding CornerRadius}"
+				    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
                 <Grid Height="Auto">
                     <Rectangle x:Name="rectangle"
                                StrokeThickness="0"
@@ -46,8 +46,7 @@
                                           Content="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
                                           Width="32"
                                           Margin="3,2,3,1"
-                                          SnapsToDevicePixels="True">
-                        </ContentPresenter>
+                                      SnapsToDevicePixels="True" />
                         <Fluent:TwoLineLabel x:Name="controlLabel"
                                              Text="{TemplateBinding Header}"
                                              Style="{DynamicResource TwoLineLabelStyle}"
@@ -179,6 +178,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"
@@ -189,8 +189,16 @@
                 Value="Auto" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />
         <Setter Property="SnapsToDevicePixels"
                 Value="False" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="CornerRadius"
+                Value="2" />
         <Style.Triggers>
             <Trigger Property="Size"
                      Value="Large">
diff --git a/Fluent/Themes/Office2010/Controls/Ribbon.xaml b/Fluent/Themes/Office2010/Controls/Ribbon.xaml
index f8f94e431..3a3f5739c 100644
--- a/Fluent/Themes/Office2010/Controls/Ribbon.xaml
+++ b/Fluent/Themes/Office2010/Controls/Ribbon.xaml
@@ -58,11 +58,11 @@
                                      ContextMenu="{Binding ContextMenu, ElementName=PART_LayoutRoot}">
                 <Fluent:RibbonTabControl.Margin>
                     <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
                         <Binding RelativeSource="{RelativeSource Self}"
                                  Path="(Fluent:RibbonProperties.TitleBarHeight)" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
+                        <Binding Source="0" />
                     </MultiBinding>
                 </Fluent:RibbonTabControl.Margin>
             </Fluent:RibbonTabControl>
diff --git a/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
index 799088b32..a3490b3a3 100644
--- a/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
@@ -31,8 +31,14 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />        
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />        
         <Style.Triggers>
             <Trigger Property="State"
                      Value="QuickAccess">
@@ -58,18 +64,18 @@
             <Border x:Name="PART_ButtonBorder"
                     BorderThickness="1"
                     CornerRadius="2"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     Height="Auto"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Stretch"
                     d:LayoutOverrides="Width, Height">
                 <Border x:Name="border1"
                         Height="Auto"
-                        BorderBrush="{DynamicResource TransparentBrush}"
+                        BorderBrush="{TemplateBinding Background}"
                         BorderThickness="1"
                         CornerRadius="2"
-                        Background="{DynamicResource TransparentBrush}">
+                        Background="{TemplateBinding BorderBrush}">
                     <Grid Height="Auto">
                         <Rectangle x:Name="rectangle"
                                    StrokeThickness="0"
@@ -269,6 +275,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -279,7 +287,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -423,9 +431,10 @@
         </ControlTemplate.Resources>
         <Grid x:Name="grid2"
               HorizontalAlignment="Stretch">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}" />            
 
-            <Grid Background="#00000000">
-
+            <Grid>
                 <Grid x:Name="hoverGrid"
                       Background="{DynamicResource GroupHoverBrush}"
                       HorizontalAlignment="Stretch"
@@ -481,6 +490,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -491,7 +502,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"
@@ -504,7 +515,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -716,20 +726,21 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="DialogLauncherButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
-        <Border x:Name="border"
+        <Border x:Name="outerBorder"
                 BorderThickness="1"
                 CornerRadius="1,0,0,0"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}">
-            <Border x:Name="border1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}">
+            <Border x:Name="innerBorder"
                     Width="Auto"
                     Height="Auto"
                     BorderThickness="1"
                     CornerRadius="1,0,0,0"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}">
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
                 <Image x:Name="image"
                        Height="Auto"
                        HorizontalAlignment="Center"
@@ -767,16 +778,16 @@
             <Trigger Property="IsPressed"
                      Value="True">
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedOuterBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedOuterBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedInnerBorderBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedInnerBackgroundBrush}" />
             </Trigger>
             <MultiTrigger>
@@ -787,16 +798,16 @@
                                Value="False" />
                 </MultiTrigger.Conditions>
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverOuterBackgroundBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverInnerBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverInnerBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
             </MultiTrigger>
         </ControlTemplate.Triggers>
diff --git a/Fluent/Themes/Office2013/Colors/Colors.xaml b/Fluent/Themes/Office2013/Colors/Colors.xaml
index 1c704d007..c305ad338 100644
--- a/Fluent/Themes/Office2013/Colors/Colors.xaml
+++ b/Fluent/Themes/Office2013/Colors/Colors.xaml
@@ -69,13 +69,13 @@
                      Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverOuterBorderBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
-                     Opacity="0.3" />
+                     Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverInnerBackgroundBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
                      Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverInnerBorderBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
-                     Opacity="0.3" />
+                     Opacity="0.12" />
 
     <SolidColorBrush x:Key="ButtonPressedOuterBackgroundBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
diff --git a/Fluent/Themes/Office2013/Controls/BackstageTabControl.xaml b/Fluent/Themes/Office2013/Controls/BackstageTabControl.xaml
index 857de934d..37772f1af 100644
--- a/Fluent/Themes/Office2013/Controls/BackstageTabControl.xaml
+++ b/Fluent/Themes/Office2013/Controls/BackstageTabControl.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Fluent="clr-namespace:Fluent"
-                    xmlns:Internal="clr-namespace:Fluent.Internal"
                     xmlns:Converters="clr-namespace:Fluent.Converters">
     <ControlTemplate x:Key="BackstageButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
@@ -112,11 +111,10 @@
                 Value="{DynamicResource BackstageBackButtonTemplate}" />
     </Style>
 
-
     <Style TargetType="{x:Type Fluent:SeparatorTabItem}"
            x:Key="BackstageSeparatorTabItemStyle">
         <Setter Property="Margin"
-                Value="25,10,20,10"></Setter>
+                Value="25,10,20,10" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Fluent:SeparatorTabItem}">
@@ -198,42 +196,14 @@
                 </Storyboard>
             </ResourceDictionary>
         </ControlTemplate.Resources>
-        <Grid x:Name="grid"
-              Margin="0"
-              Background="{DynamicResource BackstageBackgroundBrush}">
+        <Grid x:Name="grid">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition MinWidth="115"
                                   Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <Grid Height="Auto"
-                  Grid.Column="1">
-                <Grid.Resources>
-                    <ResourceDictionary>
-                        <Style x:Key="{x:Type Fluent:Button}"
-                               TargetType="{x:Type Fluent:Button}"
-                               BasedOn="{StaticResource BackstageButtonStyle}" />
-                    </ResourceDictionary>
-                </Grid.Resources>
-                <ContentPresenter x:Name="PART_SelectedContentHost"
-                                  HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Stretch"
-                                  Height="Auto"
-                                  Grid.Column="1"
-                                  ContentSource="SelectedContent" />
-            </Grid>
             <Grid VerticalAlignment="Stretch"
                   Background="{DynamicResource RibbonThemeColorBrush}">
-                <Grid.Margin>
-                    <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
-                        <Binding Source="{x:Static Internal:DoubleUtil.Zero}" />
-                        <Binding RelativeSource="{RelativeSource Self}"
-                                 Path="(Fluent:RibbonProperties.TitleBarHeight)"
-                                 Converter="{x:Static Converters:StaticConverters.InvertNumericConverter}" />
-                        <Binding Source="{x:Static Internal:DoubleUtil.Zero}" />
-                        <Binding Source="{x:Static Internal:DoubleUtil.Zero}" />
-                    </MultiBinding>
-                </Grid.Margin>
                 <Button x:Name="backbutton"
                         Style="{DynamicResource BackstageBackButtonStyle}"
                         Command="{x:Static Fluent:RibbonCommands.OpenBackstage}"
@@ -247,6 +217,32 @@
                 <ItemsPresenter Margin="0,69,0,0"
                                 Height="Auto" />
             </Grid>
+            <Grid Height="Auto"
+                  Grid.Column="1"
+                  Background="{DynamicResource BackstageBackgroundBrush}">
+                <Grid.Margin>
+                    <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
+                        <Binding Source="0" />
+                        <Binding RelativeSource="{RelativeSource Self}"
+                                 Path="(Fluent:RibbonProperties.TitleBarHeight)" />
+                        <Binding Source="0" />
+                        <Binding Source="0" />
+                    </MultiBinding>
+                </Grid.Margin>
+                <Grid.Resources>
+                    <ResourceDictionary>
+                        <Style x:Key="{x:Type Fluent:Button}"
+                               TargetType="{x:Type Fluent:Button}"
+                               BasedOn="{StaticResource BackstageButtonStyle}" />
+                    </ResourceDictionary>
+                </Grid.Resources>
+                <ContentPresenter x:Name="PART_SelectedContentHost"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  Height="Auto"
+                                  Grid.Column="1"
+                                  ContentSource="SelectedContent" />
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <DataTrigger Binding="{Binding IsOpen, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
@@ -274,14 +270,14 @@
 
     <Style x:Key="BackstageStyle"
            TargetType="{x:Type Fluent:BackstageTabControl}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="True" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Template"
                 Value="{DynamicResource BackstageControlTemplate}" />
         <Setter Property="FocusVisualStyle"
                 Value="{DynamicResource ControlStyleEmptyFocus}" />
-        <Setter Property="Margin"
-                Value="0,-24,0,1" />
         <Setter Property="Background"
                 Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:Backstage}}, FallbackValue=Red}" />
         <Setter Property="ItemsPanelBackground"
diff --git a/Fluent/Themes/Office2013/Controls/Button.xaml b/Fluent/Themes/Office2013/Controls/Button.xaml
index 63779fabc..b2a6dccb6 100644
--- a/Fluent/Themes/Office2013/Controls/Button.xaml
+++ b/Fluent/Themes/Office2013/Controls/Button.xaml
@@ -8,8 +8,10 @@
     <ControlTemplate x:Key="RibbonButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
         <Border x:Name="border"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}"
+				CornerRadius="{TemplateBinding CornerRadius}"
+				BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 Height="Auto"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Stretch">
@@ -31,7 +33,7 @@
                                          Style="{DynamicResource TwoLineLabelStyle}"
                                          HorizontalAlignment="Stretch"
                                          VerticalAlignment="Center"
-                                         Margin="2,-1,2,0" />
+                                         Margin="2,0,2,0" />
                 </StackPanel>
             </Grid>
         </Border>
@@ -61,7 +63,7 @@
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -79,7 +81,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="border"
                         Value="Stretch" />
@@ -141,6 +143,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"
@@ -151,8 +154,16 @@
                 Value="Auto" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />
         <Setter Property="SnapsToDevicePixels"
                 Value="False" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="CornerRadius"
+                Value="0" />
         <Style.Triggers>
             <Trigger Property="Size"
                      Value="Large">
@@ -178,9 +189,6 @@
         </Style.Triggers>
     </Style>
 
-    <Style TargetType="{x:Type Fluent:Button}"
-           BasedOn="{StaticResource RibbonButtonStyle}" />
-
     <Style x:Key="IronicallyNamedChromelessButtonStyle"
            TargetType="{x:Type Button}">
         <Setter Property="Background"
diff --git a/Fluent/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent/Themes/Office2013/Controls/DropDownButton.xaml
index 0c6a6da4f..85453b738 100644
--- a/Fluent/Themes/Office2013/Controls/DropDownButton.xaml
+++ b/Fluent/Themes/Office2013/Controls/DropDownButton.xaml
@@ -5,10 +5,6 @@
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="d">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Office2010\Controls\MenuSeparator.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
     <Style x:Key="RibbonDropDownButtonStyle"
            TargetType="{x:Type Fluent:DropDownButton}">
         <Setter Property="Template"
@@ -37,7 +33,7 @@
                 <Setter Property="Height"
                         Value="22" />
                 <Setter Property="Width"
-                        Value="31" />
+                        Value="32" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -74,7 +70,7 @@
                                              Style="{DynamicResource TwoLineLabelStyle}"
                                              HorizontalAlignment="Center"
                                              VerticalAlignment="Center"
-                                             Margin="2,-1,2,2"
+                                             Margin="2,0,2,2"
                                              HasGlyph="{TemplateBinding HasTriangle}" />
                     </StackPanel>
                 </Grid>
@@ -221,7 +217,7 @@
                         Value="1,0,0,0" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="-2,-1,2,1" />
+                        Value="-2,0,2,1" />
                 <Setter Property="Width"
                         TargetName="controlLabel"
                         Value="10" />
@@ -248,7 +244,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,1" />
                 <Setter Property="VerticalAlignment"
                         TargetName="PART_ButtonBorder"
                         Value="Stretch" />
diff --git a/Fluent/Themes/Office2013/Controls/Ribbon.xaml b/Fluent/Themes/Office2013/Controls/Ribbon.xaml
index 5d966fa72..5b8062965 100644
--- a/Fluent/Themes/Office2013/Controls/Ribbon.xaml
+++ b/Fluent/Themes/Office2013/Controls/Ribbon.xaml
@@ -42,11 +42,11 @@
                                      ContextMenu="{Binding ContextMenu, ElementName=PART_LayoutRoot}">
                 <Fluent:RibbonTabControl.Margin>
                     <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
                         <Binding RelativeSource="{RelativeSource Self}"
                                  Path="(Fluent:RibbonProperties.TitleBarHeight)" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
+                        <Binding Source="0" />
                     </MultiBinding>
                 </Fluent:RibbonTabControl.Margin>
             </Fluent:RibbonTabControl>
diff --git a/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
index 409a23e9d..bddf4cdf7 100644
--- a/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
@@ -31,8 +31,14 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />        
         <Style.Triggers>
             <Trigger Property="State"
                      Value="QuickAccess">
@@ -58,18 +64,18 @@
             <Border x:Name="PART_ButtonBorder"
                     BorderThickness="1"
                     CornerRadius="2"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     Height="Auto"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Stretch"
                     d:LayoutOverrides="Width, Height">
                 <Border x:Name="border1"
                         Height="Auto"
-                        BorderBrush="{DynamicResource TransparentBrush}"
+                        BorderBrush="{TemplateBinding Background}"
                         BorderThickness="1"
                         CornerRadius="2"
-                        Background="{DynamicResource TransparentBrush}">
+                        Background="{TemplateBinding BorderBrush}">
                     <Grid Height="Auto">
                         <Rectangle x:Name="rectangle"
                                    StrokeThickness="0"
@@ -269,6 +275,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -279,7 +287,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -384,6 +392,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="RibbonGroupBoxControlTemplate"
                      TargetType="{x:Type Fluent:RibbonGroupBox}">
         <ControlTemplate.Resources>
@@ -401,9 +410,10 @@
         </ControlTemplate.Resources>
         <Grid x:Name="grid2"
               HorizontalAlignment="Stretch">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}" />            
 
-            <Grid Background="#00000000">
-
+            <Grid>
                 <Grid x:Name="hoverGrid"
                       Background="{DynamicResource GroupHoverBrush}"
                       HorizontalAlignment="Stretch"
@@ -462,6 +472,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -472,7 +484,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"
@@ -485,7 +497,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -695,20 +706,21 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="DialogLauncherButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
-        <Border x:Name="border"
+        <Border x:Name="outerBorder"
                 BorderThickness="1"
                 CornerRadius="1,0,0,0"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}">
-            <Border x:Name="border1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}">
+            <Border x:Name="innerBorder"
                     Width="Auto"
                     Height="Auto"
                     BorderThickness="1"
                     CornerRadius="1,0,0,0"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}">
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
                 <Image x:Name="image"
                        Height="Auto"
                        HorizontalAlignment="Center"
@@ -746,16 +758,16 @@
             <Trigger Property="IsPressed"
                      Value="True">
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedOuterBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedOuterBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedInnerBorderBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedInnerBackgroundBrush}" />
             </Trigger>
             <MultiTrigger>
@@ -766,16 +778,16 @@
                                Value="False" />
                 </MultiTrigger.Conditions>
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverOuterBackgroundBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverInnerBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverInnerBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
             </MultiTrigger>
         </ControlTemplate.Triggers>
diff --git a/Fluent/Themes/Office2013/Controls/ScreenTip.xaml b/Fluent/Themes/Office2013/Controls/ScreenTip.xaml
index 7a371be02..9f766168f 100644
--- a/Fluent/Themes/Office2013/Controls/ScreenTip.xaml
+++ b/Fluent/Themes/Office2013/Controls/ScreenTip.xaml
@@ -59,7 +59,8 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Image Margin="7,5,3,7"
+                            <Image x:Name="image" 
+                                   Margin="7,5,3,7"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Top"
                                    Source="{TemplateBinding Property=Image}"
@@ -216,6 +217,12 @@
                         TargetName="imageAndTextSection"
                         Value="Collapsed" />
             </MultiTrigger>
+            <Trigger Property="Image"
+                     Value="{x:Null}">
+                <Setter Property="Visibility"
+                        TargetName="image"
+                        Value="Collapsed" />
+            </Trigger>            
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/Fluent/Themes/Office2013/Controls/SplitButton.xaml b/Fluent/Themes/Office2013/Controls/SplitButton.xaml
index 703288214..d6c237e54 100644
--- a/Fluent/Themes/Office2013/Controls/SplitButton.xaml
+++ b/Fluent/Themes/Office2013/Controls/SplitButton.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="SnapsToDevicePixels"
-                Value="True" />
+                Value="False" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
         <Style.Triggers>
@@ -34,7 +34,7 @@
                 <Setter Property="Height"
                         Value="22" />
                 <Setter Property="Width"
-                        Value="34" />
+                        Value="32" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -49,7 +49,8 @@
             <Border BorderThickness="1"
                     Name="PART_ButtonBorder"
                     BorderBrush="{DynamicResource TransparentBrush}"
-                    Background="{DynamicResource TransparentBrush}">
+                    Background="{DynamicResource TransparentBrush}"
+                    VerticalAlignment="Stretch">
                 <StackPanel Orientation="Vertical"
                             Name="stackPanel">
                     <Fluent:ToggleButton x:Name="PART_Button"
@@ -68,7 +69,7 @@
                                          IsChecked="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                          IsDefinitive="{TemplateBinding IsDefinitive}"
                                          CanAddToQuickAccessToolBar="{TemplateBinding CanAddButtonToQuickAccessToolBar}" />
-                    <Border BorderThickness="0,1,0,0"
+                    <Border BorderThickness="0,0,0,0"
                             Name="downBorder"
                             BorderBrush="{DynamicResource TransparentBrush}"
                             Background="{DynamicResource TransparentBrush}"
@@ -79,11 +80,8 @@
                                                  Style="{DynamicResource TwoLineLabelStyle}"
                                                  HorizontalAlignment="Center"
                                                  VerticalAlignment="Center"
-                                                 Margin="2,0,2,0"
+                                                 Margin="2,1,2,2"
                                                  HasGlyph="{TemplateBinding HasTriangle}" />
-                            <!--<ContentPresenter x:Name="iconImage" HorizontalAlignment="Center" 
-                                                VerticalAlignment="Center" MinWidth="10" Margin="3,2" SnapsToDevicePixels="True"
-                                                IsHitTestVisible="false" Visibility="Hidden" />-->
                         </Grid>
                     </Border>
                 </StackPanel>
@@ -230,9 +228,9 @@
                 <Setter Property="Text"
                         TargetName="controlLabel"
                         Value="" />
-                <Setter Property="Margin"
+                <Setter Property="Padding"
                         TargetName="downBorder"
-                        Value="0" />
+                        Value="1,0,0,0" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -251,9 +249,6 @@
                 <Setter Property="Text"
                         TargetName="controlLabel"
                         Value="" />
-                <Setter Property="Margin"
-                        TargetName="downBorder"
-                        Value="0" />
             </Trigger>
 
             <Trigger Property="IsButtonEnabled"
@@ -302,7 +297,7 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="BorderBrush"
                         TargetName="PART_ButtonBorder"
-                        Value="{DynamicResource ButtonHoverInnerBorderBrush}" />
+                        Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
                 <Setter Property="Background"
                         TargetName="downBorder"
                         Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
@@ -327,7 +322,7 @@
     <ControlTemplate x:Key="InnerButtonControlTemplate"
                      TargetType="{x:Type Fluent:ToggleButton}">
         <Border x:Name="border"
-                BorderThickness="1"
+                BorderThickness="0"
                 Background="{DynamicResource TransparentBrush}"
                 BorderBrush="{DynamicResource TransparentBrush}"
                 Height="Auto"
@@ -346,6 +341,7 @@
                             HorizontalAlignment="Stretch"
                             SnapsToDevicePixels="True">
                     <ContentPresenter x:Name="iconImage"
+                                      Margin="0,1,0,0"
                                       HorizontalAlignment="Center"
                                       Height="32"
                                       VerticalAlignment="Center"
@@ -428,7 +424,7 @@
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}}" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,1" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -446,7 +442,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,-1,1" />
+                        Value="2,0,-1,1" />
                 <Setter Property="VerticalAlignment"
                         TargetName="border"
                         Value="Stretch" />
diff --git a/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml b/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml
index 4f8848576..96ce6346e 100644
--- a/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml
+++ b/Fluent/Themes/Windows8/Controls/BackstageTabControl.xaml
@@ -1,11 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Fluent="clr-namespace:Fluent">
-    <ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Windows8\Controls\ScrollBarWhite.xaml" />
-		<ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Windows8\Controls\BackstageControls.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
+                    xmlns:Fluent="clr-namespace:Fluent"
+                    xmlns:Converters="clr-namespace:Fluent.Converters">
     <ControlTemplate x:Key="BackstageButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
         <Grid Background="#00000000">
@@ -75,6 +71,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="BackstageButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="FocusVisualStyle"
@@ -90,6 +87,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource BackstageFontBrush}" />
     </Style>
+    
     <Style TargetType="{x:Type Fluent:SeparatorTabItem}"
            x:Key="BackstageSeparatorTabItemStyle">
         <Setter Property="Template">
@@ -155,8 +153,16 @@
                        BasedOn="{StaticResource BackstageSeparatorTabItemStyle}" />
             </ResourceDictionary>
         </ControlTemplate.Resources>
-        <Grid Margin="0"
-              Background="{DynamicResource BackstageBackgroundBrush}">
+        <Grid Background="{DynamicResource BackstageBackgroundBrush}">
+            <Grid.Margin>
+                <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
+                    <Binding Source="0" />
+                    <Binding RelativeSource="{RelativeSource Self}"
+                             Path="(Fluent:RibbonProperties.TitleBarHeight)" />
+                    <Binding Source="0" />
+                    <Binding Source="0" />
+                </MultiBinding>
+            </Grid.Margin>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition MinWidth="107"
                                   Width="Auto" />
@@ -213,8 +219,7 @@
                         Width="6"
                         Height="Auto"
                         BorderBrush="{DynamicResource RibbonTopBorderBrush}"
-                        BorderThickness="0,0,1,0"
-                        />
+                        BorderThickness="0,0,1,0" />
                 <ItemsPresenter Margin="0,5,0,0"
                                 Height="Auto">
                 </ItemsPresenter>
@@ -223,8 +228,7 @@
                     VerticalAlignment="Top"
                     Height="1"
                     Grid.ColumnSpan="2"
-                    Background="{TemplateBinding Background}"
-                    >
+                    Background="{TemplateBinding Background}">
                 <Rectangle Stroke="{x:Null}"
                            StrokeThickness="0"
                            Fill="{DynamicResource BackstageTopBackgroundBrush}" />
@@ -247,8 +251,11 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <Style x:Key="BackstageStyle"
            TargetType="{x:Type Fluent:BackstageTabControl}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="True" />        
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Template"
@@ -259,5 +266,17 @@
                 Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:Backstage}}, FallbackValue=Red}" />
         <Setter Property="ItemsPanelBackground"
                 Value="{DynamicResource BackstagePanelBackgroundBrush}" />
+        <Setter Property="Margin">
+            <Setter.Value>
+                <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}"
+                              ConverterParameter="0 0 0 0">
+                    <Binding Source="0" />
+                    <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Fluent:Backstage}}"
+                             Path="ActualHeight" />
+                    <Binding Source="0" />
+                    <Binding Source="0" />
+                </MultiBinding>                
+            </Setter.Value>
+        </Setter>
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Fluent/Themes/Windows8/Controls/Button.xaml b/Fluent/Themes/Windows8/Controls/Button.xaml
index 03b20ff84..ced61f751 100644
--- a/Fluent/Themes/Windows8/Controls/Button.xaml
+++ b/Fluent/Themes/Windows8/Controls/Button.xaml
@@ -8,9 +8,10 @@
     <ControlTemplate x:Key="RibbonButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
         <Border x:Name="border"
+				CornerRadius="{TemplateBinding CornerRadius}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 Height="Auto"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Stretch">
@@ -26,8 +27,7 @@
                                         Content="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
                                         Width="32"
                                         Margin="3,2"
-                                        SnapsToDevicePixels="True">
-                    </ContentPresenter>
+                                        SnapsToDevicePixels="True" />
                     <Fluent:TwoLineLabel x:Name="controlLabel"
                                             Text="{TemplateBinding Header}"
                                             Style="{DynamicResource TwoLineLabelStyle}"
@@ -139,11 +139,11 @@
                         Value="{DynamicResource ButtonHoverBackgroundBrush}" />
                 <Setter Property="BorderBrush"
                         TargetName="border"
-                        Value="{DynamicResource ButtonHoverBorderBrush}" />
-                
+                        Value="{DynamicResource ButtonHoverBorderBrush}" />    
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"
@@ -154,10 +154,16 @@
                 Value="Auto" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />
         <Setter Property="SnapsToDevicePixels"
                 Value="False" />
         <Setter Property="BorderThickness"
                 Value="1" />
+        <Setter Property="CornerRadius"
+                Value="0" />
         <Style.Triggers>
             <Trigger Property="Size"
                      Value="Large">
diff --git a/Fluent/Themes/Windows8/Controls/Ribbon.xaml b/Fluent/Themes/Windows8/Controls/Ribbon.xaml
index 320957ec5..7e4cc3fc9 100644
--- a/Fluent/Themes/Windows8/Controls/Ribbon.xaml
+++ b/Fluent/Themes/Windows8/Controls/Ribbon.xaml
@@ -44,11 +44,11 @@
                                      ContextMenu="{Binding ContextMenu, ElementName=PART_LayoutRoot}">
                 <Fluent:RibbonTabControl.Margin>
                     <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
                         <Binding RelativeSource="{RelativeSource Self}"
                                  Path="(Fluent:RibbonProperties.TitleBarHeight)" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
-                        <Binding Source="{x:Static internal:DoubleUtil.Zero}" />
+                        <Binding Source="0" />
+                        <Binding Source="0" />
                     </MultiBinding>
                 </Fluent:RibbonTabControl.Margin>
             </Fluent:RibbonTabControl>
diff --git a/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
index 80a77515a..5f1d16dba 100644
--- a/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
@@ -29,8 +29,14 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource TransparentBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TransparentBrush}" />        
         <Style.Triggers>
             <Trigger Property="State"
                      Value="QuickAccess">
@@ -56,18 +62,18 @@
             <Border x:Name="PART_ButtonBorder"
                     BorderThickness="1"
                     CornerRadius="2"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     Height="Auto"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Stretch"
                     d:LayoutOverrides="Width, Height">
                 <Border x:Name="border1"
                         Height="Auto"
-                        BorderBrush="{DynamicResource TransparentBrush}"
+                        BorderBrush="{TemplateBinding Background}"
                         BorderThickness="1"
                         CornerRadius="2"
-                        Background="{DynamicResource TransparentBrush}">
+                        Background="{TemplateBinding BorderBrush}">
                     <Grid Height="Auto">
                         <Rectangle x:Name="rectangle"
                                    StrokeThickness="0"
@@ -267,6 +273,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -277,7 +285,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -388,6 +396,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="RibbonGroupBoxControlTemplate"
                      TargetType="{x:Type Fluent:RibbonGroupBox}">
         <ControlTemplate.Resources>
@@ -405,8 +414,10 @@
         </ControlTemplate.Resources>
         <Grid x:Name="grid2"
               HorizontalAlignment="Stretch">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}" />  
 
-            <Grid Background="#00000000">
+            <Grid>
 
                 <ContentControl x:Name="border1"
                                 Focusable="False">
@@ -446,6 +457,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -456,7 +469,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"
@@ -469,7 +482,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -663,20 +675,21 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="DialogLauncherButtonControlTemplate"
                      TargetType="{x:Type Fluent:Button}">
-        <Border x:Name="border"
+        <Border x:Name="outerBorder"
                 BorderThickness="1"
                 CornerRadius="1,0,0,0"
-                Background="{DynamicResource TransparentBrush}"
-                BorderBrush="{DynamicResource TransparentBrush}">
-            <Border x:Name="border1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}">
+            <Border x:Name="innerBorder"
                     Width="Auto"
                     Height="Auto"
                     BorderThickness="1"
                     CornerRadius="1,0,0,0"
-                    Background="{DynamicResource TransparentBrush}"
-                    BorderBrush="{DynamicResource TransparentBrush}">
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
                 <Image x:Name="image"
                        Height="Auto"
                        HorizontalAlignment="Center"
@@ -714,16 +727,16 @@
             <Trigger Property="IsPressed"
                      Value="True">
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonPressedBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedBorderBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonPressedBackgroundBrush}" />
             </Trigger>
             <MultiTrigger>
@@ -734,16 +747,16 @@
                                Value="False" />
                 </MultiTrigger.Conditions>
                 <Setter Property="Background"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverBackgroundBrush}" />
                 <Setter Property="Background"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverBackgroundBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border1"
+                        TargetName="innerBorder"
                         Value="{DynamicResource ButtonHoverBorderBrush}" />
                 <Setter Property="BorderBrush"
-                        TargetName="border"
+                        TargetName="outerBorder"
                         Value="{DynamicResource ButtonHoverBorderBrush}" />
             </MultiTrigger>
         </ControlTemplate.Triggers>
diff --git a/FluentTest/TestContent.xaml b/FluentTest/TestContent.xaml
index d9ba24fe6..72c802832 100644
--- a/FluentTest/TestContent.xaml
+++ b/FluentTest/TestContent.xaml
@@ -109,7 +109,8 @@
                                 <Fluent:BackstageTabItem.ContentTemplate>
                                     <DataTemplate>
                                         <Grid>
-                                            <TextBox Text="{Binding Mode=OneWay}" />
+                                            <TextBox Text="{Binding Mode=OneWay}"
+                                                     Width="6000" />
                                         </Grid>
                                     </DataTemplate>
                                 </Fluent:BackstageTabItem.ContentTemplate>
@@ -463,10 +464,9 @@
                                   IsSeparatorVisible="true"
                                   ReduceOrder="groupLL, groupLL, groupLL, (groupLL),(groupLL),(groupLL),(groupLL),(groupLL)">
                 <Fluent:RibbonGroupBox KeyTip="FG"
-                                       Header=""
+                                       Header="{Binding Path=Zoom, StringFormat='{}{0} Zoom'}"
                                        IsLauncherVisible="False"
                                        x:Name="groupLL">
-
                     <Fluent:ComboBox IsEditable="False"
                                      InputWidth="150"
                                      Header="Test"
@@ -993,8 +993,8 @@
 
                     <Fluent:DropDownButton Header="Dropdown (auto close on click)"
                                            ResizeMode="Both"
-                                           Icon="pack://application:,,,/FluentTest;component/Images/Box.png"
-                                           LargeIcon="pack://application:,,,/FluentTest;component/Images/Box.png"
+                                           Icon="pack://application:,,,/FluentTest;component/Icons/App.ico"
+                                           LargeIcon="pack://application:,,,/FluentTest;component/Icons/App.ico"
                                            ClosePopupOnMouseDown="True" ClosePopupOnMouseDownDelay="250">
                         <MenuItem Header="1" />
                         <MenuItem Header="2" />
@@ -2635,6 +2635,7 @@
                      Fluent:FrameworkHelper.UseLayoutRounding="False">
                 <Grid>
                     <Viewbox Stretch="Uniform"
+                             TextOptions.TextFormattingMode="Ideal"
                              Width="768"
                              Height="576">
                         <Canvas Width="6"
diff --git a/FluentTest/TestContent.xaml.cs b/FluentTest/TestContent.xaml.cs
index 73e1b80f7..cd7ff9b6b 100644
--- a/FluentTest/TestContent.xaml.cs
+++ b/FluentTest/TestContent.xaml.cs
@@ -395,7 +395,8 @@ private void OpenRibbonWindowWithoutVisibileRibbon_OnClick(object sender, Routed
 
         private void ZoomSlider_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            TextOptions.SetTextFormattingMode(this, e.NewValue > 1.0 ? TextFormattingMode.Ideal : TextFormattingMode.Display);
+            var textFormattingMode = e.NewValue > 1.0 || Math.Abs(e.NewValue - 1.0) < double.Epsilon ? TextFormattingMode.Ideal : TextFormattingMode.Display;
+            TextOptions.SetTextFormattingMode(this, textFormattingMode);
         }
 
         private void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
diff --git a/Shared/GlobalAssemblyInfo.cs b/Shared/GlobalAssemblyInfo.cs
index 10e63aaf5..7f7fd2643 100644
--- a/Shared/GlobalAssemblyInfo.cs
+++ b/Shared/GlobalAssemblyInfo.cs
@@ -1,11 +1,3 @@
-#region Copyright and License Information
-// Fluent Ribbon Control Suite
-// http://fluent.codeplex.com/
-// Copyright © Degtyarev Daniel, Rikker Serg. 2009-2013.  All rights reserved.
-// 
-// Distributed under the terms of the Microsoft Public License (Ms-PL). 
-// The license is available online http://fluent.codeplex.com/license
-#endregion
 using System;
 using System.Reflection;
 using System.Resources;
@@ -23,8 +15,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.6.0.0")]
-[assembly: AssemblyFileVersion("3.6.0.0")]
+[assembly: AssemblyVersion("3.6.1.0")]
+[assembly: AssemblyFileVersion("3.6.1.0")]
 [assembly: AssemblyInformationalVersion("SRC")]
 
 [assembly: ComVisible(false)]
diff --git a/appveyor.yml b/appveyor.yml
index 59dfda943..25ad2f225 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
-version: 3.6.0.{build}
+version: 3.6.1.{build}
 configuration: Release
 
 # Install scripts. (runs after repo cloning)
@@ -25,4 +25,11 @@ assembly_info:
 artifacts:
   - path: build/bin
     name: Fluent.Ribbon.$(appveyor_build_version)
-    type: zip
\ No newline at end of file
+    type: zip
+
+notifications:
+  - provider: Webhook
+    url: https://webhooks.gitter.im/e/855da764a995f5aa1a24
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: false
\ No newline at end of file