From 0c535415fd0562b6d8d2d1c9092206f02ec6356c Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Sun, 22 Nov 2015 11:11:20 +0100
Subject: [PATCH] Fixes #192 by making Background and BorderBrush of Button and
 RibbonGroupBox styleable

---
 Fluent/Controls/Button.cs                     | 19 +++++++
 Fluent/Themes/Office2010/Controls/Button.xaml | 28 ++++++----
 .../Office2010/Controls/RibbonGroupBox.xaml   | 51 ++++++++++--------
 Fluent/Themes/Office2013/Controls/Button.xaml | 17 ++++--
 .../Office2013/Controls/RibbonGroupBox.xaml   | 52 +++++++++++--------
 Fluent/Themes/Windows8/Controls/Button.xaml   | 18 ++++---
 .../Windows8/Controls/RibbonGroupBox.xaml     | 51 +++++++++++-------
 7 files changed, 153 insertions(+), 83 deletions(-)

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/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/RibbonGroupBox.xaml b/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
index 799088b32..4c29f5316 100644
--- a/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
@@ -33,6 +33,10 @@
                 Value="85" />
         <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 +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"
@@ -269,6 +273,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -423,9 +429,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 +488,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -504,7 +513,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -716,20 +724,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 +776,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 +796,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/Button.xaml b/Fluent/Themes/Office2013/Controls/Button.xaml
index e9517412b..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">
@@ -152,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">
@@ -179,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/RibbonGroupBox.xaml b/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
index 409a23e9d..18b781447 100644
--- a/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
@@ -33,6 +33,10 @@
                 Value="85" />
         <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 +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"
@@ -269,6 +273,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -384,6 +390,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="RibbonGroupBoxControlTemplate"
                      TargetType="{x:Type Fluent:RibbonGroupBox}">
         <ControlTemplate.Resources>
@@ -401,9 +408,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 +470,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -485,7 +495,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -695,20 +704,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 +756,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 +776,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/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/RibbonGroupBox.xaml b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
index 80a77515a..ddfee2285 100644
--- a/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
+++ b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
@@ -31,6 +31,10 @@
                 Value="85" />
         <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 +60,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 +271,8 @@
                                                Focusable="False"
                                                IsTabStop="False"
                                                Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                               Background="{DynamicResource TransparentBrush}"
+                                               BorderBrush="{DynamicResource TransparentBrush}"
                                                VerticalAlignment="Bottom"
                                                Icon="{TemplateBinding LauncherIcon}"
                                                Header="{TemplateBinding LauncherText}"
@@ -388,6 +394,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+    
     <ControlTemplate x:Key="RibbonGroupBoxControlTemplate"
                      TargetType="{x:Type Fluent:RibbonGroupBox}">
         <ControlTemplate.Resources>
@@ -405,8 +412,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 +455,8 @@
                                            Focusable="False"
                                            IsTabStop="False"
                                            Template="{DynamicResource DialogLauncherButtonControlTemplate}"
+                                           Background="{DynamicResource TransparentBrush}"
+                                           BorderBrush="{DynamicResource TransparentBrush}"
                                            VerticalAlignment="Bottom"
                                            Icon="{TemplateBinding LauncherIcon}"
                                            Header="{TemplateBinding LauncherText}"
@@ -469,7 +480,6 @@
                       Margin="0"
                       Width="Auto"
                       Height="Auto"
-                      Background="#00000000"
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
                     <Fluent:TwoLineLabel HorizontalAlignment="Center"
@@ -663,20 +673,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 +725,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 +745,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>