From bdd289d8eced22625b7e75cde69a4884aa91f82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 14:04:33 +0200
Subject: [PATCH 01/36] MUI colors and brushes

---
 .../Styles/Themes/GeneratorParameters.json    | 181 +++++++++++++++++-
 .../Styles/Themes/Theme.Template.xaml         | 130 +++++++++++++
 2 files changed, 308 insertions(+), 3 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index ecef8c76bd..c392d3834e 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -1,7 +1,8 @@
 {
   "TemplateFile": "Theme.Template.xaml",
   "DefaultValues": {
-    "MahApps.Colors.IdealForeground": "White"
+    "MahApps.Colors.IdealForeground": "White",
+    "MahApps.Colors.Accent.Mui": "#1ba1e2"
   },
   "BaseColorSchemes": [
     {
@@ -46,7 +47,94 @@
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FFFFFFFF",
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF666666",
-        "MahApps.Colors.Badged.DisabledBackground": "#FF666666"
+        "MahApps.Colors.Badged.DisabledBackground": "#FF666666",
+        "MahApps.Colors.WindowBackground.Mui": "#252526",
+        "MahApps.Colors.ButtonBackground.Mui": "#333333",
+        "MahApps.Colors.ButtonBackgroundHover.Mui": "#3e3e42",
+        "MahApps.Colors.ButtonBorder.Mui": "#333333",
+        "MahApps.Colors.ButtonBorderHover.Mui": "#3e3e42",
+        "MahApps.Colors.ButtonText.Mui": "#d1d1d1",
+        "MahApps.Colors.ButtonTextHover.Mui": "#d1d1d1",
+        "MahApps.Colors.ButtonTextPressed.Mui": "#d1d1d1",
+        "MahApps.Colors.ButtonTextDisabled.Mui": "#515151",
+        "MahApps.Colors.DataGridBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridForeground.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridCellBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridCellBackgroundHover.Mui": "#3e3e42",
+        "MahApps.Colors.DataGridCellForeground.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridCellForegroundHover.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridCellForegroundSelected.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridHeaderBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridHeaderBackgroundHover.Mui": "#3e3e42",
+        "MahApps.Colors.DataGridHeaderForeground.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridHeaderForegroundHover.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridHeaderForegroundPressed.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridHeaderForegroundSelected.Mui": "#d1d1d1",
+        "MahApps.Colors.DataGridGridLines.Mui": "#333333",
+        "MahApps.Colors.HyperlinkDisabled.Mui": "#717171",
+        "MahApps.Colors.InputBackground.Mui": "#333333",
+        "MahApps.Colors.InputBackgroundHover.Mui": "#3e3e42",
+        "MahApps.Colors.InputBorder.Mui": "#333333",
+        "MahApps.Colors.InputBorderHover.Mui": "#3e3e42",
+        "MahApps.Colors.InputText.Mui": "#d1d1d1",
+        "MahApps.Colors.InputTextHover.Mui": "#d1d1d1",
+        "MahApps.Colors.InputTextDisabled.Mui": "#717171",
+        "MahApps.Colors.ItemBackgroundHover.Mui": "#3e3e42",
+        "MahApps.Colors.ItemBorder.Mui": "#3e3e42",
+        "MahApps.Colors.ItemText.Mui": "#d1d1d1",
+        "MahApps.Colors.ItemTextSelected.Mui": "#d1d1d1",
+        "MahApps.Colors.ItemTextHover.Mui": "#d1d1d1",
+        "MahApps.Colors.ItemTextDisabled.Mui": "#717171",
+        "MahApps.Colors.LinkButtonText.Mui": "#717171",
+        "MahApps.Colors.LinkButtonTextHover.Mui": "#d1d1d1",
+        "MahApps.Colors.LinkButtonTextPressed.Mui": "#515151",
+        "MahApps.Colors.LinkButtonTextDisabled.Mui": "#515151",
+        "MahApps.Colors.MenuText.Mui": "#515151",
+        "MahApps.Colors.MenuTextHover.Mui": "#919191",
+        "MahApps.Colors.MenuTextSelected.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonBorder.Mui": "#919191",
+        "MahApps.Colors.ModernButtonBorderHover.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonBorderPressed.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonBorderDisabled.Mui": "#515151",
+        "MahApps.Colors.ModernButtonIconForegroundPressed.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonText.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonTextHover.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonTextPressed.Mui": "#d1d1d1",
+        "MahApps.Colors.ModernButtonTextDisabled.Mui": "#515151",
+        "MahApps.Colors.PopupBackground.Mui": "#252526",
+        "MahApps.Colors.ProgressBackground.Mui": "#333333",
+        "MahApps.Colors.ScrollBarBackground.Mui": "#333333",
+        "MahApps.Colors.ScrollBarThumbBackground.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbBackgroundDragging.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbBackgroundHover.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbBorder.Mui": "#333333",
+        "MahApps.Colors.ScrollBarThumbForeground.Mui": "#717171",
+        "MahApps.Colors.ScrollBarThumbForegroundDragging.Mui": "#d1d1d1",
+        "MahApps.Colors.ScrollBarThumbForegroundHover.Mui": "#919191",
+        "MahApps.Colors.SeparatorBackground.Mui": "#3e3e42",
+        "MahApps.Colors.SliderThumbBackground.Mui": "#717171",
+        "MahApps.Colors.SliderThumbBackgroundHover.Mui": "#919191",
+        "MahApps.Colors.SliderThumbBackgroundDisabled.Mui": "#333333",
+        "MahApps.Colors.SliderThumbBorder.Mui": "#717171",
+        "MahApps.Colors.SliderThumbBorderHover.Mui": "#919191",
+        "MahApps.Colors.SliderThumbBorderDisabled.Mui": "#333333",
+        "MahApps.Colors.SliderTrackBackground.Mui": "#333333",
+        "MahApps.Colors.SliderTrackBorder.Mui": "#333333",
+        "MahApps.Colors.SliderTick.Mui": "#717171",
+        "MahApps.Colors.SliderTickDisabled.Mui": "#333333",
+        "MahApps.Colors.SubMenuText.Mui": "#717171",
+        "MahApps.Colors.SubMenuTextHover.Mui": "#515151",
+        "MahApps.Colors.SubMenuTextSelected.Mui": "#d1d1d1",
+        "MahApps.Colors.WindowHeaderGradient.Mui": "<SolidColorBrush x:Key=\"MahApps.Brushes.WindowHeaderGradient.Mui\" Color=\"Transparent\" />",
+        "MahApps.Colors.WindowText.Mui": "#c1c1c1",
+        "MahApps.Colors.WindowTextReadOnly.Mui": "#717171",
+        "MahApps.Colors.CloseButtonBackgroundOnMoseOver.Mui": "#3e3e42",
+        "MahApps.Colors.CloseButtonForegroundOnMoseOver.Mui": "#d1d1d1",
+        "MahApps.Colors.CloseButtonBackgroundIsPressed.Mui": "#e51400",
+        "MahApps.Colors.CloseButtonForegroundIsPressed.Mui": "White",
+        "MahApps.Colors.SystemButtonBackgroundOnMoseOver.Mui": "#3e3e42",
+        "MahApps.Colors.SystemButtonForegroundOnMoseOver.Mui": "#d1d1d1",
+        "MahApps.Colors.SystemButtonForegroundIsPressed.Mui": "#d1d1d1"
       }
     },
     {
@@ -91,7 +179,94 @@
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FF000000",
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
         "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF999999",
-        "MahApps.Colors.Badged.DisabledBackground": "#FF999999"
+        "MahApps.Colors.Badged.DisabledBackground": "#FF999999",
+        "MahApps.Colors.WindowBackground.Mui": "#ffffff",
+        "MahApps.Colors.ButtonBackground.Mui": "#ffffff",
+        "MahApps.Colors.ButtonBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.ButtonBorder.Mui": "#cccccc",
+        "MahApps.Colors.ButtonBorderHover.Mui": "#cccccc",
+        "MahApps.Colors.ButtonText.Mui": "#333333",
+        "MahApps.Colors.ButtonTextHover.Mui": "#333333",
+        "MahApps.Colors.ButtonTextPressed.Mui": "#ffffff",
+        "MahApps.Colors.ButtonTextDisabled.Mui": "#a1a1a1",
+        "MahApps.Colors.DataGridBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridForeground.Mui": "#333333",
+        "MahApps.Colors.DataGridCellBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridCellBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.DataGridCellForeground.Mui": "#333333",
+        "MahApps.Colors.DataGridCellForegroundHover.Mui": "#333333",
+        "MahApps.Colors.DataGridCellForegroundSelected.Mui": "#ffffff",
+        "MahApps.Colors.DataGridHeaderBackground.Mui": "Transparent",
+        "MahApps.Colors.DataGridHeaderBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.DataGridHeaderForeground.Mui": "#333333",
+        "MahApps.Colors.DataGridHeaderForegroundHover.Mui": "#333333",
+        "MahApps.Colors.DataGridHeaderForegroundPressed.Mui": "#ffffff",
+        "MahApps.Colors.DataGridHeaderForegroundSelected.Mui": "#ffffff",
+        "MahApps.Colors.DataGridGridLines.Mui": "#cccccc",
+        "MahApps.Colors.HyperlinkDisabled.Mui": "#919191",
+        "MahApps.Colors.InputBackground.Mui": "#ffffff",
+        "MahApps.Colors.InputBackgroundHover.Mui": "#ffffff",
+        "MahApps.Colors.InputBorder.Mui": "#cccccc",
+        "MahApps.Colors.InputBorderHover.Mui": "#cccccc",
+        "MahApps.Colors.InputText.Mui": "#333333",
+        "MahApps.Colors.InputTextHover.Mui": "#333333",
+        "MahApps.Colors.InputTextDisabled.Mui": "#919191",
+        "MahApps.Colors.ItemBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.ItemBorder.Mui": "#cccccc",
+        "MahApps.Colors.ItemText.Mui": "#333333",
+        "MahApps.Colors.ItemTextSelected.Mui": "#ffffff",
+        "MahApps.Colors.ItemTextHover.Mui": "#333333",
+        "MahApps.Colors.ItemTextDisabled.Mui": "#919191",
+        "MahApps.Colors.LinkButtonText.Mui": "#717171",
+        "MahApps.Colors.LinkButtonTextHover.Mui": "#333333",
+        "MahApps.Colors.LinkButtonTextPressed.Mui": "#919191",
+        "MahApps.Colors.LinkButtonTextDisabled.Mui": "#919191",
+        "MahApps.Colors.MenuText.Mui": "#66000000",
+        "MahApps.Colors.MenuTextHover.Mui": "#bb000000",
+        "MahApps.Colors.MenuTextSelected.Mui": "#333333",
+        "MahApps.Colors.ModernButtonBorder.Mui": "#919191",
+        "MahApps.Colors.ModernButtonBorderHover.Mui": "#333333",
+        "MahApps.Colors.ModernButtonBorderPressed.Mui": "#333333",
+        "MahApps.Colors.ModernButtonBorderDisabled.Mui": "#919191",
+        "MahApps.Colors.ModernButtonIconForegroundPressed.Mui": "#ffffff",
+        "MahApps.Colors.ModernButtonText.Mui": "#333333",
+        "MahApps.Colors.ModernButtonTextHover.Mui": "#333333",
+        "MahApps.Colors.ModernButtonTextPressed.Mui": "#333333",
+        "MahApps.Colors.ModernButtonTextDisabled.Mui": "#a1a1a1",
+        "MahApps.Colors.PopupBackground.Mui": "#ffffff",
+        "MahApps.Colors.ProgressBackground.Mui": "#dddddd",
+        "MahApps.Colors.ScrollBarBackground.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbBackground.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbBackgroundDragging.Mui": "#cccccc",
+        "MahApps.Colors.ScrollBarThumbBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.ScrollBarThumbBorder.Mui": "#cccccc",
+        "MahApps.Colors.ScrollBarThumbForeground.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbForegroundDragging.Mui": "Transparent",
+        "MahApps.Colors.ScrollBarThumbForegroundHover.Mui": "Transparent",
+        "MahApps.Colors.SeparatorBackground.Mui": "#cccccc",
+        "MahApps.Colors.SliderThumbBackground.Mui": "#ffffff",
+        "MahApps.Colors.SliderThumbBackgroundHover.Mui": "#dddddd",
+        "MahApps.Colors.SliderThumbBackgroundDisabled.Mui": "#cccccc",
+        "MahApps.Colors.SliderThumbBorder.Mui": "#cccccc",
+        "MahApps.Colors.SliderThumbBorderHover.Mui": "#cccccc",
+        "MahApps.Colors.SliderThumbBorderDisabled.Mui": "#cccccc",
+        "MahApps.Colors.SliderTrackBackground.Mui": "#cccccc",
+        "MahApps.Colors.SliderTrackBorder.Mui": "#cccccc",
+        "MahApps.Colors.SliderTick.Mui": "#919191",
+        "MahApps.Colors.SliderTickDisabled.Mui": "#cccccc",
+        "MahApps.Colors.SubMenuText.Mui": "#99000000",
+        "MahApps.Colors.SubMenuTextHover.Mui": "#66000000",
+        "MahApps.Colors.SubMenuTextSelected.Mui": "#333333",
+        "MahApps.Colors.WindowHeaderGradient.Mui": "<LinearGradientBrush x:Key=\"MahApps.Brushes.WindowHeaderGradient.Mui\" StartPoint=\"0, 0\" EndPoint=\"0, 1\" Opacity=\".1\">\r\n<GradientStop Offset=\"0\" Color=\"{DynamicResource MahApps.Colors.Mui.AccentColor}\" />\r\n<GradientStop Offset=\".3\" Color=\"{DynamicResource MahApps.Colors.Mui.AccentColor}\" />\r\n<GradientStop Offset=\"1\" Color=\"Transparent\" />\r\n</LinearGradientBrush>",
+        "MahApps.Colors.WindowText.Mui": "#333333",
+        "MahApps.Colors.WindowTextReadOnly.Mui": "#919191",
+        "MahApps.Colors.CloseButtonBackgroundOnMoseOver.Mui": "#dddddd",
+        "MahApps.Colors.CloseButtonForegroundOnMoseOver.Mui": "#333333",
+        "MahApps.Colors.CloseButtonBackgroundIsPressed.Mui": "#e51400",
+        "MahApps.Colors.CloseButtonForegroundIsPressed.Mui": "White",
+        "MahApps.Colors.SystemButtonBackgroundOnMoseOver.Mui": "#dddddd",
+        "MahApps.Colors.SystemButtonForegroundOnMoseOver.Mui": "#333333",
+        "MahApps.Colors.SystemButtonForegroundIsPressed.Mui": "#919191"
       }
     }
   ],
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 70536df802..435e3a8863 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -233,4 +233,134 @@
     <SolidColorBrush x:Key="MahApps.HamburgerMenu.PaneBackground" Color="#FF444444" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.HamburgerMenu.PaneForeground" Color="#FFFFFFFF" options:Freeze="True" />
 
+
+    <!--  ************* ModernUI *************  -->
+    <Color x:Key="MahApps.Colors.Accent.Mui">{{MahApps.Colors.Accent.Mui}}</Color>
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+
+    <Color x:Key="MahApps.Colors.WindowBackground.Mui">{{MahApps.Colors.WindowBackground.Mui}}</Color>
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackground.Mui" Color="{{MahApps.Colors.ButtonBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackgroundHover.Mui" Color="{{MahApps.Colors.ButtonBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorder.Mui" Color="{{MahApps.Colors.ButtonBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorderHover.Mui" Color="{{MahApps.Colors.ButtonBorderHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorderPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonText.Mui" Color="{{MahApps.Colors.ButtonText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonTextHover.Mui" Color="{{MahApps.Colors.ButtonTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonTextPressed.Mui" Color="{{MahApps.Colors.ButtonTextPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonTextDisabled.Mui" Color="{{MahApps.Colors.ButtonTextDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridBackground.Mui" Color="{{MahApps.Colors.DataGridBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridForeground.Mui" Color="{{MahApps.Colors.DataGridForeground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackground.Mui" Color="{{MahApps.Colors.DataGridCellBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackgroundHover.Mui" Color="{{MahApps.Colors.DataGridCellBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForeground.Mui" Color="{{MahApps.Colors.DataGridCellForeground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForegroundHover.Mui" Color="{{MahApps.Colors.DataGridCellForegroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForegroundSelected.Mui" Color="{{MahApps.Colors.DataGridCellForegroundSelected.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackground.Mui" Color="{{MahApps.Colors.DataGridHeaderBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundHover.Mui" Color="{{MahApps.Colors.DataGridHeaderBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForeground.Mui" Color="{{MahApps.Colors.DataGridHeaderForeground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundHover.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundPressed.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundSelected.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundSelected.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridGridLines.Mui" Color="{{MahApps.Colors.DataGridGridLines.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridDropSeparator.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Hyperlink.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.HyperlinkHover.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.HyperlinkDisabled.Mui" Color="{{MahApps.Colors.HyperlinkDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.InputBackground.Mui" Color="{{MahApps.Colors.InputBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputBackgroundHover.Mui" Color="{{MahApps.Colors.InputBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputBorder.Mui" Color="{{MahApps.Colors.InputBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputBorderHover.Mui" Color="{{MahApps.Colors.InputBorderHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputText.Mui" Color="{{MahApps.Colors.InputText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputTextHover.Mui" Color="{{MahApps.Colors.InputTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.InputTextDisabled.Mui" Color="{{MahApps.Colors.InputTextDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemBackgroundHover.Mui" Color="{{MahApps.Colors.ItemBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemBorder.Mui" Color="{{MahApps.Colors.ItemBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemText.Mui" Color="{{MahApps.Colors.ItemText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemTextSelected.Mui" Color="{{MahApps.Colors.ItemTextSelected.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemTextHover.Mui" Color="{{MahApps.Colors.ItemTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemTextDisabled.Mui" Color="{{MahApps.Colors.ItemTextDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButtonText.Mui" Color="{{MahApps.Colors.LinkButtonText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButtonTextHover.Mui" Color="{{MahApps.Colors.LinkButtonTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButtonTextPressed.Mui" Color="{{MahApps.Colors.LinkButtonTextPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButtonTextDisabled.Mui" Color="{{MahApps.Colors.LinkButtonTextDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuText.Mui" Color="{{MahApps.Colors.MenuText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuTextHover.Mui" Color="{{MahApps.Colors.MenuTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuTextSelected.Mui" Color="{{MahApps.Colors.MenuTextSelected.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorder.Mui" Color="{{MahApps.Colors.ModernButtonBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderHover.Mui" Color="{{MahApps.Colors.ModernButtonBorderHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderPressed.Mui" Color="{{MahApps.Colors.ModernButtonBorderPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderDisabled.Mui" Color="{{MahApps.Colors.ModernButtonBorderDisabled.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonIconBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonIconForegroundPressed.Mui" Color="{{MahApps.Colors.ModernButtonIconForegroundPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonText.Mui" Color="{{MahApps.Colors.ModernButtonText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonTextHover.Mui" Color="{{MahApps.Colors.ModernButtonTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonTextPressed.Mui" Color="{{MahApps.Colors.ModernButtonTextPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonTextDisabled.Mui" Color="{{MahApps.Colors.ModernButtonTextDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.PopupBackground.Mui" Color="{{MahApps.Colors.PopupBackground.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ProgressBackground.Mui" Color="{{MahApps.Colors.ProgressBackground.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarBackground.Mui" Color="{{MahApps.Colors.ScrollBarBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbBackground.Mui" Color="{{MahApps.Colors.ScrollBarThumbBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbBackgroundDragging.Mui" Color="{{MahApps.Colors.ScrollBarThumbBackgroundDragging.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbBackgroundHover.Mui" Color="{{MahApps.Colors.ScrollBarThumbBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbBorder.Mui" Color="{{MahApps.Colors.ScrollBarThumbBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbForeground.Mui" Color="{{MahApps.Colors.ScrollBarThumbForeground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbForegroundDragging.Mui" Color="{{MahApps.Colors.ScrollBarThumbForegroundDragging.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBarThumbForegroundHover.Mui" Color="{{MahApps.Colors.ScrollBarThumbForegroundHover.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.SeparatorBackground.Mui" Color="{{MahApps.Colors.SeparatorBackground.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBackground.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBorder.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackground.Mui" Color="{{MahApps.Colors.SliderThumbBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundDragging.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundHover.Mui" Color="{{MahApps.Colors.SliderThumbBackgroundHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundDisabled.Mui" Color="{{MahApps.Colors.SliderThumbBackgroundDisabled.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorder.Mui" Color="{{MahApps.Colors.SliderThumbBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderDragging.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderHover.Mui" Color="{{MahApps.Colors.SliderThumbBorderHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderDisabled.Mui" Color="{{MahApps.Colors.SliderThumbBorderDisabled.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrackBackground.Mui" Color="{{MahApps.Colors.SliderTrackBackground.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrackBorder.Mui" Color="{{MahApps.Colors.SliderTrackBorder.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTick.Mui" Color="{{MahApps.Colors.SliderTick.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTickDisabled.Mui" Color="{{MahApps.Colors.SliderTickDisabled.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.SubMenuText.Mui" Color="{{MahApps.Colors.SubMenuText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubMenuTextHover.Mui" Color="{{MahApps.Colors.SubMenuTextHover.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubMenuTextSelected.Mui" Color="{{MahApps.Colors.SubMenuTextSelected.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowBackground.Mui" Color="{StaticResource MahApps.Colors.WindowBackground.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorder.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" Opacity=".5" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorderActive.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    {{MahApps.Colors.WindowHeaderGradient.Mui}}
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowText.Mui" Color="{{MahApps.Colors.WindowText.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTextReadOnly.Mui" Color="{{MahApps.Colors.WindowTextReadOnly.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButtonBackground.Mui" Color="{StaticResource MahApps.Colors.WindowBackground.Mui}" Opacity="0" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButtonBackgroundOnMoseOver.Mui" Color="{{MahApps.Colors.CloseButtonBackgroundOnMoseOver.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButtonForegroundOnMoseOver.Mui" Color="{{MahApps.Colors.CloseButtonForegroundOnMoseOver.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButtonBackgroundIsPressed.Mui" Color="{{MahApps.Colors.CloseButtonBackgroundIsPressed.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButtonForegroundIsPressed.Mui" Color="{{MahApps.Colors.CloseButtonForegroundIsPressed.Mui}}" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackground.Mui" Color="{StaticResource MahApps.Colors.WindowBackground.Mui}" Opacity="0" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackgroundOnMoseOver.Mui" Color="{{MahApps.Colors.SystemButtonBackgroundOnMoseOver.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonForegroundOnMoseOver.Mui" Color="{{MahApps.Colors.SystemButtonForegroundOnMoseOver.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonForegroundIsPressed.Mui" Color="{{MahApps.Colors.SystemButtonForegroundIsPressed.Mui}}" />
+
 </ResourceDictionary>
\ No newline at end of file

From b1d0cfa25649ea132ed024920e8d77c9ece9615c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 16:14:11 +0200
Subject: [PATCH 02/36] MUI fonts, sizes and shared content

---
 src/MahApps.Metro/Styles/Fonts.xaml  |  9 +++++++++
 src/MahApps.Metro/Styles/Shared.xaml | 14 ++++++++++++++
 src/MahApps.Metro/Styles/Sizes.xaml  |  6 ++++++
 3 files changed, 29 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 4f7c9a9496..b90ed70b99 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -37,4 +37,13 @@
     <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Win10">15</System:Double>
     <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Header.Win10">15</System:Double>
 
+    <!-- MUI -->
+
+    <FontFamily x:Key="DefaultFontFamily">Segoe UI</FontFamily>
+    <FontFamily x:Key="FixedFontFamily">Consolas</FontFamily>
+
+    <System:Double x:Key="DefaultFontSize">13</System:Double>
+    <System:Double x:Key="FixedFontSize">13.333</System:Double>
+    <System:Double x:Key="SmallFontSize">11</System:Double>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Shared.xaml b/src/MahApps.Metro/Styles/Shared.xaml
index addb2b5555..bdb0e0b098 100644
--- a/src/MahApps.Metro/Styles/Shared.xaml
+++ b/src/MahApps.Metro/Styles/Shared.xaml
@@ -118,4 +118,18 @@
                          Duration="0:0:.2" />
     </Storyboard>
 
+    <!-- MUI -->
+
+    <Thickness x:Key="RootMargin">-42,-8,-16,-16</Thickness>
+    <Thickness x:Key="ContentMargin">16,28,16,16</Thickness>
+    <Thickness x:Key="StatusMargin">-16,16,0,0</Thickness>
+    <Thickness x:Key="HeaderMargin">0,-28,44,0</Thickness>
+
+    <Thickness x:Key="SplitLeft">0,0,0,0</Thickness>
+    <Thickness x:Key="SplitRight">16,0,0,0</Thickness>
+
+    <Style x:Key="ContentRoot" TargetType="FrameworkElement">
+        <Setter Property="Margin" Value="{StaticResource ContentMargin}" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Sizes.xaml b/src/MahApps.Metro/Styles/Sizes.xaml
index 94f009359d..d48458064a 100644
--- a/src/MahApps.Metro/Styles/Sizes.xaml
+++ b/src/MahApps.Metro/Styles/Sizes.xaml
@@ -8,4 +8,10 @@
     <System:Double x:Key="MahApps.Sizes.ScrollBar.HorizontalRepeatButton.Width">14</System:Double>
     <System:Double x:Key="MahApps.Sizes.ScrollBar.VerticalRepeatButton.Height">14</System:Double>
 
+    <!-- MUI -->
+
+    <System:Double x:Key="CloseButtonWidth">32</System:Double>
+    <System:Double x:Key="SystemButtonHeight">24</System:Double>
+    <System:Double x:Key="SystemButtonWidth">32</System:Double>
+
 </ResourceDictionary>

From 3866fdb047ca52866c03ef18373b5f658c349ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 14:50:50 +0200
Subject: [PATCH 03/36] MUI Buttons

---
 .../Styles/Controls.Buttons.xaml              | 169 ++++++++++++++++++
 1 file changed, 169 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 33a6c94fa8..9454bfb610 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -1050,4 +1050,173 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.Button.System.Base.Mui" TargetType="ButtonBase">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                SnapsToDevicePixels="true">
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              RecognizesAccessKey="True"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Alert.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Margin" Value="8"/>
+        <Setter Property="Padding" Value="4"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Opacity" Value=".7" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Opacity" Value=".4" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
+        <Setter Property="Width" Value="{DynamicResource SystemButtonWidth}" />
+        <Setter Property="Height" Value="{DynamicResource SystemButtonHeight}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundOnMoseOver.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundOnMoseOver.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundIsPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Close.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Mui}">
+        <Setter Property="Width" Value="{DynamicResource CloseButtonWidth}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackground.Mui}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundOnMoseOver.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundOnMoseOver.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundIsPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundIsPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Link.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}" >
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonText.Mui}"/>
+        <Setter Property="Width" Value="NaN" />
+        <Setter Property="Height" Value="NaN" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="11" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                SnapsToDevicePixels="true">
+                        <TextBlock DataContext="{TemplateBinding Content}"
+                                   Text="{Binding Converter={converters:ToUpperConverter}}"
+                                   Margin="{TemplateBinding Padding}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextHover.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.Base.Mui" TargetType="{x:Type ButtonBase}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="16,3,16,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        SnapsToDevicePixels="true">
+                        <ContentPresenter Name="Presenter" Margin="{TemplateBinding Padding}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Chrome" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ToggleButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type ToggleButton}"/>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type RepeatButton}">
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type Button}"/>
+
 </ResourceDictionary>
\ No newline at end of file

From 8a4615daa028b80cc22a3d282cc1db2f08f98d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 12:06:13 +0200
Subject: [PATCH 04/36] MUI RadioButton

---
 .../Styles/Controls.RadioButton.xaml          | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index 2b316b7dd3..dde32373ff 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -110,4 +110,52 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.RadioButton.Mui" TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0"
+                                Background="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" BorderThickness="1">
+                            <Rectangle x:Name="CheckMark" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Collapsed"/>
+                        </Border>
+                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                          VerticalAlignment="Center" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>

From 65fb805015c5a4981189dfcc1217ca621722d9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 17:32:59 +0200
Subject: [PATCH 05/36] MUI CheckBox

---
 .../Styles/Controls.CheckBox.xaml             | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 45f4a49c8e..6a5d36dee0 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -133,4 +133,79 @@
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
+
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.CheckBox.Mui" TargetType="{x:Type CheckBox}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type CheckBox}">
+                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <Path x:Name="CheckMark" Width="10" Height="10" Margin="2" Visibility="Collapsed" Stretch="Fill" Fill="{TemplateBinding Foreground}" Data="F1 M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z "/>
+                                <Rectangle x:Name="Indeterminate" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Hidden"/>
+                            </Grid>
+                        </Border>
+                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsThreeState}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="{x:Null}" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Visible" />
+                        </MultiDataTrigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- checkbox-in-datagrid styles-->
+    <Style x:Key="MahApps.Styles.CheckBox.DataGrid.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
+        <Setter Property="IsHitTestVisible" Value="False" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CheckBox.DataGridEditing.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
 </ResourceDictionary>

From c9658701d715854a566399aebc10ac4dd676d3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 15:12:51 +0200
Subject: [PATCH 06/36] Add button, checkbox and radiobutton examples

---
 .../ExampleViews/ButtonsExample.xaml          | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 901b6f2a8f..82bcf8a3b5 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -27,6 +27,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Column="0">
@@ -485,6 +486,78 @@
             </Controls:SplitButton>
 
         </StackPanel>
+
+        <StackPanel Grid.Row="2" Grid.Column="0">
+            <Label Content="MUI button" Style="{DynamicResource DescriptionHeaderStyle}" />
+            <Button Width="100"
+                    Margin="{StaticResource ControlMargin}"
+                    Content="Enabled"
+                    Style="{DynamicResource MahApps.Styles.Button.Mui}" />
+            <Button Width="100"
+                    Margin="{StaticResource ControlMargin}"
+                    Content="Disabled"
+                    IsEnabled="False"
+                    Style="{DynamicResource MahApps.Styles.Button.Mui}" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="2"
+                    Grid.Column="1"
+                    HorizontalAlignment="Center">
+            <Label Content="MUI Checkbox" Style="{DynamicResource DescriptionHeaderStyle}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Enabled"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Enabled checked"
+                      IsChecked="True"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Enabled three state"
+                      IsChecked="{x:Null}"
+                      IsThreeState="True"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Disabled"
+                      IsEnabled="False"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Disabled checked"
+                      IsChecked="True"
+                      IsEnabled="False"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+            <CheckBox Margin="{StaticResource ControlMargin}"
+                      Content="Disabled three state"
+                      IsChecked="{x:Null}"
+                      IsEnabled="False"
+                      IsThreeState="True"
+                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="2"
+                    Grid.Column="2"
+                    HorizontalAlignment="Center">
+            <Label Content="MUI Radio button" Style="{DynamicResource DescriptionHeaderStyle}" />
+            <RadioButton Margin="{StaticResource ControlMargin}"
+                         Content="Enabled"
+                         GroupName="1"
+                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
+            <RadioButton Margin="{StaticResource ControlMargin}"
+                         Content="Enabled checked"
+                         GroupName="1"
+                         IsChecked="True"
+                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
+            <RadioButton Margin="{StaticResource ControlMargin}"
+                         Content="Disabled"
+                         GroupName="2"
+                         IsEnabled="False"
+                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
+            <RadioButton Margin="{StaticResource ControlMargin}"
+                         Content="Disabled checked"
+                         GroupName="2"
+                         IsChecked="True"
+                         IsEnabled="False"
+                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
+        </StackPanel>
     </Grid>
 
 </UserControl>

From c412e72da53342f4d31ad5ae8314e49672b1ea8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 17:40:27 +0200
Subject: [PATCH 07/36] MUI ComboBox

---
 .../Styles/Controls.ComboBox.xaml             | 267 ++++++++++++++++++
 1 file changed, 267 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 9c55dbd38b..acc92e7482 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -685,4 +685,271 @@
         </Style.Triggers>
     </Style>
 
+    <!-- MUI -->
+
+    <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+
+    <Style x:Key="MahApps.Styles.ComboBoxItem.Mui" TargetType="{x:Type ComboBoxItem}">
+        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Padding" Value="7,2,8,2"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border Name="Bd"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Padding="{TemplateBinding Padding}"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBox.ComboBoxEditable.Mui" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="MahApps.Templates.ComboBox.Editable.Mui" TargetType="{x:Type ComboBox}">
+        <Grid Name="MainGrid" SnapsToDevicePixels="true">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <Popup Name="PART_Popup"
+                   AllowsTransparency="true"
+                   Grid.ColumnSpan="2"
+                   Placement="Bottom"
+                   Margin="1"
+                   IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                    <Border x:Name="DropDownBorder"
+                            Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                            BorderThickness="1"
+                            Margin="0,-1,0,0">
+                        <!-- popup border thickness not dependent on BorderThickness property-->
+                        <ScrollViewer Name="DropDownScrollViewer">
+                            <Grid RenderOptions.ClearTypeHint="Enabled">
+                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                    <Rectangle
+                                        Name="OpaqueRect"
+                                        Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
+                                        Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
+                                        Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
+                                </Canvas>
+                                <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Popup>
+            <ToggleButton Grid.ColumnSpan="2"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                          Padding="0,0,0,10"/>
+
+            <Path Name="Arrow"
+                  Grid.ColumnSpan="2"
+                  Margin="3,1,8,0"
+                  Fill="{TemplateBinding Foreground}"
+                  Data="{DynamicResource DownArrowGeometry}"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center" IsHitTestVisible="False"/>
+            <TextBox x:Name="PART_EditableTextBox"
+                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                     Margin="{TemplateBinding Padding}"
+                     Padding="2,0,0,1"
+                     Style="{StaticResource MahApps.Styles.TextBox.ComboBoxEditable.Mui}"
+                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+            </Trigger>
+            <Trigger SourceName="PART_EditableTextBox" Property="IsFocused" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+            </Trigger>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </Trigger>
+            <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+                <Setter TargetName="OpaqueRect"
+                        Property="Canvas.Top"
+                        Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
+                <Setter TargetName="OpaqueRect"
+                        Property="Canvas.Left"
+                        Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="MahApps.Styles.ComboBox.Mui" TargetType="{x:Type ComboBox}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Padding" Value="7,3,8,3"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup Name="PART_Popup"
+                               AllowsTransparency="true"
+                               Grid.ColumnSpan="2"
+                               Placement="Bottom"
+                               Margin="1"
+                               IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                                <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                                <Border x:Name="DropDownBorder"
+                                        Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                        BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                                        BorderThickness="1"
+                                        Margin="0,-1,0,0">
+                                    <!-- popup border thickness not dependent on BorderThickness property-->
+                                    <ScrollViewer Name="DropDownScrollViewer">
+                                        <Grid RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                                <Rectangle
+                                                    Name="OpaqueRect"
+                                                    Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
+                                                    Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
+                                                    Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
+                                            </Canvas>
+                                            <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </Grid>
+                        </Popup>
+                        <ToggleButton Grid.ColumnSpan="2"
+                                      Background="{TemplateBinding Background}"
+                                      BorderBrush="{TemplateBinding BorderBrush}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                                      Padding="0,0,0,10"/>
+
+                        <Path Name="Arrow"
+                              Grid.ColumnSpan="2"
+                              Margin="3,1,8,0"
+                              Fill="{TemplateBinding Foreground}"
+                              Data="{DynamicResource DownArrowGeometry}"
+                              HorizontalAlignment="Right"
+                              VerticalAlignment="Center" IsHitTestVisible="False"/>
+
+                        <ContentPresenter IsHitTestVisible="false"
+                                          Margin="{TemplateBinding Padding}"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Top"
+                                    Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Left"
+                                    Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false"/>
+                <Setter Property="Padding" Value="3"/>
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ComboBox.Editable.Mui}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
+        <Setter Property="IsSynchronizedWithCurrentItem" Value="False" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="1,1" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 774938fd0e153853bbc3ec744e6b996585faf1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 09:15:23 +0200
Subject: [PATCH 08/36] MUI ContextMenu

---
 .../Styles/Controls.ContextMenu.xaml          | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 7aa8cdfe61..a6158a770d 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -602,4 +602,51 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}"/>
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0,6,0,6"/>
+        <Setter Property="MinWidth" Value="150" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContextMenu}">
+                    <Grid Margin="4">
+                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                        <Border x:Name="ContextMenuBorder"
+                                Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                                BorderThickness="1"
+                                Margin="0,-1,0,0">
+                            <ScrollViewer Name="ContextMenuScrollViewer">
+                                <Grid RenderOptions.ClearTypeHint="Enabled">
+                                    <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                        <Rectangle
+                                            Name="OpaqueRect"
+                                            Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"
+                                            Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"
+                                            Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />
+                                    </Canvas>
+                                    <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                </Grid>
+                            </ScrollViewer>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>

From cc94e435b1e3f0492a80241518d92f65cebe845c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 10:51:54 +0200
Subject: [PATCH 09/36] MUI DataGrid

---
 .../Styles/Controls.DataGrid.xaml             | 389 ++++++++++++++++++
 1 file changed, 389 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index cedac1cb8c..5a7ba1b7d4 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -700,4 +700,393 @@
         </Style.Triggers>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}" TargetType="{x:Type Button}"
+           BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridColumnHeadersPresenter.Mui" TargetType="{x:Type DataGridColumnHeadersPresenter}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
+                    <Grid>
+                        <DataGridColumnHeader IsHitTestVisible="False" Name="PART_FillerColumnHeader"/>
+                        <ItemsPresenter />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="Height" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeNS"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}"
+                      Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Control.ColumnFloatingHeader.Mui" TargetType="{x:Type Control}">
+        <Setter Property="Opacity" Value="0.6"></Setter>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Control}">
+                    <Border BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding ="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}">
+                        <Grid>
+                            <Canvas Name="PART_VisualBrushCanvas" Margin="{TemplateBinding Margin}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Separator.ColumnHeaderDrop.Mui" TargetType="{x:Type Separator}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridDropSeparator.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Separator}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridRow.Mui" TargetType="{x:Type DataGridRow}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+        <Setter Property="ValidationErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Foreground="#FFdc000c" Text="!" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRow}">
+                    <Border x:Name="DGR_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                        <SelectiveScrollingGrid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <DataGridCellsPresenter Grid.Column="1"
+                                                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                            <DataGridDetailsPresenter  SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=AreRowDetailsFrozen, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}}"
+                                                       Grid.Column="1" Grid.Row="1"
+                                                       Visibility="{TemplateBinding DetailsVisibility}" />
+
+                            <DataGridRowHeader SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                                               Grid.RowSpan="2"
+                                               Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Row}}"/>
+                        </SelectiveScrollingGrid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridCellsPresenter.Mui" TargetType="{x:Type DataGridCellsPresenter}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridCellsPresenter}">
+                    <ItemsPresenter />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridCell.Mui" TargetType="{x:Type DataGridCell}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForeground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="5,1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridCell}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
+                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundSelected.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundSelected.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Mui" TargetType="{x:Type DataGridColumnHeader}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="Padding" Value="4,3,4,3"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+>
+                            <Grid x:Name="containerGrid" Margin="5" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"
+                                      Width="8" Height="6"  Margin="5,0,5,0"
+                                      Stretch="Fill" Opacity="0.5" Fill="{TemplateBinding Foreground}"
+                                      RenderTransformOrigin="0.5,0.4"
+                                      Visibility="Hidden"
+                                      Data="M0,0 L1,0 0.5,1 z" />
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridRowHeader.Mui" TargetType="{x:Type DataGridRowHeader}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding ="{TemplateBinding Padding}">
+
+                            <StackPanel Orientation="Horizontal">
+                                <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                                <Control SnapsToDevicePixels="false"
+                                         Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=(Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}}"
+                                         Template="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=ValidationErrorTemplate}" />
+                            </StackPanel>
+                        </Border>
+                        <Thumb x:Name="PART_TopHeaderGripper"
+                               VerticalAlignment="Top"
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
+                        <Thumb x:Name="PART_BottomHeaderGripper"
+                               VerticalAlignment="Bottom"
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsRowSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundSelected.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGrid.Mui" TargetType="{x:Type DataGrid}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridBackground.Mui}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridForeground.Mui}"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
+        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="DragIndicatorStyle" Value="{StaticResource MahApps.Styles.Control.ColumnFloatingHeader.Mui}" />
+        <Setter Property="DropLocationIndicatorStyle" Value="{StaticResource MahApps.Styles.Separator.ColumnHeaderDrop.Mui}" />
+        <Setter Property="GridLinesVisibility" Value="Horizontal" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGrid}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True"
+                            Padding="{TemplateBinding Padding}">
+                        <ScrollViewer Focusable="false" Name="DG_ScrollViewer">
+                            <ScrollViewer.Template>
+                                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto"/>
+                                        </Grid.RowDefinitions>
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}"
+                                                Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=CellsPanelHorizontalOffset}"
+                                                Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}}"
+                                                Focusable="false"
+                                                Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.All}}" />
+                                        <DataGridColumnHeadersPresenter Grid.Column="1"
+                                                                        Name="PART_ColumnHeadersPresenter"
+                                                                        Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Column}}"/>
+
+                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" />
+
+                                        <ScrollBar Grid.Row="1" Grid.Column="2" Name="PART_VerticalScrollBar"
+                                                   Orientation="Vertical"
+                                                   Maximum="{TemplateBinding ScrollableHeight}"
+                                                   ViewportSize="{TemplateBinding ViewportHeight}"
+                                                   Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
+
+                                        <Grid Grid.Row="2" Grid.Column="1">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=NonFrozenColumnsViewportHorizontalOffset}"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <ScrollBar Grid.Column="1"
+                                                       Name="PART_HorizontalScrollBar"
+                                                       Orientation="Horizontal"
+                                                       Maximum="{TemplateBinding ScrollableWidth}"
+                                                       ViewportSize="{TemplateBinding ViewportWidth}"
+                                                       Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                       Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+
+                                        </Grid>
+                                    </Grid>
+                                </ControlTemplate>
+                            </ScrollViewer.Template>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From b92c08ab3dbdbe29ac3eb37b000d8d1142250b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 16:20:40 +0200
Subject: [PATCH 10/36] MUI calendar

---
 .../Styles/Controls.Calendar.xaml             | 265 ++++++++++++++++++
 1 file changed, 265 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 6047a1ea3f..1cb09f929d 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -567,4 +567,269 @@
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.Calendar.Mui" TargetType="Calendar">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ItemBorder.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton.Mui}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton.Mui}" />
+        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem.Mui}" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <StackPanel Name="PART_Root" HorizontalAlignment="Center">
+                        <CalendarItem
+                            Name="PART_CalendarItem"
+                            Style="{TemplateBinding CalendarItemStyle}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarItem.Mui" TargetType="CalendarItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <ControlTemplate.Resources>
+                        <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                            <TextBlock x:Name="Text" FontWeight="Bold"
+                                       FontSize="{DynamicResource DefaultFontSize}"
+                                       Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
+                                       HorizontalAlignment="Center"
+                                       Text="{Binding}"
+                                       Margin="0,6,0,6"
+                                       VerticalAlignment="Center"/>
+                        </DataTemplate>
+                    </ControlTemplate.Resources>
+                    <Grid Name="PART_Root" >
+                        <Border
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*" MinWidth="132"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton"
+                                        Grid.Row="0" Grid.Column="0"
+                                        Margin="-1,-1,0,0"
+                                        Padding="10,4,10,3"
+                                        Focusable="False">
+                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
+                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+                                          Data="F1 M 0,0 1,1 1,-1 Z" />
+                                </Button>
+
+                                <Button x:Name="PART_NextButton"
+                                        Grid.Row="0" Grid.Column="2"
+                                        Margin="0,-1,-1,0"
+                                        Padding="10,4,10,3"
+                                        Focusable="False">
+                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
+                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+                                          Data="F1 M 0,1 1,0 0,-1 Z" />
+                                </Button>
+
+                                <Button x:Name="PART_HeaderButton"
+                                        Grid.Row="0" Grid.Column="1"
+                                        Margin="-1,-1,-1,0"
+                                        HorizontalAlignment="Stretch" VerticalAlignment="Center"
+                                        FontWeight="Bold"
+                                        Focusable="False" />
+
+                                <Grid x:Name="PART_MonthView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Visible" Margin="8" HorizontalAlignment="Center">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+
+                                <Grid x:Name="PART_YearView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Hidden" Margin="8" HorizontalAlignment="Center">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Value="Year">
+                            <DataTrigger.Binding>
+                                <Binding Path="DisplayMode">
+                                    <Binding.RelativeSource>
+                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
+                                    </Binding.RelativeSource>
+                                </Binding>
+                            </DataTrigger.Binding>
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <DataTrigger Value="Decade">
+                            <DataTrigger.Binding>
+                                <Binding Path="DisplayMode">
+                                    <Binding.RelativeSource>
+                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
+                                    </Binding.RelativeSource>
+                                </Binding>
+                            </DataTrigger.Binding>
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
+        <Setter Property="MinWidth" Value="5"/>
+        <Setter Property="MinHeight" Value="5"/>
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter
+                                x:Name="NormalText"
+                                TextElement.Foreground="{TemplateBinding Foreground}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Margin="5,1,5,1" />
+                        <Path x:Name="Blackout" Opacity=".5" Visibility="Collapsed" Margin="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{TemplateBinding Foreground}" Stretch="Fill" Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"/>
+                        <Rectangle x:Name="DayButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarButton.Mui" TargetType="CalendarButton" >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="42"/>
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="NormalText"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="1,0,1,1" />
+                        <Rectangle x:Name="CalendarButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 544bb5a900c77a9b1d9e5ca41df7c7151e7257e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 10:58:00 +0200
Subject: [PATCH 11/36] MUI DatePicker

---
 .../Styles/Controls.DatePicker.xaml           | 169 ++++++++++++++++++
 1 file changed, 169 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 94bc32275a..97a443e6b8 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -366,4 +366,173 @@
         </Setter>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.DataPicker.Mui" TargetType="{x:Type DatePicker}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="SelectedDateFormat" Value="Short" />
+        <Setter Property="Padding" Value="2,2,2,1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Focusable" Value="True" />
+
+        <Setter Property="CalendarStyle">
+            <Setter.Value>
+                <Style TargetType="Calendar" BasedOn="{StaticResource {x:Type Calendar}}">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Calendar">
+                                <Grid Name="PART_Root" Margin="4" HorizontalAlignment="Center">
+                                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                                    <CalendarItem Name="PART_CalendarItem"
+                                                  Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                                  Style="{TemplateBinding CalendarItemStyle}"
+                                                  BorderThickness="0"
+                                                  Margin="1"/>
+
+                                    <Border BorderBrush="{DynamicResource MahApps.Brushes.Accent.Mui}" BorderThickness="1" />
+                                </Grid>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DatePicker}">
+                    <Border x:Name="LayoutRoot" BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <!-- TODO: MUI - Replace or implement this control -->
+                            <!--<controls:ModernButton x:Name="PART_Button" Grid.Row="0" Grid.Column="1"
+                                                   Width="20"
+                                                   Margin="3,0,3,0"
+                                                   Padding="0"
+                                                   Focusable="False"
+                                                   VerticalAlignment="Top"
+                                                   HorizontalAlignment="Left"
+                                                   EllipseStrokeThickness="0"
+                                                   IconWidth="12" IconHeight="12"
+                                                   IconData="F1 M 34.0047,52.0073L 31.0042,52.0073L 31.0042,38.5053C 29.6649,39.8964 28.157,40.7849 26.3412,41.4502L 26.3412,37.7553C 27.2998,37.4474 28.3405,36.8645 29.4634,36.0068C 30.5862,35.149 31.3572,34.1483 31.7762,33.0046L 34.0047,33.0046L 34.0047,52.0073 Z M 45.0063,52.0073L 45.0063,48.0067L 37.0052,48.0067L 37.0052,45.0063L 45.0063,33.0046L 48.0067,33.0046L 48.0067,45.0063L 50.007,45.0063L 50.007,48.0067L 48.0067,48.0067L 48.0067,52.0073L 45.0063,52.0073 Z M 45.0063,45.0063L 45.0063,38.2555L 40.2556,45.0063L 45.0063,45.0063 Z M 18.0025,57.0082L 18.0025,23.0033L 23.0032,23.0033L 23.0032,20.0029C 23.0033,18.898 23.8988,18.0026 25.0035,18.0026L 29.004,18.0026C 30.1087,18.0026 31.0042,18.898 31.0043,20.0026L 31.0043,23.0033L 45.0063,23.0033L 45.0062,20.0026C 45.0062,18.8979 45.9018,18.0023 47.0065,18.0023L 51.0071,18.0023C 52.1118,18.0023 53.0074,18.8979 53.0074,20.0026L 53.0074,23.0033L 58.0081,23.0033L 58.0081,57.0082L 18.0025,57.0082 Z M 21.0029,54.0078L 55.0076,54.0078L 55.0076,31.0044L 21.0029,31.0044L 21.0029,54.0078 Z M 48.5067,20.0029C 47.6782,20.0029 47.0065,20.6746 47.0065,21.5031L 47.0065,24.5035C 47.0065,25.3321 47.6782,26.0038 48.5067,26.0038L 49.5068,26.0038C 50.3354,26.0038 51.007,25.3321 51.007,24.5035L 51.007,21.5031C 51.007,20.6746 50.3354,20.0029 49.5068,20.0029L 48.5067,20.0029 Z M 26.5037,20.0029C 25.6751,20.0029 25.0035,20.6745 25.0035,21.5031L 25.0035,24.5035C 25.0035,25.3321 25.6751,26.0037 26.5037,26.0037L 27.5038,26.0037C 28.3324,26.0037 29.004,25.3321 29.004,24.5035L 29.004,21.5031C 29.004,20.6745 28.3324,20.0029 27.5038,20.0029L 26.5037,20.0029 Z"/>-->
+
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Focusable="{TemplateBinding Focusable}" />
+                            <Popup x:Name="PART_Popup"
+                                   PlacementTarget="{Binding ElementName=LayoutRoot}"
+                                   Placement="Bottom"
+                                   HorizontalOffset="-4"
+                                   VerticalOffset="-5"
+                                   StaysOpen="False"
+                                   AllowsTransparency="True" />
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="PART_TextBox" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="true">
+                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataPickerTextBox.Mui" TargetType="{x:Type DatePickerTextBox}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="1,0,0,0" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="WatermarkStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Unwatermarked" />
+                                <VisualState Name="Watermarked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid x:Name="WatermarkContent"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                <Border x:Name="ContentElement" BorderThickness="0" Opacity="1" />
+                                <Border x:Name="watermark_decorator" BorderThickness="0">
+                                    <ContentControl x:Name="PART_Watermark"
+                                                    Opacity="0"
+                                                    Focusable="False"
+                                                    IsHitTestVisible="False"
+                                                    Margin="3,0"/>
+                                </Border>
+                                <ScrollViewer x:Name="PART_ContentHost"
+                                              Margin="0"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsReadOnly" Value="true">
+                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From dd194b4eb692fbb049357b999b53ce7471455e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 16:39:29 +0200
Subject: [PATCH 12/36] MUI Date

---
 .../ExampleViews/DateExamples.xaml            | 32 +++++++++++++++++++
 .../Styles/Controls.DatePicker.xaml           |  4 +--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
index 366d1d3690..6407fc0529 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
@@ -22,6 +22,10 @@
 
     <AdornerDecorator>
         <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -298,6 +302,34 @@
                     </AdornerDecorator>
                 </GroupBox>
             </StackPanel>
+
+            <StackPanel Grid.Row="1" Grid.Column="0">
+                <Label Content="MUI Calendar" Style="{DynamicResource DescriptionHeaderStyle}" />
+
+                <Calendar Margin="5"
+                          DisplayDateStart="{x:Static system:DateTime.Now}"
+                          IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          SelectionMode="MultipleRange"
+                          Style="{DynamicResource MahApps.Styles.Calendar.Mui}"
+                          />
+                <Calendar Margin="5"
+                          HorizontalAlignment="Center"
+                          IsEnabled="False"
+                          Style="{DynamicResource MahApps.Styles.Calendar.Mui}"
+                          />
+            </StackPanel>
+
+            <StackPanel Grid.Row="1" Grid.Column="1">
+                <Label Content="MUI Date Picker" Style="{DynamicResource DescriptionHeaderStyle}" />
+
+                <DatePicker Width="200"
+                            Margin="0 10 0 0"
+                            Style="{DynamicResource MahApps.Styles.DatePicker.Mui}" />
+                <DatePicker Width="200"
+                            Margin="0 10 0 0"
+                            IsEnabled="False"
+                            Style="{DynamicResource MahApps.Styles.DatePicker.Mui}" />
+            </StackPanel>
         </Grid>
     </AdornerDecorator>
 
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 97a443e6b8..c45418da23 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -368,7 +368,7 @@
 
     <!-- MUI -->
 
-    <Style x:Key="MahApps.Styles.DataPicker.Mui" TargetType="{x:Type DatePicker}">
+    <Style x:Key="MahApps.Styles.DatePicker.Mui" TargetType="{x:Type DatePicker}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}" />
@@ -471,7 +471,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.DataPickerTextBox.Mui" TargetType="{x:Type DatePickerTextBox}">
+    <Style x:Key="MahApps.Styles.DatePickerTextBox.Mui" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0" />

From aeb579d33f025130ca415ff21ef5e32fb68decd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 10:59:17 +0200
Subject: [PATCH 13/36] MUI Label

---
 src/MahApps.Metro/Styles/Controls.Label.xaml | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index 0c4b2bbb53..aa7a9a1074 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -40,4 +40,33 @@
         </Setter>
     </Style>
 
+    <Style x:Key="MahApps.Styles.Label.Mui" TargetType="{x:Type Label}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Label}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowTextReadOnly.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 269acdf595b7a1ad93f6a209a01092e915305c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:04:22 +0200
Subject: [PATCH 14/36] MUI ListBox

---
 .../Styles/Controls.ListBox.xaml              | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 50a24130bc..3729da1184 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -155,4 +155,78 @@
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
     </Style>
+
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.ListBoxItem.Mui" TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListBoxItem.Flat.Mui" TargetType="ListBoxItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                            <Setter Property="FontWeight" Value="Bold" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListBox.Mui" TargetType="ListBox">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.Flat.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBox">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding="{TemplateBinding Padding}">
+                        <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false"  >
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 72c130167288e7c94c7f7e0d1d9a2fc0ce968046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:22:51 +0200
Subject: [PATCH 15/36] MUI ListView

---
 .../Styles/Controls.ListView.xaml             | 177 ++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 36de8ca04e..0506b5711b 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -365,4 +365,181 @@
         </Style.Triggers>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.ListView.Mui" TargetType="ListView">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Canvas.Right" Value="-9"/>
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="{Binding Path=ActualHeight,RelativeSource={RelativeSource TemplatedParent}}"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="Transparent">
+                        <Rectangle HorizontalAlignment="Center" Width="1" Fill="{TemplateBinding Background}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.GridViewColumnHeader.Mui" TargetType="{x:Type GridViewColumnHeader}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="4,3,4,3"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border Name="HeaderBorder" BorderThickness="0" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition MaxHeight="7"/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.RowSpan="2" Padding="{TemplateBinding Padding}">
+                                    <ContentPresenter Name="HeaderContent"
+                                    Margin="0,0,0,1"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                </Border>
+                            </Grid>
+                        </Border>
+                        <Canvas>
+                            <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui}" Visibility="Collapsed"/>
+                        </Canvas>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="Height" Value="Auto">
+                            <Setter Property="MinHeight" Value="20"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static GridView.GridViewStyleKey}" TargetType="{x:Type ListView}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListView}">
+                    <Border Name="Bd"
+                               BorderThickness="{TemplateBinding BorderThickness}"
+                               BorderBrush="{TemplateBinding BorderBrush}"
+                               Background="{TemplateBinding Background}"
+                               SnapsToDevicePixels="true">
+                        <ScrollViewer Padding="{TemplateBinding Padding}">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListViewItem.Mui" TargetType="{x:Type ListViewItem}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="Padding" Value="5,2,5,2"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListViewItem}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Border Name="Selection" Visibility="Collapsed" />
+                        <!-- This is used when GridView is put inside the ListView -->
+                        <GridViewRowPresenter Grid.RowSpan="2"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                        <!-- This is used for ListView that does not use GridView -->
+                        <ContentPresenter x:Name="contentPresenter"
+                                          Margin="{TemplateBinding Padding}"
+                                          Content="{TemplateBinding ContentControl.Content}"
+                                          Visibility="Collapsed"
+                                          ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentControl.ContentTemplateSelector}"
+                                          ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
+                                          HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="GridView.ColumnCollection" Value="{x:Null}">
+                            <Setter TargetName="contentPresenter" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 14b664c9468cbd2f4197c84ff018e12b968a5ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:40:42 +0200
Subject: [PATCH 16/36] MUI GridSplitter

---
 .../Styles/Controls.GridSpliter.xaml            | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/MahApps.Metro/Styles/Controls.GridSpliter.xaml

diff --git a/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml b/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
new file mode 100644
index 0000000000..ca502cefef
--- /dev/null
+++ b/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
@@ -0,0 +1,17 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.GridSplitter.Mui" TargetType="GridSplitter">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SeparatorBackground.Mui}" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridSplitter}">
+                    <Border Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

From 42ee90856196bdb27e8cf3b0847da318e3dcc1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:42:16 +0200
Subject: [PATCH 17/36] MUI Hyperlink

---
 .../Styles/Controls.Hyperlink.xaml            | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/MahApps.Metro/Styles/Controls.Hyperlink.xaml

diff --git a/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml b/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
new file mode 100644
index 0000000000..692c19c346
--- /dev/null
+++ b/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:MahApps.Metro.Styles">
+
+  <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
+    <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Hyperlink.Mui}"/>
+    <Setter Property="TextDecorations" Value="Underline"/>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkHover.Mui}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkDisabled.Mui}"/>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="True">
+        <Setter Property="Cursor" Value="Hand"/>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+
+</ResourceDictionary>
\ No newline at end of file

From 3c25f19f53d27d5d0d4e4e90aa33e9949ed93b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:46:58 +0200
Subject: [PATCH 18/36] MUI TreeView

---
 .../Styles/Controls.TreeView.xaml             | 161 ++++++++++++++++++
 1 file changed, 161 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index fc53e4bd56..b852cce5d8 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -240,4 +240,165 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.TreeView.Mui" TargetType="TreeView">
+        <Setter Property="BorderThickness" Value="0" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpandCollapse.Mui" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Width="16"
+                            Height="16"
+                            Background="Transparent"
+                            Padding="5,5,5,5" >
+                        <Path x:Name="ExpandPath"
+                              Stroke="#FF989898"
+                              StrokeThickness="1"
+                              Data="F1 M.5,.5, .5,6.5 6.5,.5 Z" UseLayoutRounding="True" SnapsToDevicePixels="True">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="135"
+                                                 CenterX="3"
+                                                 CenterY="3"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <!--<Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="{DynamicResource Accent}"/>
+                        </Trigger>-->
+
+                        <Trigger Property="IsChecked"
+                                 Value="True">
+                            <Setter TargetName="ExpandPath"
+                                    Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"
+                                                     CenterX="3"
+                                                     CenterY="3"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="ExpandPath"
+                                    Property="Fill"
+                                    Value="#FF595959"/>
+                            <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="#FF262626"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <!--<Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="{DynamicResource Accent}"/>-->
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TreeViewItem.Mui" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment"
+                Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment"
+                Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="19"
+                                              Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+
+                        <ToggleButton x:Name="Expander"
+                                      Style="{StaticResource MahApps.Styles.ToggleButton.ExpandCollapse.Mui}"
+                                      IsChecked="{Binding Path=IsExpanded,RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <Border Name="Bd"
+                                Grid.Column="1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="true">
+
+                            <ContentPresenter x:Name="PART_Header"
+                                              ContentSource="Header"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"/>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger SourceName="Bd" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="VirtualizingStackPanel.IsVirtualizing"
+                 Value="true">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel/>
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 14d1647dc1c4e48153d1128d6746998e3357e1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:48:23 +0200
Subject: [PATCH 19/36] MUI ToolTip

---
 .../Styles/Controls.Tooltip.xaml              | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 943838e132..d884655628 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -62,4 +62,43 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.ToolTip.Mui" TargetType="ToolTip">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}"/>
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="FontStyle" Value="Normal"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Padding" Value="5,1,5,4"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HasDropShadow" Value="False"/>
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToolTip}">
+                    <Grid Margin="4">
+                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                        <Border Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Padding="{TemplateBinding Padding}"
+                                CornerRadius="0">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 4031c5593b0151b36b3a5081738ec4c6d196f7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:55:03 +0200
Subject: [PATCH 20/36] MUI TextBox

---
 .../Styles/Controls.TextBox.xaml              | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 763c948c5e..2e2f6bf30b 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -968,4 +968,114 @@
         </Setter>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.TextBoxBase.Mui" TargetType="{x:Type TextBoxBase}" BasedOn="{x:Null}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2,1,1,1"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Validation.ErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <Border BorderThickness="1" BorderBrush="#FFdc000c" VerticalAlignment="Top">
+                            <Grid>
+                                <AdornedElementPlaceholder x:Name="adorner" Margin="-1"/>
+                            </Grid>
+                        </Border>
+                        <Border x:Name="errorBorder" Background="#FFdc000c" Margin="8,0,0,0"
+                                Opacity="0" CornerRadius="0"
+                                IsHitTestVisible="False"
+                                MinHeight="24" >
+                            <TextBlock Text="{Binding ElementName=adorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"
+                                       Foreground="White" Margin="8,2,8,3" TextWrapping="Wrap" VerticalAlignment="Center"/>
+                        </Border>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Value="True">
+                            <DataTrigger.Binding>
+                                <Binding ElementName="adorner" Path="AdornedElement.IsKeyboardFocused" />
+                            </DataTrigger.Binding>
+                            <DataTrigger.EnterActions>
+                                <BeginStoryboard x:Name="fadeInStoryboard">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="00:00:00.15"
+                                                         Storyboard.TargetName="errorBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.EnterActions>
+                            <DataTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="fadeInStoryboard"/>
+                                <BeginStoryboard x:Name="fadeOutStoryBoard">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="00:00:00"
+                                                         Storyboard.TargetName="errorBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.ExitActions>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBoxBase}">
+                    <Border x:Name="Bd"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsReadOnly" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsReadOnly" Value="False"/>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type TextBox}" />
+
+    <Style x:Key="MahApps.Styles.RichTextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type RichTextBox}" />
+
+    <!-- text-in-datagrid styles-->
+
+    <Style x:Key="MahApps.Styles.TextBox.DataGridEditing.Mui" TargetType="TextBox" BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From bbd3b29356abcdf77d92716ad31df0af9afec856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:57:00 +0200
Subject: [PATCH 21/36] MUI TextBlock

---
 .../Styles/Controls.TextBlock.xaml            | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index 1de943a9e9..68c4973753 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -23,4 +23,55 @@
         </Style.Triggers>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.TextBlock.Heading1.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="30" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Heading2.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Title.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI Light" />
+        <Setter Property="FontSize" Value="23"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="{DynamicResource SmallFontSize}"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="{DynamicResource SmallFontSize}"/>
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{DynamicResource FixedFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource FixedFontSize}"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.ModernWindowTitle.Mui" TargetType="TextBlock">
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.DataGrid" TargetType="TextBlock" >
+        <Setter Property="Margin" Value="2,0" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 617463444940d2d99ce0f1949dab72d835adebb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 11:59:42 +0200
Subject: [PATCH 22/36] MUI PasswordBox

---
 .../Styles/Controls.PasswordBox.xaml          | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 435706bffe..a2505cb794 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -861,4 +861,51 @@
         <Setter Property="FontSize" Value="15" />
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.PasswordBox.Mui" TargetType="{x:Type PasswordBox}" BasedOn="{x:Null}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2,1,1,1"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type PasswordBox}">
+                    <Border x:Name="Bd"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              Background="{TemplateBinding Background}"
+                              Padding="{TemplateBinding Padding}"
+                              SnapsToDevicePixels="true">
+                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
+                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From c1c66e9df6aa98437bd4a686498154305d66f715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 12:02:27 +0200
Subject: [PATCH 23/36] MUI ProgressBar

---
 .../Styles/Controls.ProgressBar.xaml          | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index c457d7afdb..05fd0f20fe 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -123,4 +123,141 @@
         </Setter>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.ProgressBar.Mui" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ProgressBackground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ProgressBar">
+                    <!-- TODO: MUI - Import controls or find replacement -->
+                    <!--<controls:RelativeAnimatingContentControl HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+                        <controls:RelativeAnimatingContentControl.Resources>
+                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseOut"/>
+                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseIn"/>
+                        </controls:RelativeAnimatingContentControl.Resources>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Determinate"/>
+                                <VisualState x:Name="Indeterminate">
+                                    <Storyboard RepeatBehavior="Forever" Duration="00:00:04.4">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="X" Storyboard.TargetName="R1TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="X" Storyboard.TargetName="R2TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="X" Storyboard.TargetName="R3TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="X" Storyboard.TargetName="R4TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="X" Storyboard.TargetName="R5TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R1">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R2">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R3">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R4">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R5">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid x:Name="Root">
+                            <Border x:Name="PART_Track"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" />
+                            <Grid x:Name="ProgressBarRootGrid">
+                                <Grid x:Name="IndeterminateRoot" Visibility="Collapsed" ClipToBounds="True">
+                                    <Grid HorizontalAlignment="Left">
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R1" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R1TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R2" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R2TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R3" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R3TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R4" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R4TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R5" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R5TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                    </Grid>
+                                </Grid>
+                                <Grid x:Name="DeterminateRoot">
+                                    <Border x:Name="PART_Indicator"
+                                        Background="{TemplateBinding Foreground}"
+                                        HorizontalAlignment="Left" />
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </controls:RelativeAnimatingContentControl>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="LayoutTransform" TargetName="Root">
+                                <Setter.Value>
+                                    <RotateTransform Angle="-90" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="true">
+                            <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible" />
+                            <Setter Property="Visibility" TargetName="DeterminateRoot" Value="Collapsed" />
+                            <Setter Property="Background" TargetName="PART_Track" Value="Transparent" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>-->
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From dc595924cef1e0f03cede1d9b34808a989ece78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 12:13:28 +0200
Subject: [PATCH 24/36] MUI ScrollBar

---
 .../Styles/Controls.Scrollbars.xaml           | 300 ++++++++++++++++++
 1 file changed, 300 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 4a2b0f5123..ffcd001290 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -286,4 +286,304 @@
         </Setter>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Rectangle x:Name="Rect" Fill="{DynamicResource MahApps.Brushes.ScrollBarThumbForeground.Mui}" Margin="{TemplateBinding Padding}" />
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundHover.Mui}"/>
+                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundHove.Muir}"/>
+                        </Trigger>
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundDragging.Mui}"/>
+                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundDragging.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBar.Mui"
+           TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              RecognizesAccessKey="True"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarPage.Mui" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle Fill="{TemplateBinding Background}"
+                               Width="{TemplateBinding Width}"
+                               Height="{TemplateBinding Height}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ScrollBar.Mui" TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarBackground.Mui}"/>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <Grid Name="Bg"
+                          Background="{TemplateBinding Background}"
+                          SnapsToDevicePixels="true" >
+                        <Grid.RowDefinitions>
+                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                            <RowDefinition Height="0.00001*"/>
+                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                        </Grid.RowDefinitions>
+                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                      IsEnabled="{TemplateBinding IsMouseOver}"
+                                      Command="{x:Static ScrollBar.LineUpCommand}"
+                                      Margin="0,0,0,-1">
+                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 4 L 3.5 0 L 7 4 Z" />
+                        </RepeatButton>
+                        <Track Grid.Row="1"
+                               Name="PART_Track"
+                               IsEnabled="{TemplateBinding IsMouseOver}"
+                               IsDirectionReversed="true">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageUpCommand}"/>
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageDownCommand}"/>
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="4,0" />
+                            </Track.Thumb>
+                        </Track>
+                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                      Grid.Row="2"
+                                      IsEnabled="{TemplateBinding IsMouseOver}"
+                                      Command="{x:Static ScrollBar.LineDownCommand}"
+                                      Margin="0,-1,0,0">
+                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 3.5 4 L 7 0 Z" />
+                        </RepeatButton>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="MinWidth" Value="0"/>
+                <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <Grid Name="Bg"
+                                  Background="{TemplateBinding Background}"
+                                  SnapsToDevicePixels="true" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                    <ColumnDefinition Width="0.00001*"/>
+                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                </Grid.ColumnDefinitions>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                              IsEnabled="{TemplateBinding IsMouseOver}"
+                                              Command="{x:Static ScrollBar.LineLeftCommand}"
+                                              Margin="0,0,-1,0">
+                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 3.5 L 4 7 L 4 0 Z" />
+                                </RepeatButton>
+                                <Track Grid.Column="1"
+                                       Name="PART_Track"
+                                       IsEnabled="{TemplateBinding IsMouseOver}"
+                                       IsDirectionReversed="False">
+                                    <Track.DecreaseRepeatButton>
+                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageLeftCommand}"/>
+                                    </Track.DecreaseRepeatButton>
+                                    <Track.IncreaseRepeatButton>
+                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageRightCommand}"/>
+                                    </Track.IncreaseRepeatButton>
+                                    <Track.Thumb>
+                                        <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="0,4" />
+                                    </Track.Thumb>
+                                </Track>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                              Grid.Column="2"
+                                              IsEnabled="{TemplateBinding IsMouseOver}"
+                                              Command="{x:Static ScrollBar.LineRightCommand}"
+                                              Margin="-1,0,0,0">
+                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 0 7 L 4 3.5 Z" />
+                                </RepeatButton>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ScrollViewer.Mui" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid Background="Transparent">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
+                                                    Margin="{TemplateBinding Padding}"
+                                                    Content="{TemplateBinding Content}"
+                                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                    CanContentScroll="{TemplateBinding CanContentScroll}"/>
+
+                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                                       Grid.Column="1"
+                                       Minimum="0.0"
+                                       Maximum="{TemplateBinding ScrollableHeight}"
+                                       ViewportSize="{TemplateBinding ViewportHeight}"
+                                       Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
+                                       Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                       Cursor="Arrow"
+                                       AutomationProperties.AutomationId="VerticalScrollBar"/>
+                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
+                                        Orientation="Horizontal"
+                                        Grid.Row="1"
+                                        Minimum="0.0"
+                                        Maximum="{TemplateBinding ScrollableWidth}"
+                                        ViewportSize="{TemplateBinding ViewportWidth}"
+                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
+                                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                        Cursor="Arrow"
+                                        AutomationProperties.AutomationId="HorizontalScrollBar"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static GridView.GridViewScrollViewerStyleKey}" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid Background="Transparent">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <DockPanel Margin="{TemplateBinding Padding}">
+                            <ScrollViewer DockPanel.Dock="Top"
+                            HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Hidden"
+                            Focusable="false">
+                                <GridViewHeaderRowPresenter Margin="2,0,2,0"
+                                            Columns="{Binding Path=TemplatedParent.View.Columns,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderTemplate="{Binding Path=TemplatedParent.View.ColumnHeaderTemplate,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderTemplateSelector="{Binding Path=TemplatedParent.View.ColumnHeaderTemplateSelector,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderStringFormat="{Binding Path=TemplatedParent.View.ColumnHeaderStringFormat,RelativeSource={RelativeSource TemplatedParent}}"
+                                            AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderContextMenu="{Binding Path=TemplatedParent.View.ColumnHeaderContextMenu,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderToolTip="{Binding Path=TemplatedParent.View.ColumnHeaderToolTip,RelativeSource={RelativeSource TemplatedParent}}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </ScrollViewer>
+                            <ScrollContentPresenter Name="PART_ScrollContentPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Local"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      CanContentScroll="{TemplateBinding CanContentScroll}"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </DockPanel>
+
+                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                           Grid.Column="1"
+                           Minimum="0.0"
+                           Maximum="{TemplateBinding ScrollableHeight}"
+                           ViewportSize="{TemplateBinding ViewportHeight}"
+                           Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
+                           Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                           Cursor="Arrow"
+                           AutomationProperties.AutomationId="VerticalScrollBar"/>
+                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
+                            Orientation="Horizontal"
+                            Grid.Row="1"
+                            Minimum="0.0"
+                            Maximum="{TemplateBinding ScrollableWidth}"
+                            ViewportSize="{TemplateBinding ViewportWidth}"
+                            Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
+                            Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                            Cursor="Arrow"
+                            AutomationProperties.AutomationId="HorizontalScrollBar"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>

From 2416409a982e3f5b70ba92c2ea466b57fbded2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 13:33:36 +0200
Subject: [PATCH 25/36] MUI Slider

---
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 286 ++++++++++++++++++
 1 file changed, 286 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index 611d2cce45..f538c780c9 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -539,4 +539,290 @@
         </Style.Triggers>
     </Style>
 
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.Mui" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Rectangle Fill="Transparent"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.BaseSlider.Mui" TargetType="Thumb">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDragging.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDragging.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDisabled.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.HorizontalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource MahApps.Styles.Thumb.BaseSlider.Mui}">
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Width" Value="11"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.VerticalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource  MahApps.Styles.Thumb.BaseSlider.Mui}">
+        <Setter Property="Height" Value="11"/>
+        <Setter Property="Width" Value="22"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Slider.Mui"  TargetType="Slider">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Slider">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"
+                                               MinHeight="{TemplateBinding Slider.MinHeight}"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <TickBar x:Name="TopTick"
+                                     Grid.Row="0"
+                                     Visibility="Collapsed"
+                                     Placement="Top"
+                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                     Height="4"/>
+                            <TickBar x:Name="BottomTick"
+                                     Grid.Row="2"
+                                     Visibility="Collapsed"
+                                     Placement="Bottom"
+                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                     Height="4"/>
+                            <Border x:Name="TrackBackground"
+                                    Grid.Row="1"
+                                    Margin="5,0"
+                                    VerticalAlignment="center"
+                                    BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
+                                    BorderThickness="1"
+                                    Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
+                                    Height="4.0">
+                                <Canvas Margin="-6,-1">
+                                    <Rectangle x:Name="PART_SelectionRange"
+                                               Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
+                                               Height="4.0"
+                                               Visibility="Hidden"
+                                               StrokeThickness="1.0"
+                                               Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
+                                </Canvas>
+                            </Border>
+                            <Track Grid.Row="1"
+                                   Name="PART_Track">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                  Command="{x:Static Slider.DecreaseLarge}"/>
+                                </Track.DecreaseRepeatButton>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                  Command="{x:Static Slider.IncreaseLarge}"/>
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb x:Name="Thumb"
+                                           Style="{StaticResource MahApps.Styles.Thumb.HorizontalSlider.Mui}"/>
+                                </Track.Thumb>
+                            </Track>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="TickPlacement"
+                                 Value="TopLeft">
+                            <Setter TargetName="TopTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="TrackBackground"
+                                    Property="Margin"
+                                    Value="5,2,5,0"/>
+                        </Trigger>
+                        <Trigger Property="TickPlacement"
+                                 Value="BottomRight">
+                            <Setter TargetName="BottomTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="TrackBackground"
+                                    Property="Margin"
+                                    Value="5,0,5,2"/>
+                        </Trigger>
+                        <Trigger Property="TickPlacement"
+                                 Value="Both">
+                            <Setter TargetName="TopTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="BottomTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsSelectionRangeEnabled"
+                                 Value="true">
+                            <Setter TargetName="PART_SelectionRange"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled"
+                                 Value="false">
+                            <Setter TargetName="TopTick"
+                                    Property="Fill"
+                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                            <Setter TargetName="BottomTick"
+                                    Property="Fill"
+                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation"
+                     Value="Vertical">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Slider}">
+                            <Border Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    SnapsToDevicePixels="true">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"
+                                                          MinWidth="{TemplateBinding Slider.MinWidth}"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TickBar x:Name="TopTick"
+                                             Grid.Column="0"
+                                             Visibility="Collapsed"
+                                             Placement="Left"
+                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                             Width="4"/>
+                                    <TickBar x:Name="BottomTick"
+                                             Grid.Column="2"
+                                             Visibility="Collapsed"
+                                             Placement="Right"
+                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                             Width="4"/>
+                                    <Border Name="TrackBackground"
+                                            Grid.Column="1"
+                                            Margin="0,5"
+                                            HorizontalAlignment="center"
+                                            BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
+                                            BorderThickness="1"
+                                            Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
+                                            Width="4.0">
+
+                                        <Canvas Margin="-1,-6">
+                                            <Rectangle x:Name="PART_SelectionRange"
+                                                       Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
+                                                       Width="4.0"
+                                                       Visibility="Hidden"
+                                                       StrokeThickness="1.0"
+                                                       Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
+                                        </Canvas>
+                                    </Border>
+
+                                    <Track Grid.Column="1"
+                                           Name="PART_Track">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                          Command="{x:Static Slider.DecreaseLarge}"/>
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                          Command="{x:Static Slider.IncreaseLarge}"/>
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb x:Name="Thumb"
+                                                   Style="{StaticResource MahApps.Styles.Thumb.VerticalSlider.Mui}"/>
+                                        </Track.Thumb>
+                                    </Track>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="TickPlacement"
+                                         Value="TopLeft">
+                                    <Setter TargetName="TopTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="TrackBackground"
+                                            Property="Margin"
+                                            Value="2,5,0,5"/>
+                                </Trigger>
+                                <Trigger Property="TickPlacement"
+                                         Value="BottomRight">
+                                    <Setter TargetName="BottomTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="TrackBackground"
+                                            Property="Margin"
+                                            Value="0,5,2,5"/>
+                                </Trigger>
+                                <Trigger Property="TickPlacement"
+                                         Value="Both">
+                                    <Setter TargetName="TopTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="BottomTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="IsSelectionRangeEnabled"
+                                         Value="true">
+                                    <Setter TargetName="PART_SelectionRange"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled"
+                                         Value="false">
+                                    <Setter TargetName="TopTick"
+                                            Property="Fill"
+                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                                    <Setter TargetName="BottomTick"
+                                            Property="Fill"
+                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From c5a4b4bcbad038b52c9ede1cd7b14db92ba709ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 13:44:14 +0200
Subject: [PATCH 26/36] MUI MenuItem

---
 .../Styles/Controls.MenuItem.xaml             | 224 ++++++++++++++++++
 1 file changed, 224 insertions(+)
 create mode 100644 src/MahApps.Metro/Styles/Controls.MenuItem.xaml

diff --git a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
new file mode 100644
index 0000000000..b898089ff9
--- /dev/null
+++ b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
@@ -0,0 +1,224 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- MUI -->
+
+    <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
+    <Geometry x:Key="Checkmark">M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z</Geometry>
+
+    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Separator}">
+                    <Grid SnapsToDevicePixels="true" Margin="8,4,8,4">
+                        <Rectangle Height="1"
+                                   Margin="0"
+                                   Fill="{DynamicResource SeparatorBackground}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}"
+                     TargetType="{x:Type MenuItem}">
+        <Grid SnapsToDevicePixels="true">
+            <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition MinWidth="24"
+                                      Width="Auto"
+                                      SharedSizeGroup="MenuItemIconColumnGroup"/>
+                    <ColumnDefinition Width="4"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="37"/>
+                    <ColumnDefinition Width="Auto"
+                                      SharedSizeGroup="MenuItemIGTColumnGroup"/>
+                    <ColumnDefinition Width="17"/>
+                </Grid.ColumnDefinitions>
+                <ContentPresenter x:Name="Icon"
+                                  Margin="1"
+                                  VerticalAlignment="Center"
+                                  ContentSource="Icon"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <Border x:Name="GlyphPanel"
+                        Visibility="Hidden">
+                    <Path Name="Glyph"
+                          Width="10"
+                          Height="10"
+                          Stretch="Fill"
+                          Fill="{DynamicResource MahApps.Brushes.WindowText.Mui}"
+                          FlowDirection="LeftToRight"
+                          Data="{StaticResource Checkmark}"/>
+                </Border>
+                <ContentPresenter Grid.Column="2"
+                                  ContentSource="Header"
+                                  Margin="0,2,8,2"
+                                  RecognizesAccessKey="True"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <TextBlock Grid.Column="4"
+                           Text="{TemplateBinding MenuItem.InputGestureText}"
+                           Margin="0,2"/>
+            </Grid>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="true">
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                <Setter TargetName="Glyph" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                <Setter TargetName="Glyph" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}"
+                     TargetType="{x:Type MenuItem}">
+        <Grid SnapsToDevicePixels="true">
+            <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition MinWidth="24"
+                                      Width="Auto"
+                                      SharedSizeGroup="MenuItemIconColumnGroup"/>
+                    <ColumnDefinition Width="4"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="37"/>
+                    <ColumnDefinition Width="Auto"
+                                      SharedSizeGroup="MenuItemIGTColumnGroup"/>
+                    <ColumnDefinition Width="17"/>
+                </Grid.ColumnDefinitions>
+                <ContentPresenter x:Name="Icon"
+                                  Margin="1"
+                                  VerticalAlignment="Center"
+                                  ContentSource="Icon"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <Border x:Name="GlyphPanel"
+                        Visibility="Hidden">
+                    <Path Name="Glyph"
+                          Width="10"
+                          Height="10"
+                          Stretch="Fill"
+                          Fill="{DynamicResource MahApps.Brushes.WindowText.Mui}"
+                          FlowDirection="LeftToRight"
+                          Data="{StaticResource Checkmark}"/>
+                </Border>
+                <ContentPresenter Grid.Column="2"
+                                  ContentSource="Header"
+                                  Margin="0,2,8,2"
+                                  RecognizesAccessKey="True"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <Path x:Name="RightArrow"
+                      Grid.Column="5"
+                      VerticalAlignment="Center"
+                      Margin="4,0,0,0"
+                      Fill="{TemplateBinding MenuItem.Foreground}"
+                      Data="{StaticResource RightArrow}"/>
+            </Grid>
+            <Popup x:Name="PART_Popup"
+                   AllowsTransparency="true"
+                   Placement="Right"
+                   VerticalOffset="-3"
+                   HorizontalOffset="-2"
+                   IsOpen="{Binding Path=IsSubmenuOpen,RelativeSource={RelativeSource TemplatedParent}}"
+                   Focusable="false"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
+                <Grid Margin="4" Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}">
+                    <Grid x:Name="Shdw">
+                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+                    </Grid>
+                    <Border x:Name="SubMenuBorder"
+                            Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                            BorderThickness="1"
+                            Margin="0,-1,0,0">
+                        <ScrollViewer Name="SubMenuScrollViewer" CanContentScroll="true" Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}">
+                            <Grid RenderOptions.ClearTypeHint="Enabled">
+                                <ItemsPresenter Name="ItemsPresenter"
+                                                KeyboardNavigation.TabNavigation="Cycle"
+                                                KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                Grid.IsSharedSizeScope="true"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Popup>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="true">
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                <Setter TargetName="Glyph" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                <Setter TargetName="RightArrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+            </Trigger>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+            </Trigger>
+            <Trigger SourceName="PART_Popup" Property="Popup.HasDropShadow" Value="true">
+                <Setter TargetName="Shdw" Property="Visibility" Value="Visible"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                <Setter TargetName="Glyph" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                <Setter TargetName="RightArrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="MahApps.Styles.MenuItem.Mui" TargetType="{x:Type MenuItem}">
+        <Setter Property="HorizontalContentAlignment"
+                Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment"
+                Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template"
+                Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}}"/>
+        <Style.Triggers>
+            <Trigger Property="Role"
+                     Value="TopLevelHeader">
+                <Setter Property="Padding"
+                        Value="7,2,8,2"/>
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="TopLevelItem">
+                <Setter Property="Padding"
+                        Value="7,2,8,2"/>
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="SubmenuHeader">
+                <Setter Property="Padding"
+                        Value="2,3,2,3"/>
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="SubmenuItem">
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file

From 3eea30a5a45892ce9d720af81493f3384020375b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 15:12:34 +0200
Subject: [PATCH 27/36] Merge new resource dictionaries

---
 src/MahApps.Metro/Styles/Controls.xaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index 2431fd7fde..6d040df5ae 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -35,6 +35,9 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TreeView.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.StatusBar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ToggleSwitch.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Hyperlink.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.GridSpliter.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.MenuItem.xaml" />
 
         <!--  Theme styles with keys  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroHeader.xaml" />

From bab3d98571a935a217b84af26962b9d1bc1e5afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Wed, 24 Jul 2019 14:07:51 +0200
Subject: [PATCH 28/36] Update size, font and shared names

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml     |  6 +++---
 src/MahApps.Metro/Styles/Controls.Calendar.xaml    |  6 +++---
 src/MahApps.Metro/Styles/Controls.ContextMenu.xaml |  4 ++--
 src/MahApps.Metro/Styles/Controls.DataGrid.xaml    |  4 ++--
 src/MahApps.Metro/Styles/Controls.TextBlock.xaml   |  8 ++++----
 src/MahApps.Metro/Styles/Controls.Tooltip.xaml     |  4 ++--
 src/MahApps.Metro/Styles/Fonts.xaml                | 10 +++++-----
 src/MahApps.Metro/Styles/Shared.xaml               | 14 --------------
 src/MahApps.Metro/Styles/Sizes.xaml                |  6 +++---
 9 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 9454bfb610..4bca11be93 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -1092,8 +1092,8 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.System.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
-        <Setter Property="Width" Value="{DynamicResource SystemButtonWidth}" />
-        <Setter Property="Height" Value="{DynamicResource SystemButtonHeight}" />
+        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.System.Width.Mui}" />
+        <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.Button.System.Height.Mui}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -1111,7 +1111,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.System.Close.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Mui}">
-        <Setter Property="Width" Value="{DynamicResource CloseButtonWidth}" />
+        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.Close.Width.Mui}" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackground.Mui}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 1cb09f929d..fdb4829ddc 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -602,7 +602,7 @@
                     <ControlTemplate.Resources>
                         <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
                             <TextBlock x:Name="Text" FontWeight="Bold"
-                                       FontSize="{DynamicResource DefaultFontSize}"
+                                       FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
                                        Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
                                        HorizontalAlignment="Center"
                                        Text="{Binding}"
@@ -722,7 +722,7 @@
     <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
         <Setter Property="MinWidth" Value="5"/>
         <Setter Property="MinHeight" Value="5"/>
-        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -786,7 +786,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
         <Setter Property="MinWidth" Value="40"/>
         <Setter Property="MinHeight" Value="42"/>
-        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index a6158a770d..8ed72b83bf 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -605,8 +605,8 @@
     <!-- MUI -->
 
     <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}"/>
-        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index 5a7ba1b7d4..2748442133 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -883,8 +883,8 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
         <Setter Property="Padding" Value="4,3,4,3"/>
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index 68c4973753..cf3138883b 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -46,20 +46,20 @@
 
     <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource SmallFontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource SmallFontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="{DynamicResource FixedFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource FixedFontSize}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Fixed.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index d884655628..830edbddf1 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -70,8 +70,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}"/>
-        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
         <Setter Property="FontStyle" Value="Normal"/>
         <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Padding" Value="5,1,5,4"/>
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index b90ed70b99..1e1284c89e 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -39,11 +39,11 @@
 
     <!-- MUI -->
 
-    <FontFamily x:Key="DefaultFontFamily">Segoe UI</FontFamily>
-    <FontFamily x:Key="FixedFontFamily">Consolas</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Default.Mui">Segoe UI</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Fixed.Mui">Consolas</FontFamily>
 
-    <System:Double x:Key="DefaultFontSize">13</System:Double>
-    <System:Double x:Key="FixedFontSize">13.333</System:Double>
-    <System:Double x:Key="SmallFontSize">11</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Fixed.Mui">13.333</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Small.Mui">11</System:Double>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Shared.xaml b/src/MahApps.Metro/Styles/Shared.xaml
index bdb0e0b098..addb2b5555 100644
--- a/src/MahApps.Metro/Styles/Shared.xaml
+++ b/src/MahApps.Metro/Styles/Shared.xaml
@@ -118,18 +118,4 @@
                          Duration="0:0:.2" />
     </Storyboard>
 
-    <!-- MUI -->
-
-    <Thickness x:Key="RootMargin">-42,-8,-16,-16</Thickness>
-    <Thickness x:Key="ContentMargin">16,28,16,16</Thickness>
-    <Thickness x:Key="StatusMargin">-16,16,0,0</Thickness>
-    <Thickness x:Key="HeaderMargin">0,-28,44,0</Thickness>
-
-    <Thickness x:Key="SplitLeft">0,0,0,0</Thickness>
-    <Thickness x:Key="SplitRight">16,0,0,0</Thickness>
-
-    <Style x:Key="ContentRoot" TargetType="FrameworkElement">
-        <Setter Property="Margin" Value="{StaticResource ContentMargin}" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Sizes.xaml b/src/MahApps.Metro/Styles/Sizes.xaml
index d48458064a..a94351b987 100644
--- a/src/MahApps.Metro/Styles/Sizes.xaml
+++ b/src/MahApps.Metro/Styles/Sizes.xaml
@@ -10,8 +10,8 @@
 
     <!-- MUI -->
 
-    <System:Double x:Key="CloseButtonWidth">32</System:Double>
-    <System:Double x:Key="SystemButtonHeight">24</System:Double>
-    <System:Double x:Key="SystemButtonWidth">32</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Button.Close.Width.Mui">32</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Button.System.Height.Mui">24</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Button.System.Width.Mui">32</System:Double>
 
 </ResourceDictionary>

From 9a4c115a035f263f8ee0b3660c0f6be98f5a8ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amaury.leve@gmail.com>
Date: Mon, 29 Jul 2019 16:44:16 +0200
Subject: [PATCH 29/36] Fix some mui style keys

---
 src/MahApps.Metro/Styles/Controls.ComboBox.xaml    |  2 +-
 src/MahApps.Metro/Styles/Controls.DataGrid.xaml    |  2 +-
 src/MahApps.Metro/Styles/Controls.GridSpliter.xaml |  2 ++
 src/MahApps.Metro/Styles/Controls.Hyperlink.xaml   |  7 ++++---
 src/MahApps.Metro/Styles/Controls.Label.xaml       |  2 ++
 src/MahApps.Metro/Styles/Controls.ListView.xaml    |  2 +-
 src/MahApps.Metro/Styles/Controls.MenuItem.xaml    | 10 +++++-----
 src/MahApps.Metro/Styles/Controls.Scrollbars.xaml  |  2 +-
 src/MahApps.Metro/Styles/Controls.TextBlock.xaml   |  2 +-
 src/MahApps.Metro/Styles/Controls.TextBox.xaml     |  2 --
 10 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index acc92e7482..451ee6703b 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -946,7 +946,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
+    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing.Mui" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
         <Setter Property="IsSynchronizedWithCurrentItem" Value="False" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Padding" Value="1,1" />
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index 2748442133..4a9f995971 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -702,7 +702,7 @@
 
     <!-- MUI -->
 
-    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}" TargetType="{x:Type Button}"
+    <Style x:Key="MahApps.Styles.Button.DataGridSelectAll.Mui" TargetType="{x:Type Button}"
            BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml b/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
index ca502cefef..897e8721b1 100644
--- a/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <!-- MUI -->
+
     <Style x:Key="MahApps.Styles.GridSplitter.Mui" TargetType="GridSplitter">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SeparatorBackground.Mui}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
diff --git a/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml b/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
index 692c19c346..d64d0a7f47 100644
--- a/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:MahApps.Metro.Styles">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
     <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Hyperlink.Mui}"/>
     <Setter Property="TextDecorations" Value="Underline"/>
     <Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index aa7a9a1074..c8df87d55f 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -40,6 +40,8 @@
         </Setter>
     </Style>
 
+    <!-- MUI -->
+
     <Style x:Key="MahApps.Styles.Label.Mui" TargetType="{x:Type Label}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
         <Setter Property="Background" Value="Transparent"/>
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 0506b5711b..dacf3fda5b 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -449,7 +449,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static GridView.GridViewStyleKey}" TargetType="{x:Type ListView}">
+    <Style x:Key="MahApps.Styles.ListView.GridView.Mui" TargetType="{x:Type ListView}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
diff --git a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
index b898089ff9..835eec675c 100644
--- a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
+++ b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
@@ -6,7 +6,7 @@
     <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
     <Geometry x:Key="Checkmark">M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z</Geometry>
 
-    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.MenuItem.Mui" TargetType="{x:Type Separator}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
@@ -20,8 +20,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}"
-                     TargetType="{x:Type MenuItem}">
+    <ControlTemplate x:Key="MahApps.Templates.MenuItem.SubMenuItem.Mui" TargetType="{x:Type MenuItem}">
         <Grid SnapsToDevicePixels="true">
             <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
             <Grid>
@@ -80,8 +79,8 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}"
-                     TargetType="{x:Type MenuItem}">
+
+    <ControlTemplate x:Key="MahApps.Templates.MenuItem.SubMenuHeader.Mui" TargetType="{x:Type MenuItem}">
         <Grid SnapsToDevicePixels="true">
             <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
             <Grid>
@@ -181,6 +180,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+
     <Style x:Key="MahApps.Styles.MenuItem.Mui" TargetType="{x:Type MenuItem}">
         <Setter Property="HorizontalContentAlignment"
                 Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index ffcd001290..ba32a7cb10 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -521,7 +521,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static GridView.GridViewScrollViewerStyleKey}" TargetType="{x:Type ScrollViewer}">
+    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Mui" TargetType="{x:Type ScrollViewer}">
         <Setter Property="Focusable" Value="false"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index cf3138883b..17654259ab 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -70,7 +70,7 @@
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBlock.DataGrid" TargetType="TextBlock" >
+    <Style x:Key="MahApps.Styles.TextBlock.DataGrid.Mui" TargetType="TextBlock" >
         <Setter Property="Margin" Value="2,0" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 2e2f6bf30b..6346a02542 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -1071,8 +1071,6 @@
 
     <Style x:Key="MahApps.Styles.RichTextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type RichTextBox}" />
 
-    <!-- text-in-datagrid styles-->
-
     <Style x:Key="MahApps.Styles.TextBox.DataGridEditing.Mui" TargetType="TextBox" BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Padding" Value="0" />

From 8835729e0973b651c0f5be20bd0cde8f6c082184 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 16 Nov 2019 13:12:36 +0100
Subject: [PATCH 30/36] Move MUI controls to Styles/MUI

- Styles/MUI/Controls.xaml contains all styles for MUI
- Styles/Controls.MUI.xaml sets all MUI styles to controls
---
 .../Styles/Controls.Buttons.xaml              | 169 --------
 .../Styles/Controls.Calendar.xaml             | 265 ------------
 .../Styles/Controls.CheckBox.xaml             |  74 ----
 .../Styles/Controls.ComboBox.xaml             | 267 ------------
 .../Styles/Controls.ContextMenu.xaml          |  47 ---
 .../Styles/Controls.DataGrid.xaml             | 389 -----------------
 .../Styles/Controls.DatePicker.xaml           | 169 --------
 .../Styles/Controls.Hyperlink.xaml            |  22 -
 src/MahApps.Metro/Styles/Controls.Label.xaml  |  31 --
 .../Styles/Controls.ListBox.xaml              |  73 ----
 .../Styles/Controls.ListView.xaml             | 177 --------
 src/MahApps.Metro/Styles/Controls.MUI.xaml    |  46 +++
 .../Styles/Controls.PasswordBox.xaml          |  47 ---
 .../Styles/Controls.ProgressBar.xaml          | 137 ------
 .../Styles/Controls.RadioButton.xaml          |  51 +--
 .../Styles/Controls.Scrollbars.xaml           | 300 --------------
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 286 -------------
 .../Styles/Controls.TextBlock.xaml            |  51 ---
 .../Styles/Controls.TextBox.xaml              | 108 -----
 .../Styles/Controls.Tooltip.xaml              |  38 --
 .../Styles/Controls.TreeView.xaml             | 161 --------
 src/MahApps.Metro/Styles/Controls.xaml        |   3 -
 src/MahApps.Metro/Styles/MUI/Button.xaml      | 172 ++++++++
 src/MahApps.Metro/Styles/MUI/Calendar.xaml    | 267 ++++++++++++
 src/MahApps.Metro/Styles/MUI/CheckBox.xaml    |  76 ++++
 src/MahApps.Metro/Styles/MUI/ComboBox.xaml    | 269 ++++++++++++
 src/MahApps.Metro/Styles/MUI/ContextMenu.xaml |  49 +++
 src/MahApps.Metro/Styles/MUI/Controls.xaml    |  29 ++
 src/MahApps.Metro/Styles/MUI/DataGrid.xaml    | 390 ++++++++++++++++++
 src/MahApps.Metro/Styles/MUI/DatePicker.xaml  | 171 ++++++++
 .../GridSplitter.xaml}                        |   2 -
 src/MahApps.Metro/Styles/MUI/Hyperlink.xaml   |  20 +
 src/MahApps.Metro/Styles/MUI/Label.xaml       |  33 ++
 src/MahApps.Metro/Styles/MUI/ListBox.xaml     |  75 ++++
 src/MahApps.Metro/Styles/MUI/ListView.xaml    | 179 ++++++++
 .../MenuItem.xaml}                            |   2 -
 src/MahApps.Metro/Styles/MUI/PasswordBox.xaml |  49 +++
 src/MahApps.Metro/Styles/MUI/ProgressBar.xaml | 139 +++++++
 src/MahApps.Metro/Styles/MUI/RadioButton.xaml |  50 +++
 src/MahApps.Metro/Styles/MUI/Scrollbars.xaml  | 302 ++++++++++++++
 src/MahApps.Metro/Styles/MUI/Slider.xaml      | 288 +++++++++++++
 src/MahApps.Metro/Styles/MUI/TextBlock.xaml   |  53 +++
 src/MahApps.Metro/Styles/MUI/TextBox.xaml     | 117 ++++++
 src/MahApps.Metro/Styles/MUI/Tooltip.xaml     |  40 ++
 src/MahApps.Metro/Styles/MUI/TreeView.xaml    | 163 ++++++++
 45 files changed, 2978 insertions(+), 2868 deletions(-)
 delete mode 100644 src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
 create mode 100644 src/MahApps.Metro/Styles/Controls.MUI.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Button.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Calendar.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/CheckBox.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/ComboBox.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Controls.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/DataGrid.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/DatePicker.xaml
 rename src/MahApps.Metro/Styles/{Controls.GridSpliter.xaml => MUI/GridSplitter.xaml} (97%)
 create mode 100644 src/MahApps.Metro/Styles/MUI/Hyperlink.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Label.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/ListBox.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/ListView.xaml
 rename src/MahApps.Metro/Styles/{Controls.MenuItem.xaml => MUI/MenuItem.xaml} (99%)
 create mode 100644 src/MahApps.Metro/Styles/MUI/PasswordBox.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/ProgressBar.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/RadioButton.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Scrollbars.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Slider.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/TextBlock.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/TextBox.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/Tooltip.xaml
 create mode 100644 src/MahApps.Metro/Styles/MUI/TreeView.xaml

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 4bca11be93..33a6c94fa8 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -1050,173 +1050,4 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Button.System.Base.Mui" TargetType="ButtonBase">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Border Name="Chrome"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                SnapsToDevicePixels="true">
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              RecognizesAccessKey="True"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.System.Alert.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Margin" Value="8"/>
-        <Setter Property="Padding" Value="4"/>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Opacity" Value=".7" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Opacity" Value=".4" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.System.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
-        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.System.Width.Mui}" />
-        <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.Button.System.Height.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundOnMoseOver.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundOnMoseOver.Mui}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundIsPressed.Mui}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.System.Close.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Mui}">
-        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.Close.Width.Mui}" />
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackground.Mui}" />
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundOnMoseOver.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundOnMoseOver.Mui}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundIsPressed.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundIsPressed.Mui}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.System.Link.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}" >
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonText.Mui}"/>
-        <Setter Property="Width" Value="NaN" />
-        <Setter Property="Height" Value="NaN" />
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Border Name="Chrome"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                SnapsToDevicePixels="true">
-                        <TextBlock DataContext="{TemplateBinding Content}"
-                                   Text="{Binding Converter={converters:ToUpperConverter}}"
-                                   Margin="{TemplateBinding Padding}"
-                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextHover.Mui}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextPressed.Mui}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextDisabled.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.Base.Mui" TargetType="{x:Type ButtonBase}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="16,3,16,5"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Border Name="Chrome"
-                                        Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        SnapsToDevicePixels="true">
-                        <ContentPresenter Name="Presenter" Margin="{TemplateBinding Padding}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          RecognizesAccessKey="True"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="Chrome" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ToggleButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type ToggleButton}"/>
-
-    <Style x:Key="MahApps.Styles.RepeatButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type RepeatButton}">
-        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Button.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type Button}"/>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index fdb4829ddc..6047a1ea3f 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -567,269 +567,4 @@
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Calendar.Mui" TargetType="Calendar">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ItemBorder.Mui}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton.Mui}" />
-        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton.Mui}" />
-        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem.Mui}" />
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Calendar">
-                    <StackPanel Name="PART_Root" HorizontalAlignment="Center">
-                        <CalendarItem
-                            Name="PART_CalendarItem"
-                            Style="{TemplateBinding CalendarItemStyle}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            />
-                    </StackPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.CalendarItem.Mui" TargetType="CalendarItem">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CalendarItem">
-                    <ControlTemplate.Resources>
-                        <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
-                            <TextBlock x:Name="Text" FontWeight="Bold"
-                                       FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
-                                       Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
-                                       HorizontalAlignment="Center"
-                                       Text="{Binding}"
-                                       Margin="0,6,0,6"
-                                       VerticalAlignment="Center"/>
-                        </DataTemplate>
-                    </ControlTemplate.Resources>
-                    <Grid Name="PART_Root" >
-                        <Border
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*" MinWidth="132"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <Button x:Name="PART_PreviousButton"
-                                        Grid.Row="0" Grid.Column="0"
-                                        Margin="-1,-1,0,0"
-                                        Padding="10,4,10,3"
-                                        Focusable="False">
-                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
-                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
-                                          Data="F1 M 0,0 1,1 1,-1 Z" />
-                                </Button>
-
-                                <Button x:Name="PART_NextButton"
-                                        Grid.Row="0" Grid.Column="2"
-                                        Margin="0,-1,-1,0"
-                                        Padding="10,4,10,3"
-                                        Focusable="False">
-                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
-                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
-                                          Data="F1 M 0,1 1,0 0,-1 Z" />
-                                </Button>
-
-                                <Button x:Name="PART_HeaderButton"
-                                        Grid.Row="0" Grid.Column="1"
-                                        Margin="-1,-1,-1,0"
-                                        HorizontalAlignment="Stretch" VerticalAlignment="Center"
-                                        FontWeight="Bold"
-                                        Focusable="False" />
-
-                                <Grid x:Name="PART_MonthView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Visible" Margin="8" HorizontalAlignment="Center">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                </Grid>
-
-                                <Grid x:Name="PART_YearView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Hidden" Margin="8" HorizontalAlignment="Center">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                </Grid>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Value="Year">
-                            <DataTrigger.Binding>
-                                <Binding Path="DisplayMode">
-                                    <Binding.RelativeSource>
-                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
-                                    </Binding.RelativeSource>
-                                </Binding>
-                            </DataTrigger.Binding>
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
-                        <DataTrigger Value="Decade">
-                            <DataTrigger.Binding>
-                                <Binding Path="DisplayMode">
-                                    <Binding.RelativeSource>
-                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
-                                    </Binding.RelativeSource>
-                                </Binding>
-                            </DataTrigger.Binding>
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
-        <Setter Property="MinWidth" Value="5"/>
-        <Setter Property="MinHeight" Value="5"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CalendarDayButton">
-                    <Grid Background="{TemplateBinding Background}">
-                        <ContentPresenter
-                                x:Name="NormalText"
-                                TextElement.Foreground="{TemplateBinding Foreground}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Margin="5,1,5,1" />
-                        <Path x:Name="Blackout" Opacity=".5" Visibility="Collapsed" Margin="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{TemplateBinding Foreground}" Stretch="Fill" Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"/>
-                        <Rectangle x:Name="DayButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
-                    </Grid>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsToday" Value="True">
-                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsInactive" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsBlackedOut" Value="True">
-                            <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.CalendarButton.Mui" TargetType="CalendarButton" >
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
-        <Setter Property="MinWidth" Value="40"/>
-        <Setter Property="MinHeight" Value="42"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CalendarButton">
-                    <Grid Background="{TemplateBinding Background}">
-                        <ContentPresenter x:Name="NormalText"
-                                          TextElement.Foreground="{TemplateBinding Foreground}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Margin="1,0,1,1" />
-                        <Rectangle x:Name="CalendarButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="HasSelectedDays" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsInactive" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 6a5d36dee0..dd9ae0c664 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -134,78 +134,4 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.CheckBox.Mui" TargetType="{x:Type CheckBox}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
-        <Setter Property="BorderThickness" Value="1" />
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <Path x:Name="CheckMark" Width="10" Height="10" Margin="2" Visibility="Collapsed" Stretch="Fill" Fill="{TemplateBinding Foreground}" Data="F1 M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z "/>
-                                <Rectangle x:Name="Indeterminate" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Hidden"/>
-                            </Grid>
-                        </Border>
-                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsThreeState}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="{x:Null}" />
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                            <Setter TargetName="CheckMark" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Visible" />
-                        </MultiDataTrigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
-                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
-                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- checkbox-in-datagrid styles-->
-    <Style x:Key="MahApps.Styles.CheckBox.DataGrid.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
-        <Setter Property="IsHitTestVisible" Value="False" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.CheckBox.DataGridEditing.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 451ee6703b..9c55dbd38b 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -685,271 +685,4 @@
         </Style.Triggers>
     </Style>
 
-    <!-- MUI -->
-
-    <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
-
-    <Style x:Key="MahApps.Styles.ComboBoxItem.Mui" TargetType="{x:Type ComboBoxItem}">
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Padding" Value="7,2,8,2"/>
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Border Name="Bd"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Padding="{TemplateBinding Padding}"
-                        SnapsToDevicePixels="true">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="true">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBox.ComboBoxEditable.Mui" TargetType="{x:Type TextBox}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="MinWidth" Value="0"/>
-        <Setter Property="MinHeight" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="MahApps.Templates.ComboBox.Editable.Mui" TargetType="{x:Type ComboBox}">
-        <Grid Name="MainGrid" SnapsToDevicePixels="true">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
-            </Grid.ColumnDefinitions>
-            <Popup Name="PART_Popup"
-                   AllowsTransparency="true"
-                   Grid.ColumnSpan="2"
-                   Placement="Bottom"
-                   Margin="1"
-                   IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
-                <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
-                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
-
-                    <Border x:Name="DropDownBorder"
-                            Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
-                            BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
-                            BorderThickness="1"
-                            Margin="0,-1,0,0">
-                        <!-- popup border thickness not dependent on BorderThickness property-->
-                        <ScrollViewer Name="DropDownScrollViewer">
-                            <Grid RenderOptions.ClearTypeHint="Enabled">
-                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                    <Rectangle
-                                        Name="OpaqueRect"
-                                        Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
-                                        Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
-                                        Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
-                                </Canvas>
-                                <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </Grid>
-                        </ScrollViewer>
-                    </Border>
-                </Grid>
-            </Popup>
-            <ToggleButton Grid.ColumnSpan="2"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                          Padding="0,0,0,10"/>
-
-            <Path Name="Arrow"
-                  Grid.ColumnSpan="2"
-                  Margin="3,1,8,0"
-                  Fill="{TemplateBinding Foreground}"
-                  Data="{DynamicResource DownArrowGeometry}"
-                  HorizontalAlignment="Right"
-                  VerticalAlignment="Center" IsHitTestVisible="False"/>
-            <TextBox x:Name="PART_EditableTextBox"
-                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                     IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                     Margin="{TemplateBinding Padding}"
-                     Padding="2,0,0,1"
-                     Style="{StaticResource MahApps.Styles.TextBox.ComboBoxEditable.Mui}"
-                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="HasItems" Value="false">
-                <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-            </Trigger>
-            <Trigger SourceName="PART_EditableTextBox" Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-            </Trigger>
-            <Trigger Property="IsGrouping" Value="true">
-                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-            </Trigger>
-            <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
-                <Setter TargetName="OpaqueRect"
-                        Property="Canvas.Top"
-                        Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
-                <Setter TargetName="OpaqueRect"
-                        Property="Canvas.Left"
-                        Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="MahApps.Styles.ComboBox.Mui" TargetType="{x:Type ComboBox}">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="Padding" Value="7,3,8,3"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ComboBox}">
-                    <Grid Name="MainGrid" SnapsToDevicePixels="true">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
-                        </Grid.ColumnDefinitions>
-                        <Popup Name="PART_Popup"
-                               AllowsTransparency="true"
-                               Grid.ColumnSpan="2"
-                               Placement="Bottom"
-                               Margin="1"
-                               IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
-                            <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                                <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
-                                <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
-
-                                <Border x:Name="DropDownBorder"
-                                        Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
-                                        BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
-                                        BorderThickness="1"
-                                        Margin="0,-1,0,0">
-                                    <!-- popup border thickness not dependent on BorderThickness property-->
-                                    <ScrollViewer Name="DropDownScrollViewer">
-                                        <Grid RenderOptions.ClearTypeHint="Enabled">
-                                            <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                                <Rectangle
-                                                    Name="OpaqueRect"
-                                                    Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
-                                                    Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
-                                                    Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
-                                            </Canvas>
-                                            <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                        </Grid>
-                                    </ScrollViewer>
-                                </Border>
-                            </Grid>
-                        </Popup>
-                        <ToggleButton Grid.ColumnSpan="2"
-                                      Background="{TemplateBinding Background}"
-                                      BorderBrush="{TemplateBinding BorderBrush}"
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                                      Padding="0,0,0,10"/>
-
-                        <Path Name="Arrow"
-                              Grid.ColumnSpan="2"
-                              Margin="3,1,8,0"
-                              Fill="{TemplateBinding Foreground}"
-                              Data="{DynamicResource DownArrowGeometry}"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Center" IsHitTestVisible="False"/>
-
-                        <ContentPresenter IsHitTestVisible="false"
-                                          Margin="{TemplateBinding Padding}"
-                                          Content="{TemplateBinding SelectionBoxItem}"
-                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                          ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsGrouping" Value="true">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-                        </Trigger>
-                        <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
-                            <Setter TargetName="OpaqueRect"
-                                    Property="Canvas.Top"
-                                    Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
-                            <Setter TargetName="OpaqueRect"
-                                    Property="Canvas.Left"
-                                    Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsEditable" Value="true">
-                <Setter Property="IsTabStop" Value="false"/>
-                <Setter Property="Padding" Value="3"/>
-                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ComboBox.Editable.Mui}"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing.Mui" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
-        <Setter Property="IsSynchronizedWithCurrentItem" Value="False" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="1,1" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 8ed72b83bf..7aa8cdfe61 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -602,51 +602,4 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="0,6,0,6"/>
-        <Setter Property="MinWidth" Value="150" />
-        <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Grid Margin="4">
-                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
-                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
-
-                        <Border x:Name="ContextMenuBorder"
-                                Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
-                                BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
-                                BorderThickness="1"
-                                Margin="0,-1,0,0">
-                            <ScrollViewer Name="ContextMenuScrollViewer">
-                                <Grid RenderOptions.ClearTypeHint="Enabled">
-                                    <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                        <Rectangle
-                                            Name="OpaqueRect"
-                                            Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"
-                                            Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"
-                                            Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />
-                                    </Canvas>
-                                    <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                </Grid>
-                            </ScrollViewer>
-                        </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index 4a9f995971..cedac1cb8c 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -700,393 +700,4 @@
         </Style.Triggers>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Button.DataGridSelectAll.Mui" TargetType="{x:Type Button}"
-           BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridColumnHeadersPresenter.Mui" TargetType="{x:Type DataGridColumnHeadersPresenter}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
-                    <Grid>
-                        <DataGridColumnHeader IsHitTestVisible="False" Name="PART_FillerColumnHeader"/>
-                        <ItemsPresenter />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
-        <Setter Property="Width" Value="8"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Cursor" Value="SizeWE"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper.Mui" TargetType="{x:Type Thumb}">
-        <Setter Property="Height" Value="8"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Cursor" Value="SizeNS"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Padding="{TemplateBinding Padding}"
-                      Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Control.ColumnFloatingHeader.Mui" TargetType="{x:Type Control}">
-        <Setter Property="Opacity" Value="0.6"></Setter>
-        <Setter Property="BorderThickness" Value="0"></Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Control}">
-                    <Border BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            Padding ="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}">
-                        <Grid>
-                            <Canvas Name="PART_VisualBrushCanvas" Margin="{TemplateBinding Margin}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Separator.ColumnHeaderDrop.Mui" TargetType="{x:Type Separator}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridDropSeparator.Mui}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True">
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridRow.Mui" TargetType="{x:Type DataGridRow}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-        <Setter Property="ValidationErrorTemplate">
-            <Setter.Value>
-                <ControlTemplate>
-                    <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Foreground="#FFdc000c" Text="!" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridRow}">
-                    <Border x:Name="DGR_Border"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True">
-                        <SelectiveScrollingGrid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <DataGridCellsPresenter Grid.Column="1"
-                                                    ItemsPanel="{TemplateBinding ItemsPanel}"
-                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-
-                            <DataGridDetailsPresenter  SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=AreRowDetailsFrozen, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}}"
-                                                       Grid.Column="1" Grid.Row="1"
-                                                       Visibility="{TemplateBinding DetailsVisibility}" />
-
-                            <DataGridRowHeader SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
-                                               Grid.RowSpan="2"
-                                               Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Row}}"/>
-                        </SelectiveScrollingGrid>
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridCellsPresenter.Mui" TargetType="{x:Type DataGridCellsPresenter}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridCellsPresenter}">
-                    <ItemsPresenter />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridCell.Mui" TargetType="{x:Type DataGridCell}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackground.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForeground.Mui}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="5,1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridCell}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="True">
-                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundHover.Mui}" />
-            </Trigger>
-            <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundSelected.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundSelected.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Mui" TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
-        <Setter Property="Padding" Value="4,3,4,3"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
-                    <Grid>
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}"
->
-                            <Grid x:Name="containerGrid" Margin="5" >
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <ContentPresenter Grid.Column="0"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                <Path x:Name="SortArrow"
-                                      Grid.Column="1"
-                                      HorizontalAlignment="Center" VerticalAlignment="Center"
-                                      Width="8" Height="6"  Margin="5,0,5,0"
-                                      Stretch="Fill" Opacity="0.5" Fill="{TemplateBinding Foreground}"
-                                      RenderTransformOrigin="0.5,0.4"
-                                      Visibility="Hidden"
-                                      Data="M0,0 L1,0 0.5,1 z" />
-                            </Grid>
-                        </Border>
-                        <Thumb x:Name="PART_LeftHeaderGripper"
-                               HorizontalAlignment="Left"
-                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
-                        <Thumb x:Name="PART_RightHeaderGripper"
-                               HorizontalAlignment="Right"
-                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-
-                        <Trigger Property="SortDirection" Value="Ascending">
-                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="SortArrow" Property="RenderTransform">
-                                <Setter.Value>
-                                    <RotateTransform Angle="180" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="SortDirection" Value="Descending">
-                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGridRowHeader.Mui" TargetType="{x:Type DataGridRowHeader}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
-        <Setter Property="Width" Value="16"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
-                    <Grid>
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding ="{TemplateBinding Padding}">
-
-                            <StackPanel Orientation="Horizontal">
-                                <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
-                                <Control SnapsToDevicePixels="false"
-                                         Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=(Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}}"
-                                         Template="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=ValidationErrorTemplate}" />
-                            </StackPanel>
-                        </Border>
-                        <Thumb x:Name="PART_TopHeaderGripper"
-                               VerticalAlignment="Top"
-                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
-                        <Thumb x:Name="PART_BottomHeaderGripper"
-                               VerticalAlignment="Bottom"
-                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
-            </Trigger>
-            <Trigger Property="IsRowSelected" Value="True">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui}" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundSelected.Mui}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DataGrid.Mui" TargetType="{x:Type DataGrid}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridBackground.Mui}"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridForeground.Mui}"/>
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
-        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
-        <Setter Property="DragIndicatorStyle" Value="{StaticResource MahApps.Styles.Control.ColumnFloatingHeader.Mui}" />
-        <Setter Property="DropLocationIndicatorStyle" Value="{StaticResource MahApps.Styles.Separator.ColumnHeaderDrop.Mui}" />
-        <Setter Property="GridLinesVisibility" Value="Horizontal" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DataGrid}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True"
-                            Padding="{TemplateBinding Padding}">
-                        <ScrollViewer Focusable="false" Name="DG_ScrollViewer">
-                            <ScrollViewer.Template>
-                                <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="Auto"/>
-                                        </Grid.RowDefinitions>
-
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}"
-                                                Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=CellsPanelHorizontalOffset}"
-                                                Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}}"
-                                                Focusable="false"
-                                                Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.All}}" />
-                                        <DataGridColumnHeadersPresenter Grid.Column="1"
-                                                                        Name="PART_ColumnHeadersPresenter"
-                                                                        Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Column}}"/>
-
-                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-                                        <ScrollBar Grid.Row="1" Grid.Column="2" Name="PART_VerticalScrollBar"
-                                                   Orientation="Vertical"
-                                                   Maximum="{TemplateBinding ScrollableHeight}"
-                                                   ViewportSize="{TemplateBinding ViewportHeight}"
-                                                   Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
-
-                                        <Grid Grid.Row="2" Grid.Column="1">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=NonFrozenColumnsViewportHorizontalOffset}"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <ScrollBar Grid.Column="1"
-                                                       Name="PART_HorizontalScrollBar"
-                                                       Orientation="Horizontal"
-                                                       Maximum="{TemplateBinding ScrollableWidth}"
-                                                       ViewportSize="{TemplateBinding ViewportWidth}"
-                                                       Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                                       Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-
-                                        </Grid>
-                                    </Grid>
-                                </ControlTemplate>
-                            </ScrollViewer.Template>
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsGrouping" Value="true">
-                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index c45418da23..94bc32275a 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -366,173 +366,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.DatePicker.Mui" TargetType="{x:Type DatePicker}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="IsTodayHighlighted" Value="True" />
-        <Setter Property="SelectedDateFormat" Value="Short" />
-        <Setter Property="Padding" Value="2,2,2,1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Focusable" Value="True" />
-
-        <Setter Property="CalendarStyle">
-            <Setter.Value>
-                <Style TargetType="Calendar" BasedOn="{StaticResource {x:Type Calendar}}">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="Calendar">
-                                <Grid Name="PART_Root" Margin="4" HorizontalAlignment="Center">
-                                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
-                                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
-
-                                    <CalendarItem Name="PART_CalendarItem"
-                                                  Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
-                                                  Style="{TemplateBinding CalendarItemStyle}"
-                                                  BorderThickness="0"
-                                                  Margin="1"/>
-
-                                    <Border BorderBrush="{DynamicResource MahApps.Brushes.Accent.Mui}" BorderThickness="1" />
-                                </Grid>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DatePicker}">
-                    <Border x:Name="LayoutRoot" BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
-                            Padding="{TemplateBinding Padding}">
-                        <Grid x:Name="PART_Root"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <!-- TODO: MUI - Replace or implement this control -->
-                            <!--<controls:ModernButton x:Name="PART_Button" Grid.Row="0" Grid.Column="1"
-                                                   Width="20"
-                                                   Margin="3,0,3,0"
-                                                   Padding="0"
-                                                   Focusable="False"
-                                                   VerticalAlignment="Top"
-                                                   HorizontalAlignment="Left"
-                                                   EllipseStrokeThickness="0"
-                                                   IconWidth="12" IconHeight="12"
-                                                   IconData="F1 M 34.0047,52.0073L 31.0042,52.0073L 31.0042,38.5053C 29.6649,39.8964 28.157,40.7849 26.3412,41.4502L 26.3412,37.7553C 27.2998,37.4474 28.3405,36.8645 29.4634,36.0068C 30.5862,35.149 31.3572,34.1483 31.7762,33.0046L 34.0047,33.0046L 34.0047,52.0073 Z M 45.0063,52.0073L 45.0063,48.0067L 37.0052,48.0067L 37.0052,45.0063L 45.0063,33.0046L 48.0067,33.0046L 48.0067,45.0063L 50.007,45.0063L 50.007,48.0067L 48.0067,48.0067L 48.0067,52.0073L 45.0063,52.0073 Z M 45.0063,45.0063L 45.0063,38.2555L 40.2556,45.0063L 45.0063,45.0063 Z M 18.0025,57.0082L 18.0025,23.0033L 23.0032,23.0033L 23.0032,20.0029C 23.0033,18.898 23.8988,18.0026 25.0035,18.0026L 29.004,18.0026C 30.1087,18.0026 31.0042,18.898 31.0043,20.0026L 31.0043,23.0033L 45.0063,23.0033L 45.0062,20.0026C 45.0062,18.8979 45.9018,18.0023 47.0065,18.0023L 51.0071,18.0023C 52.1118,18.0023 53.0074,18.8979 53.0074,20.0026L 53.0074,23.0033L 58.0081,23.0033L 58.0081,57.0082L 18.0025,57.0082 Z M 21.0029,54.0078L 55.0076,54.0078L 55.0076,31.0044L 21.0029,31.0044L 21.0029,54.0078 Z M 48.5067,20.0029C 47.6782,20.0029 47.0065,20.6746 47.0065,21.5031L 47.0065,24.5035C 47.0065,25.3321 47.6782,26.0038 48.5067,26.0038L 49.5068,26.0038C 50.3354,26.0038 51.007,25.3321 51.007,24.5035L 51.007,21.5031C 51.007,20.6746 50.3354,20.0029 49.5068,20.0029L 48.5067,20.0029 Z M 26.5037,20.0029C 25.6751,20.0029 25.0035,20.6745 25.0035,21.5031L 25.0035,24.5035C 25.0035,25.3321 25.6751,26.0037 26.5037,26.0037L 27.5038,26.0037C 28.3324,26.0037 29.004,25.3321 29.004,24.5035L 29.004,21.5031C 29.004,20.6745 28.3324,20.0029 27.5038,20.0029L 26.5037,20.0029 Z"/>-->
-
-                            <DatePickerTextBox x:Name="PART_TextBox"
-                                               Foreground="{TemplateBinding Foreground}"
-                                               HorizontalContentAlignment="Stretch"
-                                               VerticalContentAlignment="Center"
-                                               Focusable="{TemplateBinding Focusable}" />
-                            <Popup x:Name="PART_Popup"
-                                   PlacementTarget="{Binding ElementName=LayoutRoot}"
-                                   Placement="Bottom"
-                                   HorizontalOffset="-4"
-                                   VerticalOffset="-5"
-                                   StaysOpen="False"
-                                   AllowsTransparency="True" />
-                        </Grid>
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="PART_TextBox" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocusWithin" Value="true">
-                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.DatePickerTextBox.Mui" TargetType="{x:Type DatePickerTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="1,0,0,0" />
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DatePickerTextBox">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup Name="WatermarkStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Unwatermarked" />
-                                <VisualState Name="Watermarked">
-                                    <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Border x:Name="Border"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}">
-                            <Grid x:Name="WatermarkContent"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <Border x:Name="ContentElement" BorderThickness="0" Opacity="1" />
-                                <Border x:Name="watermark_decorator" BorderThickness="0">
-                                    <ContentControl x:Name="PART_Watermark"
-                                                    Opacity="0"
-                                                    Focusable="False"
-                                                    IsHitTestVisible="False"
-                                                    Margin="3,0"/>
-                                </Border>
-                                <ScrollViewer x:Name="PART_ContentHost"
-                                              Margin="0"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsReadOnly" Value="true">
-                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml b/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
deleted file mode 100644
index d64d0a7f47..0000000000
--- a/src/MahApps.Metro/Styles/Controls.Hyperlink.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
-    <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Hyperlink.Mui}"/>
-    <Setter Property="TextDecorations" Value="Underline"/>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkHover.Mui}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkDisabled.Mui}"/>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="True">
-        <Setter Property="Cursor" Value="Hand"/>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index c8df87d55f..0c4b2bbb53 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -40,35 +40,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Label.Mui" TargetType="{x:Type Label}">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Top"/>
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Label}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="true">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          RecognizesAccessKey="True"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowTextReadOnly.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 3729da1184..48fbb7f58e 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -156,77 +156,4 @@
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.ListBoxItem.Mui" TargetType="ListBoxItem">
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ListBoxItem.Flat.Mui" TargetType="ListBoxItem">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border Name="Bd"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="true">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
-                            <Setter Property="FontWeight" Value="Bold" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ListBox.Mui" TargetType="ListBox">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.Flat.Mui}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBox">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            Padding="{TemplateBinding Padding}">
-                        <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false"  >
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index dacf3fda5b..36de8ca04e 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -365,181 +365,4 @@
         </Style.Triggers>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.ListView.Mui" TargetType="ListView">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Canvas.Right" Value="-9"/>
-        <Setter Property="Width" Value="18"/>
-        <Setter Property="Height" Value="{Binding Path=ActualHeight,RelativeSource={RelativeSource TemplatedParent}}"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Padding="{TemplateBinding Padding}" Background="Transparent">
-                        <Rectangle HorizontalAlignment="Center" Width="1" Fill="{TemplateBinding Background}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.GridViewColumnHeader.Mui" TargetType="{x:Type GridViewColumnHeader}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Padding" Value="4,3,4,3"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
-                    <Grid SnapsToDevicePixels="true">
-                        <Border Name="HeaderBorder" BorderThickness="0" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition MaxHeight="7"/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Border Grid.RowSpan="2" Padding="{TemplateBinding Padding}">
-                                    <ContentPresenter Name="HeaderContent"
-                                    Margin="0,0,0,1"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    RecognizesAccessKey="True"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                </Border>
-                            </Grid>
-                        </Border>
-                        <Canvas>
-                            <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui}" Visibility="Collapsed"/>
-                        </Canvas>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
-                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent"/>
-                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="true">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}"/>
-                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden"/>
-                        </Trigger>
-                        <Trigger Property="Height" Value="Auto">
-                            <Setter Property="MinHeight" Value="20"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ListView.GridView.Mui" TargetType="{x:Type ListView}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListView}">
-                    <Border Name="Bd"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               SnapsToDevicePixels="true">
-                        <ScrollViewer Padding="{TemplateBinding Padding}">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </ScrollViewer>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsGrouping" Value="true">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ListViewItem.Mui" TargetType="{x:Type ListViewItem}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
-        <Setter Property="Padding" Value="5,2,5,2"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListViewItem}">
-                    <Grid Background="{TemplateBinding Background}">
-                        <Border Name="Selection" Visibility="Collapsed" />
-                        <!-- This is used when GridView is put inside the ListView -->
-                        <GridViewRowPresenter Grid.RowSpan="2"
-                                              Margin="{TemplateBinding Padding}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-
-                        <!-- This is used for ListView that does not use GridView -->
-                        <ContentPresenter x:Name="contentPresenter"
-                                          Margin="{TemplateBinding Padding}"
-                                          Content="{TemplateBinding ContentControl.Content}"
-                                          Visibility="Collapsed"
-                                          ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                                          ContentTemplateSelector="{TemplateBinding ContentControl.ContentTemplateSelector}"
-                                          ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
-                                          HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                                          SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="GridView.ColumnCollection" Value="{x:Null}">
-                            <Setter TargetName="contentPresenter" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
-                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
-                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.MUI.xaml b/src/MahApps.Metro/Styles/Controls.MUI.xaml
new file mode 100644
index 0000000000..b425cdd138
--- /dev/null
+++ b/src/MahApps.Metro/Styles/Controls.MUI.xaml
@@ -0,0 +1,46 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Controls.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.Mui}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Calendar.Mui}" TargetType="Calendar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBoxItem.Mui}" TargetType="ComboBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ContextMenu.Mui}" TargetType="ContextMenu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DataGrid.Mui}" TargetType="DataGrid" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePicker.Mui}" TargetType="DatePicker" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePickerTextBox.Mui}" TargetType="DatePickerTextBox" />
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.Expander}" TargetType="Expander" /> -->
+    <Style BasedOn="{StaticResource MahApps.Styles.GridSplitter.Mui}" TargetType="GridSplitter" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GridViewColumnHeader.Mui}" TargetType="GridViewColumnHeader" />
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.GroupBox}" TargetType="GroupBox" /> -->
+    <Style BasedOn="{StaticResource MahApps.Styles.Hyperlink.Mui}" TargetType="Hyperlink" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Label.Mui}" TargetType="Label" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Flat.Mui}" TargetType="ListBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Mui}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListViewItem.Mui}" TargetType="ListViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListView.Mui}" TargetType="ListView" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Mui}" TargetType="MenuItem" />
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.Menu}" TargetType="Menu" /> -->
+    <Style BasedOn="{StaticResource MahApps.Styles.PasswordBox.Mui}" TargetType="PasswordBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ProgressBar.Mui}" TargetType="ProgressBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RadioButton.Mui}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RepeatButton.Mui}" TargetType="RepeatButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox.Mui}" TargetType="RichTextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Mui}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollViewer.Mui}" TargetType="ScrollViewer" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Slider.Mui}" TargetType="Slider" />
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.StatusBarItem}" TargetType="StatusBarItem" /> -->
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.StatusBar}" TargetType="StatusBar" /> -->
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="TabControl" /> -->
+    <!-- <Style BasedOn="{StaticResource MahApps.Styles.TabItem}" TargetType="TabItem" /> -->
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton.Mui}" TargetType="ToggleButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToolTip.Mui}" TargetType="ToolTip" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeViewItem.Mui}" TargetType="TreeViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeView.Mui}" TargetType="TreeView" />
+
+</ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index a2505cb794..435706bffe 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -861,51 +861,4 @@
         <Setter Property="FontSize" Value="15" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.PasswordBox.Mui" TargetType="{x:Type PasswordBox}" BasedOn="{x:Null}">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,1,1,1"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type PasswordBox}">
-                    <Border x:Name="Bd"
-                              BorderThickness="{TemplateBinding BorderThickness}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              Padding="{TemplateBinding Padding}"
-                              SnapsToDevicePixels="true">
-                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
-                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index 05fd0f20fe..c457d7afdb 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -123,141 +123,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.ProgressBar.Mui" TargetType="ProgressBar">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ProgressBackground.Mui}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ProgressBar">
-                    <!-- TODO: MUI - Import controls or find replacement -->
-                    <!--<controls:RelativeAnimatingContentControl HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
-                        <controls:RelativeAnimatingContentControl.Resources>
-                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseOut"/>
-                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseIn"/>
-                        </controls:RelativeAnimatingContentControl.Resources>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Determinate"/>
-                                <VisualState x:Name="Indeterminate">
-                                    <Storyboard RepeatBehavior="Forever" Duration="00:00:04.4">
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="X" Storyboard.TargetName="R1TT">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
-                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="X" Storyboard.TargetName="R2TT">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
-                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="X" Storyboard.TargetName="R3TT">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
-                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="X" Storyboard.TargetName="R4TT">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
-                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="X" Storyboard.TargetName="R5TT">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
-                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
-                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R1">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
-                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R2">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
-                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R3">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
-                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R4">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
-                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R5">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
-                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="Root">
-                            <Border x:Name="PART_Track"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}" />
-                            <Grid x:Name="ProgressBarRootGrid">
-                                <Grid x:Name="IndeterminateRoot" Visibility="Collapsed" ClipToBounds="True">
-                                    <Grid HorizontalAlignment="Left">
-                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R1" Opacity="0">
-                                            <Rectangle.RenderTransform>
-                                                <TranslateTransform x:Name="R1TT"/>
-                                            </Rectangle.RenderTransform>
-                                        </Rectangle>
-                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R2" Opacity="0">
-                                            <Rectangle.RenderTransform>
-                                                <TranslateTransform x:Name="R2TT"/>
-                                            </Rectangle.RenderTransform>
-                                        </Rectangle>
-                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R3" Opacity="0">
-                                            <Rectangle.RenderTransform>
-                                                <TranslateTransform x:Name="R3TT"/>
-                                            </Rectangle.RenderTransform>
-                                        </Rectangle>
-                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R4" Opacity="0">
-                                            <Rectangle.RenderTransform>
-                                                <TranslateTransform x:Name="R4TT"/>
-                                            </Rectangle.RenderTransform>
-                                        </Rectangle>
-                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R5" Opacity="0">
-                                            <Rectangle.RenderTransform>
-                                                <TranslateTransform x:Name="R5TT"/>
-                                            </Rectangle.RenderTransform>
-                                        </Rectangle>
-                                    </Grid>
-                                </Grid>
-                                <Grid x:Name="DeterminateRoot">
-                                    <Border x:Name="PART_Indicator"
-                                        Background="{TemplateBinding Foreground}"
-                                        HorizontalAlignment="Left" />
-                                </Grid>
-                            </Grid>
-                        </Grid>
-                    </controls:RelativeAnimatingContentControl>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="Orientation" Value="Vertical">
-                            <Setter Property="LayoutTransform" TargetName="Root">
-                                <Setter.Value>
-                                    <RotateTransform Angle="-90" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsIndeterminate" Value="true">
-                            <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible" />
-                            <Setter Property="Visibility" TargetName="DeterminateRoot" Value="Collapsed" />
-                            <Setter Property="Background" TargetName="PART_Track" Value="Transparent" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>-->
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index dde32373ff..4af500dc30 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.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:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib">
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <!--  ********************************** RadioButton Style **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
@@ -110,52 +109,4 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.RadioButton.Mui" TargetType="{x:Type RadioButton}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0"
-                                Background="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"
-                                BorderBrush="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" BorderThickness="1">
-                            <Rectangle x:Name="CheckMark" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Collapsed"/>
-                        </Border>
-                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          VerticalAlignment="Center" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
-                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
-                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index ba32a7cb10..4a2b0f5123 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -286,304 +286,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.Mui" TargetType="{x:Type Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackground.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Rectangle x:Name="Rect" Fill="{DynamicResource MahApps.Brushes.ScrollBarThumbForeground.Mui}" Margin="{TemplateBinding Padding}" />
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundHover.Mui}"/>
-                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundHove.Muir}"/>
-                        </Trigger>
-                        <Trigger Property="IsDragging" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundDragging.Mui}"/>
-                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundDragging.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBar.Mui"
-           TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}">
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              RecognizesAccessKey="True"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarPage.Mui" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle Fill="{TemplateBinding Background}"
-                               Width="{TemplateBinding Width}"
-                               Height="{TemplateBinding Height}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ScrollBar.Mui" TargetType="{x:Type ScrollBar}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarBackground.Mui}"/>
-        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ScrollBar}">
-                    <Grid Name="Bg"
-                          Background="{TemplateBinding Background}"
-                          SnapsToDevicePixels="true" >
-                        <Grid.RowDefinitions>
-                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
-                            <RowDefinition Height="0.00001*"/>
-                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
-                        </Grid.RowDefinitions>
-                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
-                                      IsEnabled="{TemplateBinding IsMouseOver}"
-                                      Command="{x:Static ScrollBar.LineUpCommand}"
-                                      Margin="0,0,0,-1">
-                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 4 L 3.5 0 L 7 4 Z" />
-                        </RepeatButton>
-                        <Track Grid.Row="1"
-                               Name="PART_Track"
-                               IsEnabled="{TemplateBinding IsMouseOver}"
-                               IsDirectionReversed="true">
-                            <Track.DecreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageUpCommand}"/>
-                            </Track.DecreaseRepeatButton>
-                            <Track.IncreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageDownCommand}"/>
-                            </Track.IncreaseRepeatButton>
-                            <Track.Thumb>
-                                <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="4,0" />
-                            </Track.Thumb>
-                        </Track>
-                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
-                                      Grid.Row="2"
-                                      IsEnabled="{TemplateBinding IsMouseOver}"
-                                      Command="{x:Static ScrollBar.LineDownCommand}"
-                                      Margin="0,-1,0,0">
-                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 3.5 4 L 7 0 Z" />
-                        </RepeatButton>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Width" Value="Auto"/>
-                <Setter Property="MinWidth" Value="0"/>
-                <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
-                <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ScrollBar}">
-                            <Grid Name="Bg"
-                                  Background="{TemplateBinding Background}"
-                                  SnapsToDevicePixels="true" >
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
-                                    <ColumnDefinition Width="0.00001*"/>
-                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
-                                </Grid.ColumnDefinitions>
-                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
-                                              IsEnabled="{TemplateBinding IsMouseOver}"
-                                              Command="{x:Static ScrollBar.LineLeftCommand}"
-                                              Margin="0,0,-1,0">
-                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 3.5 L 4 7 L 4 0 Z" />
-                                </RepeatButton>
-                                <Track Grid.Column="1"
-                                       Name="PART_Track"
-                                       IsEnabled="{TemplateBinding IsMouseOver}"
-                                       IsDirectionReversed="False">
-                                    <Track.DecreaseRepeatButton>
-                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageLeftCommand}"/>
-                                    </Track.DecreaseRepeatButton>
-                                    <Track.IncreaseRepeatButton>
-                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageRightCommand}"/>
-                                    </Track.IncreaseRepeatButton>
-                                    <Track.Thumb>
-                                        <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="0,4" />
-                                    </Track.Thumb>
-                                </Track>
-                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
-                                              Grid.Column="2"
-                                              IsEnabled="{TemplateBinding IsMouseOver}"
-                                              Command="{x:Static ScrollBar.LineRightCommand}"
-                                              Margin="-1,0,0,0">
-                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 0 7 L 4 3.5 Z" />
-                                </RepeatButton>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ScrollViewer.Mui" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <Grid Background="Transparent">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
-                                                    Margin="{TemplateBinding Padding}"
-                                                    Content="{TemplateBinding Content}"
-                                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                    CanContentScroll="{TemplateBinding CanContentScroll}"/>
-
-                        <ScrollBar x:Name="PART_VerticalScrollBar"
-                                       Grid.Column="1"
-                                       Minimum="0.0"
-                                       Maximum="{TemplateBinding ScrollableHeight}"
-                                       ViewportSize="{TemplateBinding ViewportHeight}"
-                                       Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
-                                       Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                                       Cursor="Arrow"
-                                       AutomationProperties.AutomationId="VerticalScrollBar"/>
-                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
-                                        Orientation="Horizontal"
-                                        Grid.Row="1"
-                                        Minimum="0.0"
-                                        Maximum="{TemplateBinding ScrollableWidth}"
-                                        ViewportSize="{TemplateBinding ViewportWidth}"
-                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
-                                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                                        Cursor="Arrow"
-                                        AutomationProperties.AutomationId="HorizontalScrollBar"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Mui" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <Grid Background="Transparent">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <DockPanel Margin="{TemplateBinding Padding}">
-                            <ScrollViewer DockPanel.Dock="Top"
-                            HorizontalScrollBarVisibility="Hidden"
-                            VerticalScrollBarVisibility="Hidden"
-                            Focusable="false">
-                                <GridViewHeaderRowPresenter Margin="2,0,2,0"
-                                            Columns="{Binding Path=TemplatedParent.View.Columns,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderTemplate="{Binding Path=TemplatedParent.View.ColumnHeaderTemplate,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderTemplateSelector="{Binding Path=TemplatedParent.View.ColumnHeaderTemplateSelector,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderStringFormat="{Binding Path=TemplatedParent.View.ColumnHeaderStringFormat,RelativeSource={RelativeSource TemplatedParent}}"
-                                            AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderContextMenu="{Binding Path=TemplatedParent.View.ColumnHeaderContextMenu,RelativeSource={RelativeSource TemplatedParent}}"
-                                            ColumnHeaderToolTip="{Binding Path=TemplatedParent.View.ColumnHeaderToolTip,RelativeSource={RelativeSource TemplatedParent}}"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </ScrollViewer>
-                            <ScrollContentPresenter Name="PART_ScrollContentPresenter"
-                                      KeyboardNavigation.DirectionalNavigation="Local"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                                      CanContentScroll="{TemplateBinding CanContentScroll}"
-                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </DockPanel>
-
-                        <ScrollBar x:Name="PART_VerticalScrollBar"
-                           Grid.Column="1"
-                           Minimum="0.0"
-                           Maximum="{TemplateBinding ScrollableHeight}"
-                           ViewportSize="{TemplateBinding ViewportHeight}"
-                           Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
-                           Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                           Cursor="Arrow"
-                           AutomationProperties.AutomationId="VerticalScrollBar"/>
-                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
-                            Orientation="Horizontal"
-                            Grid.Row="1"
-                            Minimum="0.0"
-                            Maximum="{TemplateBinding ScrollableWidth}"
-                            ViewportSize="{TemplateBinding ViewportWidth}"
-                            Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
-                            Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                            Cursor="Arrow"
-                            AutomationProperties.AutomationId="HorizontalScrollBar"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index f538c780c9..611d2cce45 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -539,290 +539,4 @@
         </Style.Triggers>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.RepeatButton.Slider.Mui" TargetType="RepeatButton">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Rectangle Fill="Transparent"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Thumb.BaseSlider.Mui" TargetType="Thumb">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackground.Mui}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundHover.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderHover.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsDragging" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDragging.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDragging.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDisabled.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Thumb.HorizontalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource MahApps.Styles.Thumb.BaseSlider.Mui}">
-        <Setter Property="Height" Value="22"/>
-        <Setter Property="Width" Value="11"/>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Thumb.VerticalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource  MahApps.Styles.Thumb.BaseSlider.Mui}">
-        <Setter Property="Height" Value="11"/>
-        <Setter Property="Width" Value="22"/>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.Slider.Mui"  TargetType="Slider">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Slider">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="true">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"
-                                               MinHeight="{TemplateBinding Slider.MinHeight}"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <TickBar x:Name="TopTick"
-                                     Grid.Row="0"
-                                     Visibility="Collapsed"
-                                     Placement="Top"
-                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
-                                     Height="4"/>
-                            <TickBar x:Name="BottomTick"
-                                     Grid.Row="2"
-                                     Visibility="Collapsed"
-                                     Placement="Bottom"
-                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
-                                     Height="4"/>
-                            <Border x:Name="TrackBackground"
-                                    Grid.Row="1"
-                                    Margin="5,0"
-                                    VerticalAlignment="center"
-                                    BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
-                                    BorderThickness="1"
-                                    Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
-                                    Height="4.0">
-                                <Canvas Margin="-6,-1">
-                                    <Rectangle x:Name="PART_SelectionRange"
-                                               Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
-                                               Height="4.0"
-                                               Visibility="Hidden"
-                                               StrokeThickness="1.0"
-                                               Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
-                                </Canvas>
-                            </Border>
-                            <Track Grid.Row="1"
-                                   Name="PART_Track">
-                                <Track.DecreaseRepeatButton>
-                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
-                                                  Command="{x:Static Slider.DecreaseLarge}"/>
-                                </Track.DecreaseRepeatButton>
-                                <Track.IncreaseRepeatButton>
-                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
-                                                  Command="{x:Static Slider.IncreaseLarge}"/>
-                                </Track.IncreaseRepeatButton>
-                                <Track.Thumb>
-                                    <Thumb x:Name="Thumb"
-                                           Style="{StaticResource MahApps.Styles.Thumb.HorizontalSlider.Mui}"/>
-                                </Track.Thumb>
-                            </Track>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="TickPlacement"
-                                 Value="TopLeft">
-                            <Setter TargetName="TopTick"
-                                    Property="Visibility"
-                                    Value="Visible"/>
-                            <Setter TargetName="TrackBackground"
-                                    Property="Margin"
-                                    Value="5,2,5,0"/>
-                        </Trigger>
-                        <Trigger Property="TickPlacement"
-                                 Value="BottomRight">
-                            <Setter TargetName="BottomTick"
-                                    Property="Visibility"
-                                    Value="Visible"/>
-                            <Setter TargetName="TrackBackground"
-                                    Property="Margin"
-                                    Value="5,0,5,2"/>
-                        </Trigger>
-                        <Trigger Property="TickPlacement"
-                                 Value="Both">
-                            <Setter TargetName="TopTick"
-                                    Property="Visibility"
-                                    Value="Visible"/>
-                            <Setter TargetName="BottomTick"
-                                    Property="Visibility"
-                                    Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsSelectionRangeEnabled"
-                                 Value="true">
-                            <Setter TargetName="PART_SelectionRange"
-                                    Property="Visibility"
-                                    Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled"
-                                 Value="false">
-                            <Setter TargetName="TopTick"
-                                    Property="Fill"
-                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
-                            <Setter TargetName="BottomTick"
-                                    Property="Fill"
-                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Orientation"
-                     Value="Vertical">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type Slider}">
-                            <Border Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    SnapsToDevicePixels="true">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"
-                                                          MinWidth="{TemplateBinding Slider.MinWidth}"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TickBar x:Name="TopTick"
-                                             Grid.Column="0"
-                                             Visibility="Collapsed"
-                                             Placement="Left"
-                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
-                                             Width="4"/>
-                                    <TickBar x:Name="BottomTick"
-                                             Grid.Column="2"
-                                             Visibility="Collapsed"
-                                             Placement="Right"
-                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
-                                             Width="4"/>
-                                    <Border Name="TrackBackground"
-                                            Grid.Column="1"
-                                            Margin="0,5"
-                                            HorizontalAlignment="center"
-                                            BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
-                                            BorderThickness="1"
-                                            Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
-                                            Width="4.0">
-
-                                        <Canvas Margin="-1,-6">
-                                            <Rectangle x:Name="PART_SelectionRange"
-                                                       Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
-                                                       Width="4.0"
-                                                       Visibility="Hidden"
-                                                       StrokeThickness="1.0"
-                                                       Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
-                                        </Canvas>
-                                    </Border>
-
-                                    <Track Grid.Column="1"
-                                           Name="PART_Track">
-                                        <Track.DecreaseRepeatButton>
-                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
-                                                          Command="{x:Static Slider.DecreaseLarge}"/>
-                                        </Track.DecreaseRepeatButton>
-                                        <Track.IncreaseRepeatButton>
-                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
-                                                          Command="{x:Static Slider.IncreaseLarge}"/>
-                                        </Track.IncreaseRepeatButton>
-                                        <Track.Thumb>
-                                            <Thumb x:Name="Thumb"
-                                                   Style="{StaticResource MahApps.Styles.Thumb.VerticalSlider.Mui}"/>
-                                        </Track.Thumb>
-                                    </Track>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="TickPlacement"
-                                         Value="TopLeft">
-                                    <Setter TargetName="TopTick"
-                                            Property="Visibility"
-                                            Value="Visible"/>
-                                    <Setter TargetName="TrackBackground"
-                                            Property="Margin"
-                                            Value="2,5,0,5"/>
-                                </Trigger>
-                                <Trigger Property="TickPlacement"
-                                         Value="BottomRight">
-                                    <Setter TargetName="BottomTick"
-                                            Property="Visibility"
-                                            Value="Visible"/>
-                                    <Setter TargetName="TrackBackground"
-                                            Property="Margin"
-                                            Value="0,5,2,5"/>
-                                </Trigger>
-                                <Trigger Property="TickPlacement"
-                                         Value="Both">
-                                    <Setter TargetName="TopTick"
-                                            Property="Visibility"
-                                            Value="Visible"/>
-                                    <Setter TargetName="BottomTick"
-                                            Property="Visibility"
-                                            Value="Visible"/>
-                                </Trigger>
-                                <Trigger Property="IsSelectionRangeEnabled"
-                                         Value="true">
-                                    <Setter TargetName="PART_SelectionRange"
-                                            Property="Visibility"
-                                            Value="Visible"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled"
-                                         Value="false">
-                                    <Setter TargetName="TopTick"
-                                            Property="Fill"
-                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
-                                    <Setter TargetName="BottomTick"
-                                            Property="Fill"
-                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index 17654259ab..1de943a9e9 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -23,55 +23,4 @@
         </Style.Triggers>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.TextBlock.Heading1.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="30" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.Heading2.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.Title.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI Light" />
-        <Setter Property="FontSize" Value="23"/>
-        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Fixed.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.ModernWindowTitle.Mui" TargetType="TextBlock">
-        <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="TextWrapping" Value="NoWrap" />
-        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBlock.DataGrid.Mui" TargetType="TextBlock" >
-        <Setter Property="Margin" Value="2,0" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 6346a02542..763c948c5e 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -968,112 +968,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.TextBoxBase.Mui" TargetType="{x:Type TextBoxBase}" BasedOn="{x:Null}">
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,1,1,1"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-        <Setter Property="Validation.ErrorTemplate">
-            <Setter.Value>
-                <ControlTemplate>
-                    <StackPanel Orientation="Horizontal">
-                        <Border BorderThickness="1" BorderBrush="#FFdc000c" VerticalAlignment="Top">
-                            <Grid>
-                                <AdornedElementPlaceholder x:Name="adorner" Margin="-1"/>
-                            </Grid>
-                        </Border>
-                        <Border x:Name="errorBorder" Background="#FFdc000c" Margin="8,0,0,0"
-                                Opacity="0" CornerRadius="0"
-                                IsHitTestVisible="False"
-                                MinHeight="24" >
-                            <TextBlock Text="{Binding ElementName=adorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"
-                                       Foreground="White" Margin="8,2,8,3" TextWrapping="Wrap" VerticalAlignment="Center"/>
-                        </Border>
-                    </StackPanel>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Value="True">
-                            <DataTrigger.Binding>
-                                <Binding ElementName="adorner" Path="AdornedElement.IsKeyboardFocused" />
-                            </DataTrigger.Binding>
-                            <DataTrigger.EnterActions>
-                                <BeginStoryboard x:Name="fadeInStoryboard">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="00:00:00.15"
-                                                         Storyboard.TargetName="errorBorder"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         To="1"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </DataTrigger.EnterActions>
-                            <DataTrigger.ExitActions>
-                                <StopStoryboard BeginStoryboardName="fadeInStoryboard"/>
-                                <BeginStoryboard x:Name="fadeOutStoryBoard">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="00:00:00"
-                                                         Storyboard.TargetName="errorBorder"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         To="0"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </DataTrigger.ExitActions>
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBoxBase}">
-                    <Border x:Name="Bd"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="true">
-                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
-                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsReadOnly" Value="true">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="true">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsReadOnly" Value="False"/>
-                                <Condition Property="IsEnabled" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
-                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type TextBox}" />
-
-    <Style x:Key="MahApps.Styles.RichTextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type RichTextBox}" />
-
-    <Style x:Key="MahApps.Styles.TextBox.DataGridEditing.Mui" TargetType="TextBox" BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}">
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="0" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 830edbddf1..87e9709161 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -63,42 +63,4 @@
         </Setter>
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.ToolTip.Mui" TargetType="ToolTip">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
-        <Setter Property="FontStyle" Value="Normal"/>
-        <Setter Property="FontWeight" Value="Normal"/>
-        <Setter Property="Padding" Value="5,1,5,4"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HasDropShadow" Value="False"/>
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToolTip}">
-                    <Grid Margin="4">
-                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
-                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
-
-                        <Border Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                Padding="{TemplateBinding Padding}"
-                                CornerRadius="0">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index b852cce5d8..fc53e4bd56 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -240,165 +240,4 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <!-- MUI -->
-
-    <Style x:Key="MahApps.Styles.TreeView.Mui" TargetType="TreeView">
-        <Setter Property="BorderThickness" Value="0" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpandCollapse.Mui" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Width" Value="16"/>
-        <Setter Property="Height" Value="16"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border Width="16"
-                            Height="16"
-                            Background="Transparent"
-                            Padding="5,5,5,5" >
-                        <Path x:Name="ExpandPath"
-                              Stroke="#FF989898"
-                              StrokeThickness="1"
-                              Data="F1 M.5,.5, .5,6.5 6.5,.5 Z" UseLayoutRounding="True" SnapsToDevicePixels="True">
-                            <Path.RenderTransform>
-                                <RotateTransform Angle="135"
-                                                 CenterX="3"
-                                                 CenterY="3"/>
-                            </Path.RenderTransform>
-                        </Path>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <!--<Trigger Property="IsMouseOver"
-                                 Value="True">
-                            <Setter TargetName="ExpandPath"
-                                    Property="Stroke"
-                                    Value="{DynamicResource Accent}"/>
-                        </Trigger>-->
-
-                        <Trigger Property="IsChecked"
-                                 Value="True">
-                            <Setter TargetName="ExpandPath"
-                                    Property="RenderTransform">
-                                <Setter.Value>
-                                    <RotateTransform Angle="180"
-                                                     CenterX="3"
-                                                     CenterY="3"/>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter TargetName="ExpandPath"
-                                    Property="Fill"
-                                    Value="#FF595959"/>
-                            <Setter TargetName="ExpandPath"
-                                    Property="Stroke"
-                                    Value="#FF262626"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <!--<Setter TargetName="ExpandPath"
-                                    Property="Stroke"
-                                    Value="{DynamicResource Accent}"/>-->
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Rectangle />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MahApps.Styles.TreeViewItem.Mui" TargetType="{x:Type TreeViewItem}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="HorizontalContentAlignment"
-                Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment"
-                Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Padding" Value="4,2"/>
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="19"
-                                              Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition/>
-                        </Grid.RowDefinitions>
-
-                        <ToggleButton x:Name="Expander"
-                                      Style="{StaticResource MahApps.Styles.ToggleButton.ExpandCollapse.Mui}"
-                                      IsChecked="{Binding Path=IsExpanded,RelativeSource={RelativeSource TemplatedParent}}"
-                                      ClickMode="Press"/>
-                        <Border Name="Bd"
-                                Grid.Column="1"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}"
-                                SnapsToDevicePixels="true">
-
-                            <ContentPresenter x:Name="PART_Header"
-                                              ContentSource="Header"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                        <ItemsPresenter x:Name="ItemsHost"
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="2"/>
-
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="false">
-                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
-                        </Trigger>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
-                        </Trigger>
-                        <Trigger SourceName="Bd" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="VirtualizingStackPanel.IsVirtualizing"
-                 Value="true">
-                <Setter Property="ItemsPanel">
-                    <Setter.Value>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel/>
-                        </ItemsPanelTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index 6d040df5ae..2431fd7fde 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -35,9 +35,6 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TreeView.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.StatusBar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ToggleSwitch.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Hyperlink.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.GridSpliter.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.MenuItem.xaml" />
 
         <!--  Theme styles with keys  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroHeader.xaml" />
diff --git a/src/MahApps.Metro/Styles/MUI/Button.xaml b/src/MahApps.Metro/Styles/MUI/Button.xaml
new file mode 100644
index 0000000000..fbd8fe6bb8
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Button.xaml
@@ -0,0 +1,172 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+
+    <Style x:Key="MahApps.Styles.Button.System.Base.Mui" TargetType="ButtonBase">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                SnapsToDevicePixels="true">
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              RecognizesAccessKey="True"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Alert.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Margin" Value="8"/>
+        <Setter Property="Padding" Value="4"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Opacity" Value=".7" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Opacity" Value=".4" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}">
+        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.System.Width.Mui}" />
+        <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.Button.System.Height.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundOnMoseOver.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundOnMoseOver.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemButtonForegroundIsPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Close.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Mui}">
+        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.Button.Close.Width.Mui}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackground.Mui}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundOnMoseOver.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundOnMoseOver.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButtonBackgroundIsPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CloseButtonForegroundIsPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.System.Link.Mui" TargetType="ButtonBase" BasedOn="{StaticResource MahApps.Styles.Button.System.Base.Mui}" >
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonText.Mui}"/>
+        <Setter Property="Width" Value="NaN" />
+        <Setter Property="Height" Value="NaN" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="11" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                SnapsToDevicePixels="true">
+                        <TextBlock DataContext="{TemplateBinding Content}"
+                                   Text="{Binding Converter={converters:ToUpperConverter}}"
+                                   Margin="{TemplateBinding Padding}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextHover.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButtonTextDisabled.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.Base.Mui" TargetType="{x:Type ButtonBase}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="16,3,16,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Border Name="Chrome"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        SnapsToDevicePixels="true">
+                        <ContentPresenter Name="Presenter" Margin="{TemplateBinding Padding}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Chrome" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ToggleButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type ToggleButton}"/>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type RepeatButton}">
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Button.Mui" BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}" TargetType="{x:Type Button}"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/Calendar.xaml b/src/MahApps.Metro/Styles/MUI/Calendar.xaml
new file mode 100644
index 0000000000..ecab82f2f6
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Calendar.xaml
@@ -0,0 +1,267 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.Calendar.Mui" TargetType="Calendar">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ItemBorder.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton.Mui}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton.Mui}" />
+        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem.Mui}" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <StackPanel Name="PART_Root" HorizontalAlignment="Center">
+                        <CalendarItem
+                            Name="PART_CalendarItem"
+                            Style="{TemplateBinding CalendarItemStyle}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarItem.Mui" TargetType="CalendarItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <ControlTemplate.Resources>
+                        <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                            <TextBlock x:Name="Text" FontWeight="Bold"
+                                       FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
+                                       Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
+                                       HorizontalAlignment="Center"
+                                       Text="{Binding}"
+                                       Margin="0,6,0,6"
+                                       VerticalAlignment="Center"/>
+                        </DataTemplate>
+                    </ControlTemplate.Resources>
+                    <Grid Name="PART_Root" >
+                        <Border
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*" MinWidth="132"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton"
+                                        Grid.Row="0" Grid.Column="0"
+                                        Margin="-1,-1,0,0"
+                                        Padding="10,4,10,3"
+                                        Focusable="False">
+                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
+                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+                                          Data="F1 M 0,0 1,1 1,-1 Z" />
+                                </Button>
+
+                                <Button x:Name="PART_NextButton"
+                                        Grid.Row="0" Grid.Column="2"
+                                        Margin="0,-1,-1,0"
+                                        Padding="10,4,10,3"
+                                        Focusable="False">
+                                    <Path Height="10" Width="6" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Fill"
+                                          Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+                                          Data="F1 M 0,1 1,0 0,-1 Z" />
+                                </Button>
+
+                                <Button x:Name="PART_HeaderButton"
+                                        Grid.Row="0" Grid.Column="1"
+                                        Margin="-1,-1,-1,0"
+                                        HorizontalAlignment="Stretch" VerticalAlignment="Center"
+                                        FontWeight="Bold"
+                                        Focusable="False" />
+
+                                <Grid x:Name="PART_MonthView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Visible" Margin="8" HorizontalAlignment="Center">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+
+                                <Grid x:Name="PART_YearView" Grid.Row="1" Grid.ColumnSpan="3" Visibility="Hidden" Margin="8" HorizontalAlignment="Center">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Value="Year">
+                            <DataTrigger.Binding>
+                                <Binding Path="DisplayMode">
+                                    <Binding.RelativeSource>
+                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
+                                    </Binding.RelativeSource>
+                                </Binding>
+                            </DataTrigger.Binding>
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <DataTrigger Value="Decade">
+                            <DataTrigger.Binding>
+                                <Binding Path="DisplayMode">
+                                    <Binding.RelativeSource>
+                                        <RelativeSource Mode="FindAncestor" AncestorType="{x:Type Calendar}" />
+                                    </Binding.RelativeSource>
+                                </Binding>
+                            </DataTrigger.Binding>
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
+        <Setter Property="MinWidth" Value="5"/>
+        <Setter Property="MinHeight" Value="5"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter
+                                x:Name="NormalText"
+                                TextElement.Foreground="{TemplateBinding Foreground}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Margin="5,1,5,1" />
+                        <Path x:Name="Blackout" Opacity=".5" Visibility="Collapsed" Margin="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{TemplateBinding Foreground}" Stretch="Fill" Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"/>
+                        <Rectangle x:Name="DayButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CalendarButton.Mui" TargetType="CalendarButton" >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="42"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="NormalText"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="1,0,1,1" />
+                        <Rectangle x:Name="CalendarButtonFocusVisual" Visibility="Collapsed" IsHitTestVisible="false" Stroke="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="CalendarButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/CheckBox.xaml b/src/MahApps.Metro/Styles/MUI/CheckBox.xaml
new file mode 100644
index 0000000000..f54a93feb8
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/CheckBox.xaml
@@ -0,0 +1,76 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.CheckBox.Mui" TargetType="{x:Type CheckBox}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type CheckBox}">
+                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <Path x:Name="CheckMark" Width="10" Height="10" Margin="2" Visibility="Collapsed" Stretch="Fill" Fill="{TemplateBinding Foreground}" Data="F1 M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z "/>
+                                <Rectangle x:Name="Indeterminate" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Hidden"/>
+                            </Grid>
+                        </Border>
+                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsThreeState}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="{x:Null}" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Visible" />
+                        </MultiDataTrigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="Indeterminate" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- checkbox-in-datagrid styles-->
+    <Style x:Key="MahApps.Styles.CheckBox.DataGrid.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
+        <Setter Property="IsHitTestVisible" Value="False" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.CheckBox.DataGridEditing.Mui" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox.Mui}">
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/MUI/ComboBox.xaml b/src/MahApps.Metro/Styles/MUI/ComboBox.xaml
new file mode 100644
index 0000000000..30c947696a
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/ComboBox.xaml
@@ -0,0 +1,269 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+
+    <Style x:Key="MahApps.Styles.ComboBoxItem.Mui" TargetType="{x:Type ComboBoxItem}">
+        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Padding" Value="7,2,8,2"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border Name="Bd"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Padding="{TemplateBinding Padding}"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBox.ComboBoxEditable.Mui" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="MahApps.Templates.ComboBox.Editable.Mui" TargetType="{x:Type ComboBox}">
+        <Grid Name="MainGrid" SnapsToDevicePixels="true">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <Popup Name="PART_Popup"
+                   AllowsTransparency="true"
+                   Grid.ColumnSpan="2"
+                   Placement="Bottom"
+                   Margin="1"
+                   IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                    <Border x:Name="DropDownBorder"
+                            Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                            BorderThickness="1"
+                            Margin="0,-1,0,0">
+                        <!-- popup border thickness not dependent on BorderThickness property-->
+                        <ScrollViewer Name="DropDownScrollViewer">
+                            <Grid RenderOptions.ClearTypeHint="Enabled">
+                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                    <Rectangle
+                                        Name="OpaqueRect"
+                                        Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
+                                        Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
+                                        Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
+                                </Canvas>
+                                <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Popup>
+            <ToggleButton Grid.ColumnSpan="2"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                          Padding="0,0,0,10"/>
+
+            <Path Name="Arrow"
+                  Grid.ColumnSpan="2"
+                  Margin="3,1,8,0"
+                  Fill="{TemplateBinding Foreground}"
+                  Data="{DynamicResource DownArrowGeometry}"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center" IsHitTestVisible="False"/>
+            <TextBox x:Name="PART_EditableTextBox"
+                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                     Margin="{TemplateBinding Padding}"
+                     Padding="2,0,0,1"
+                     Style="{StaticResource MahApps.Styles.TextBox.ComboBoxEditable.Mui}"
+                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+            </Trigger>
+            <Trigger SourceName="PART_EditableTextBox" Property="IsFocused" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+            </Trigger>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </Trigger>
+            <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+                <Setter TargetName="OpaqueRect"
+                        Property="Canvas.Top"
+                        Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
+                <Setter TargetName="OpaqueRect"
+                        Property="Canvas.Left"
+                        Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="MahApps.Styles.ComboBox.Mui" TargetType="{x:Type ComboBox}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Padding" Value="7,3,8,3"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup Name="PART_Popup"
+                               AllowsTransparency="true"
+                               Grid.ColumnSpan="2"
+                               Placement="Bottom"
+                               Margin="1"
+                               IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Grid Margin="4" MinWidth="{Binding ElementName=MainGrid,Path=ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                                <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                                <Border x:Name="DropDownBorder"
+                                        Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                        BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                                        BorderThickness="1"
+                                        Margin="0,-1,0,0">
+                                    <!-- popup border thickness not dependent on BorderThickness property-->
+                                    <ScrollViewer Name="DropDownScrollViewer">
+                                        <Grid RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                                <Rectangle
+                                                    Name="OpaqueRect"
+                                                    Height="{Binding ElementName=DropDownBorder,Path=ActualHeight}"
+                                                    Width="{Binding ElementName=DropDownBorder,Path=ActualWidth}"
+                                                    Fill="{Binding ElementName=DropDownBorder,Path=Background}" />
+                                            </Canvas>
+                                            <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </Grid>
+                        </Popup>
+                        <ToggleButton Grid.ColumnSpan="2"
+                                      Background="{TemplateBinding Background}"
+                                      BorderBrush="{TemplateBinding BorderBrush}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                                      Padding="0,0,0,10"/>
+
+                        <Path Name="Arrow"
+                              Grid.ColumnSpan="2"
+                              Margin="3,1,8,0"
+                              Fill="{TemplateBinding Foreground}"
+                              Data="{DynamicResource DownArrowGeometry}"
+                              HorizontalAlignment="Right"
+                              VerticalAlignment="Center" IsHitTestVisible="False"/>
+
+                        <ContentPresenter IsHitTestVisible="false"
+                                          Margin="{TemplateBinding Padding}"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="Height" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Top"
+                                    Value="{Binding ElementName=DropDownScrollViewer, Path=VerticalOffset}" />
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Left"
+                                    Value="{Binding ElementName=DropDownScrollViewer, Path=HorizontalOffset}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false"/>
+                <Setter Property="Padding" Value="3"/>
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ComboBox.Editable.Mui}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing.Mui" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
+        <Setter Property="IsSynchronizedWithCurrentItem" Value="False" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="1,1" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
new file mode 100644
index 0000000000..8afde875f6
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
@@ -0,0 +1,49 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0,6,0,6"/>
+        <Setter Property="MinWidth" Value="150" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContextMenu}">
+                    <Grid Margin="4">
+                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                        <Border x:Name="ContextMenuBorder"
+                                Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"
+                                BorderThickness="1"
+                                Margin="0,-1,0,0">
+                            <ScrollViewer Name="ContextMenuScrollViewer">
+                                <Grid RenderOptions.ClearTypeHint="Enabled">
+                                    <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                        <Rectangle
+                                            Name="OpaqueRect"
+                                            Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"
+                                            Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"
+                                            Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />
+                                    </Canvas>
+                                    <ItemsPresenter Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                </Grid>
+                            </ScrollViewer>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/MUI/Controls.xaml b/src/MahApps.Metro/Styles/MUI/Controls.xaml
new file mode 100644
index 0000000000..f2a8e63bdc
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Controls.xaml
@@ -0,0 +1,29 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <!-- MUI -->
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Calendar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/CheckBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ComboBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ContextMenu.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/DataGrid.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/DatePicker.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/GridSplitter.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Hyperlink.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Label.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ListBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ListView.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/MenuItem.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/PasswordBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ProgressBar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/RadioButton.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Scrollbars.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Slider.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/TextBlock.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/TextBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Tooltip.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/TreeView.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
new file mode 100644
index 0000000000..05970dc175
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
@@ -0,0 +1,390 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.Button.DataGridSelectAll.Mui" TargetType="{x:Type Button}"
+           BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridColumnHeadersPresenter.Mui" TargetType="{x:Type DataGridColumnHeadersPresenter}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
+                    <Grid>
+                        <DataGridColumnHeader IsHitTestVisible="False" Name="PART_FillerColumnHeader"/>
+                        <ItemsPresenter />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="Height" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeNS"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}"
+                      Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Control.ColumnFloatingHeader.Mui" TargetType="{x:Type Control}">
+        <Setter Property="Opacity" Value="0.6"></Setter>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Control}">
+                    <Border BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding ="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}">
+                        <Grid>
+                            <Canvas Name="PART_VisualBrushCanvas" Margin="{TemplateBinding Margin}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Separator.ColumnHeaderDrop.Mui" TargetType="{x:Type Separator}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridDropSeparator.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Separator}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridRow.Mui" TargetType="{x:Type DataGridRow}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+        <Setter Property="ValidationErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Foreground="#FFdc000c" Text="!" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRow}">
+                    <Border x:Name="DGR_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                        <SelectiveScrollingGrid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <DataGridCellsPresenter Grid.Column="1"
+                                                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                            <DataGridDetailsPresenter  SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=AreRowDetailsFrozen, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}}"
+                                                       Grid.Column="1" Grid.Row="1"
+                                                       Visibility="{TemplateBinding DetailsVisibility}" />
+
+                            <DataGridRowHeader SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                                               Grid.RowSpan="2"
+                                               Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Row}}"/>
+                        </SelectiveScrollingGrid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridCellsPresenter.Mui" TargetType="{x:Type DataGridCellsPresenter}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridCellsPresenter}">
+                    <ItemsPresenter />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridCell.Mui" TargetType="{x:Type DataGridCell}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForeground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="5,1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridCell}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
+                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridCellBackgroundSelected.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridCellForegroundSelected.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Mui" TargetType="{x:Type DataGridColumnHeader}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="Padding" Value="4,3,4,3"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+>
+                            <Grid x:Name="containerGrid" Margin="5" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"
+                                      Width="8" Height="6"  Margin="5,0,5,0"
+                                      Stretch="Fill" Opacity="0.5" Fill="{TemplateBinding Foreground}"
+                                      RenderTransformOrigin="0.5,0.4"
+                                      Visibility="Hidden"
+                                      Data="M0,0 L1,0 0.5,1 z" />
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Mui}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGridRowHeader.Mui" TargetType="{x:Type DataGridRowHeader}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding ="{TemplateBinding Padding}">
+
+                            <StackPanel Orientation="Horizontal">
+                                <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                                <Control SnapsToDevicePixels="false"
+                                         Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=(Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}}"
+                                         Template="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}, Path=ValidationErrorTemplate}" />
+                            </StackPanel>
+                        </Border>
+                        <Thumb x:Name="PART_TopHeaderGripper"
+                               VerticalAlignment="Top"
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
+                        <Thumb x:Name="PART_BottomHeaderGripper"
+                               VerticalAlignment="Bottom"
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Mui}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundHover.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundPressed.Mui}" />
+            </Trigger>
+            <Trigger Property="IsRowSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForegroundSelected.Mui}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DataGrid.Mui" TargetType="{x:Type DataGrid}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGridBackground.Mui}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridForeground.Mui}"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
+        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.DataGridGridLines.Mui}" />
+        <Setter Property="DragIndicatorStyle" Value="{StaticResource MahApps.Styles.Control.ColumnFloatingHeader.Mui}" />
+        <Setter Property="DropLocationIndicatorStyle" Value="{StaticResource MahApps.Styles.Separator.ColumnHeaderDrop.Mui}" />
+        <Setter Property="GridLinesVisibility" Value="Horizontal" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGrid}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True"
+                            Padding="{TemplateBinding Padding}">
+                        <ScrollViewer Focusable="false" Name="DG_ScrollViewer">
+                            <ScrollViewer.Template>
+                                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto"/>
+                                        </Grid.RowDefinitions>
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}"
+                                                Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=CellsPanelHorizontalOffset}"
+                                                Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}}"
+                                                Focusable="false"
+                                                Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.All}}" />
+                                        <DataGridColumnHeadersPresenter Grid.Column="1"
+                                                                        Name="PART_ColumnHeadersPresenter"
+                                                                        Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=HeadersVisibility, Converter={x:Static DataGrid.HeadersVisibilityConverter}, ConverterParameter={x:Static DataGridHeadersVisibility.Column}}"/>
+
+                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" />
+
+                                        <ScrollBar Grid.Row="1" Grid.Column="2" Name="PART_VerticalScrollBar"
+                                                   Orientation="Vertical"
+                                                   Maximum="{TemplateBinding ScrollableHeight}"
+                                                   ViewportSize="{TemplateBinding ViewportHeight}"
+                                                   Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
+
+                                        <Grid Grid.Row="2" Grid.Column="1">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=NonFrozenColumnsViewportHorizontalOffset}"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </Grid.ColumnDefinitions>
+                                            <ScrollBar Grid.Column="1"
+                                                       Name="PART_HorizontalScrollBar"
+                                                       Orientation="Horizontal"
+                                                       Maximum="{TemplateBinding ScrollableWidth}"
+                                                       ViewportSize="{TemplateBinding ViewportWidth}"
+                                                       Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                       Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+
+                                        </Grid>
+                                    </Grid>
+                                </ControlTemplate>
+                            </ScrollViewer.Template>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/DatePicker.xaml b/src/MahApps.Metro/Styles/MUI/DatePicker.xaml
new file mode 100644
index 0000000000..19452eef70
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/DatePicker.xaml
@@ -0,0 +1,171 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.DatePicker.Mui" TargetType="{x:Type DatePicker}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="SelectedDateFormat" Value="Short" />
+        <Setter Property="Padding" Value="2,2,2,1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Focusable" Value="True" />
+
+        <Setter Property="CalendarStyle">
+            <Setter.Value>
+                <Style TargetType="Calendar" BasedOn="{StaticResource {x:Type Calendar}}">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Calendar">
+                                <Grid Name="PART_Root" Margin="4" HorizontalAlignment="Center">
+                                    <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                                    <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                                    <CalendarItem Name="PART_CalendarItem"
+                                                  Background="{DynamicResource MahApps.Brushes.PopupBackground.Mui}"
+                                                  Style="{TemplateBinding CalendarItemStyle}"
+                                                  BorderThickness="0"
+                                                  Margin="1"/>
+
+                                    <Border BorderBrush="{DynamicResource MahApps.Brushes.Accent.Mui}" BorderThickness="1" />
+                                </Grid>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DatePicker}">
+                    <Border x:Name="LayoutRoot" BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <!-- TODO: MUI - Replace or implement this control -->
+                            <!--<controls:ModernButton x:Name="PART_Button" Grid.Row="0" Grid.Column="1"
+                                                   Width="20"
+                                                   Margin="3,0,3,0"
+                                                   Padding="0"
+                                                   Focusable="False"
+                                                   VerticalAlignment="Top"
+                                                   HorizontalAlignment="Left"
+                                                   EllipseStrokeThickness="0"
+                                                   IconWidth="12" IconHeight="12"
+                                                   IconData="F1 M 34.0047,52.0073L 31.0042,52.0073L 31.0042,38.5053C 29.6649,39.8964 28.157,40.7849 26.3412,41.4502L 26.3412,37.7553C 27.2998,37.4474 28.3405,36.8645 29.4634,36.0068C 30.5862,35.149 31.3572,34.1483 31.7762,33.0046L 34.0047,33.0046L 34.0047,52.0073 Z M 45.0063,52.0073L 45.0063,48.0067L 37.0052,48.0067L 37.0052,45.0063L 45.0063,33.0046L 48.0067,33.0046L 48.0067,45.0063L 50.007,45.0063L 50.007,48.0067L 48.0067,48.0067L 48.0067,52.0073L 45.0063,52.0073 Z M 45.0063,45.0063L 45.0063,38.2555L 40.2556,45.0063L 45.0063,45.0063 Z M 18.0025,57.0082L 18.0025,23.0033L 23.0032,23.0033L 23.0032,20.0029C 23.0033,18.898 23.8988,18.0026 25.0035,18.0026L 29.004,18.0026C 30.1087,18.0026 31.0042,18.898 31.0043,20.0026L 31.0043,23.0033L 45.0063,23.0033L 45.0062,20.0026C 45.0062,18.8979 45.9018,18.0023 47.0065,18.0023L 51.0071,18.0023C 52.1118,18.0023 53.0074,18.8979 53.0074,20.0026L 53.0074,23.0033L 58.0081,23.0033L 58.0081,57.0082L 18.0025,57.0082 Z M 21.0029,54.0078L 55.0076,54.0078L 55.0076,31.0044L 21.0029,31.0044L 21.0029,54.0078 Z M 48.5067,20.0029C 47.6782,20.0029 47.0065,20.6746 47.0065,21.5031L 47.0065,24.5035C 47.0065,25.3321 47.6782,26.0038 48.5067,26.0038L 49.5068,26.0038C 50.3354,26.0038 51.007,25.3321 51.007,24.5035L 51.007,21.5031C 51.007,20.6746 50.3354,20.0029 49.5068,20.0029L 48.5067,20.0029 Z M 26.5037,20.0029C 25.6751,20.0029 25.0035,20.6745 25.0035,21.5031L 25.0035,24.5035C 25.0035,25.3321 25.6751,26.0037 26.5037,26.0037L 27.5038,26.0037C 28.3324,26.0037 29.004,25.3321 29.004,24.5035L 29.004,21.5031C 29.004,20.6745 28.3324,20.0029 27.5038,20.0029L 26.5037,20.0029 Z"/>-->
+
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Focusable="{TemplateBinding Focusable}" />
+                            <Popup x:Name="PART_Popup"
+                                   PlacementTarget="{Binding ElementName=LayoutRoot}"
+                                   Placement="Bottom"
+                                   HorizontalOffset="-4"
+                                   VerticalOffset="-5"
+                                   StaysOpen="False"
+                                   AllowsTransparency="True" />
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="PART_TextBox" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="true">
+                            <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.DatePickerTextBox.Mui" TargetType="{x:Type DatePickerTextBox}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="1,0,0,0" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="WatermarkStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Unwatermarked" />
+                                <VisualState Name="Watermarked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid x:Name="WatermarkContent"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                <Border x:Name="ContentElement" BorderThickness="0" Opacity="1" />
+                                <Border x:Name="watermark_decorator" BorderThickness="0">
+                                    <ContentControl x:Name="PART_Watermark"
+                                                    Opacity="0"
+                                                    Focusable="False"
+                                                    IsHitTestVisible="False"
+                                                    Margin="3,0"/>
+                                </Border>
+                                <ScrollViewer x:Name="PART_ContentHost"
+                                              Margin="0"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsReadOnly" Value="true">
+                            <Setter TargetName="PART_Watermark" Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml b/src/MahApps.Metro/Styles/MUI/GridSplitter.xaml
similarity index 97%
rename from src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
rename to src/MahApps.Metro/Styles/MUI/GridSplitter.xaml
index 897e8721b1..ca502cefef 100644
--- a/src/MahApps.Metro/Styles/Controls.GridSpliter.xaml
+++ b/src/MahApps.Metro/Styles/MUI/GridSplitter.xaml
@@ -1,8 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- MUI -->
-
     <Style x:Key="MahApps.Styles.GridSplitter.Mui" TargetType="GridSplitter">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SeparatorBackground.Mui}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
diff --git a/src/MahApps.Metro/Styles/MUI/Hyperlink.xaml b/src/MahApps.Metro/Styles/MUI/Hyperlink.xaml
new file mode 100644
index 0000000000..b4574e7d86
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Hyperlink.xaml
@@ -0,0 +1,20 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Hyperlink.Mui}"/>
+        <Setter Property="TextDecorations" Value="Underline"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkHover.Mui}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.HyperlinkDisabled.Mui}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="True">
+                <Setter Property="Cursor" Value="Hand"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/Label.xaml b/src/MahApps.Metro/Styles/MUI/Label.xaml
new file mode 100644
index 0000000000..31b1b02863
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Label.xaml
@@ -0,0 +1,33 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.Label.Mui" TargetType="{x:Type Label}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Label}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowTextReadOnly.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/ListBox.xaml b/src/MahApps.Metro/Styles/MUI/ListBox.xaml
new file mode 100644
index 0000000000..006d15cb7a
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/ListBox.xaml
@@ -0,0 +1,75 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.ListBoxItem.Mui" TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListBoxItem.Flat.Mui" TargetType="ListBoxItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}" />
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                            <Setter Property="FontWeight" Value="Bold" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListBox.Mui" TargetType="ListBox">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.Flat.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBox">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Padding="{TemplateBinding Padding}">
+                        <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false"  >
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/ListView.xaml b/src/MahApps.Metro/Styles/MUI/ListView.xaml
new file mode 100644
index 0000000000..c7f42feb6f
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/ListView.xaml
@@ -0,0 +1,179 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.ListView.Mui" TargetType="ListView">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Canvas.Right" Value="-9"/>
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="{Binding Path=ActualHeight,RelativeSource={RelativeSource TemplatedParent}}"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="Transparent">
+                        <Rectangle HorizontalAlignment="Center" Width="1" Fill="{TemplateBinding Background}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.GridViewColumnHeader.Mui" TargetType="{x:Type GridViewColumnHeader}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="4,3,4,3"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border Name="HeaderBorder" BorderThickness="0" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition MaxHeight="7"/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.RowSpan="2" Padding="{TemplateBinding Padding}">
+                                    <ContentPresenter Name="HeaderContent"
+                                    Margin="0,0,0,1"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                </Border>
+                            </Grid>
+                        </Border>
+                        <Canvas>
+                            <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource MahApps.Styles.Thumb.GridViewColumnHeaderGripper.Mui}" Visibility="Collapsed"/>
+                        </Canvas>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}"/>
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}"/>
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="Height" Value="Auto">
+                            <Setter Property="MinHeight" Value="20"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListView.GridView.Mui" TargetType="{x:Type ListView}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListView}">
+                    <Border Name="Bd"
+                               BorderThickness="{TemplateBinding BorderThickness}"
+                               BorderBrush="{TemplateBinding BorderBrush}"
+                               Background="{TemplateBinding Background}"
+                               SnapsToDevicePixels="true">
+                        <ScrollViewer Padding="{TemplateBinding Padding}">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListViewItem.Mui" TargetType="{x:Type ListViewItem}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="Padding" Value="5,2,5,2"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListViewItem}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Border Name="Selection" Visibility="Collapsed" />
+                        <!-- This is used when GridView is put inside the ListView -->
+                        <GridViewRowPresenter Grid.RowSpan="2"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+
+                        <!-- This is used for ListView that does not use GridView -->
+                        <ContentPresenter x:Name="contentPresenter"
+                                          Margin="{TemplateBinding Padding}"
+                                          Content="{TemplateBinding ContentControl.Content}"
+                                          Visibility="Collapsed"
+                                          ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentControl.ContentTemplateSelector}"
+                                          ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
+                                          HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
+                                          SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="GridView.ColumnCollection" Value="{x:Null}">
+                            <Setter TargetName="contentPresenter" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Selection" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Selection" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml b/src/MahApps.Metro/Styles/MUI/MenuItem.xaml
similarity index 99%
rename from src/MahApps.Metro/Styles/Controls.MenuItem.xaml
rename to src/MahApps.Metro/Styles/MUI/MenuItem.xaml
index 835eec675c..de3c5ad782 100644
--- a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
+++ b/src/MahApps.Metro/Styles/MUI/MenuItem.xaml
@@ -1,8 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- MUI -->
-
     <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
     <Geometry x:Key="Checkmark">M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z</Geometry>
 
diff --git a/src/MahApps.Metro/Styles/MUI/PasswordBox.xaml b/src/MahApps.Metro/Styles/MUI/PasswordBox.xaml
new file mode 100644
index 0000000000..89058ba5c7
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/PasswordBox.xaml
@@ -0,0 +1,49 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.PasswordBox.Mui" TargetType="{x:Type PasswordBox}" BasedOn="{x:Null}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2,1,1,1"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type PasswordBox}">
+                    <Border x:Name="Bd"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              Background="{TemplateBinding Background}"
+                              Padding="{TemplateBinding Padding}"
+                              SnapsToDevicePixels="true">
+                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
+                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/ProgressBar.xaml b/src/MahApps.Metro/Styles/MUI/ProgressBar.xaml
new file mode 100644
index 0000000000..1eeac7f001
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/ProgressBar.xaml
@@ -0,0 +1,139 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.ProgressBar.Mui" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ProgressBackground.Mui}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ProgressBar">
+                    <!-- TODO: MUI - Import controls or find replacement -->
+                    <!--<controls:RelativeAnimatingContentControl HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+                        <controls:RelativeAnimatingContentControl.Resources>
+                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseOut"/>
+                            <ExponentialEase EasingMode="EaseOut" Exponent="1" x:Key="ProgressBarEaseIn"/>
+                        </controls:RelativeAnimatingContentControl.Resources>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Determinate"/>
+                                <VisualState x:Name="Indeterminate">
+                                    <Storyboard RepeatBehavior="Forever" Duration="00:00:04.4">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="X" Storyboard.TargetName="R1TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="X" Storyboard.TargetName="R2TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="X" Storyboard.TargetName="R3TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="X" Storyboard.TargetName="R4TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="X" Storyboard.TargetName="R5TT">
+                                            <LinearDoubleKeyFrame KeyTime="00:00:00.0" Value="0.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:00.5" Value="33.1" EasingFunction="{StaticResource ProgressBarEaseOut}"/>
+                                            <LinearDoubleKeyFrame KeyTime="00:00:02.0" Value="66.1"/>
+                                            <EasingDoubleKeyFrame KeyTime="00:00:02.5" Value="100.1" EasingFunction="{StaticResource ProgressBarEaseIn}"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R1">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R2">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R3">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R4">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="R5">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1"/>
+                                            <DiscreteDoubleKeyFrame KeyTime="00:00:02.5" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid x:Name="Root">
+                            <Border x:Name="PART_Track"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" />
+                            <Grid x:Name="ProgressBarRootGrid">
+                                <Grid x:Name="IndeterminateRoot" Visibility="Collapsed" ClipToBounds="True">
+                                    <Grid HorizontalAlignment="Left">
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R1" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R1TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R2" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R2TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R3" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R3TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R4" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R4TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                        <Rectangle Fill="{TemplateBinding Foreground}" Height="4" IsHitTestVisible="False" Width="4" x:Name="R5" Opacity="0">
+                                            <Rectangle.RenderTransform>
+                                                <TranslateTransform x:Name="R5TT"/>
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                    </Grid>
+                                </Grid>
+                                <Grid x:Name="DeterminateRoot">
+                                    <Border x:Name="PART_Indicator"
+                                        Background="{TemplateBinding Foreground}"
+                                        HorizontalAlignment="Left" />
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </controls:RelativeAnimatingContentControl>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="LayoutTransform" TargetName="Root">
+                                <Setter.Value>
+                                    <RotateTransform Angle="-90" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="true">
+                            <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible" />
+                            <Setter Property="Visibility" TargetName="DeterminateRoot" Value="Collapsed" />
+                            <Setter Property="Background" TargetName="PART_Track" Value="Transparent" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>-->
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/RadioButton.xaml b/src/MahApps.Metro/Styles/MUI/RadioButton.xaml
new file mode 100644
index 0000000000..fd8e44c679
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/RadioButton.xaml
@@ -0,0 +1,50 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.RadioButton.Mui" TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border x:Name="CheckBorder" Width="16" Height="16" Margin="0,1,4,0"
+                                Background="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}" BorderThickness="1">
+                            <Rectangle x:Name="CheckMark" Width="8" Height="8" Margin="4" Fill="{TemplateBinding Foreground}" Visibility="Collapsed"/>
+                        </Border>
+                        <ContentPresenter Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                          VerticalAlignment="Center" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextDisabled.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="CheckBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter TargetName="CheckMark" Property="Fill" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="CheckBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/MUI/Scrollbars.xaml b/src/MahApps.Metro/Styles/MUI/Scrollbars.xaml
new file mode 100644
index 0000000000..73ea4dd52a
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Scrollbars.xaml
@@ -0,0 +1,302 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.Mui" TargetType="{x:Type Thumb}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Rectangle x:Name="Rect" Fill="{DynamicResource MahApps.Brushes.ScrollBarThumbForeground.Mui}" Margin="{TemplateBinding Padding}" />
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundHover.Mui}"/>
+                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbBackgroundDragging.Mui}"/>
+                            <Setter TargetName="Rect" Property="Fill" Value="{DynamicResource MahApps.Brushes.ScrollBarThumbForegroundDragging.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBar.Mui"
+           TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              RecognizesAccessKey="True"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundHover.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderHover.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextHover.Mui}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ButtonBackgroundPressed.Mui}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ButtonBorderPressed.Mui}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonTextPressed.Mui}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarPage.Mui" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle Fill="{TemplateBinding Background}"
+                               Width="{TemplateBinding Width}"
+                               Height="{TemplateBinding Height}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ScrollBar.Mui" TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBarBackground.Mui}"/>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <Grid Name="Bg"
+                          Background="{TemplateBinding Background}"
+                          SnapsToDevicePixels="true" >
+                        <Grid.RowDefinitions>
+                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                            <RowDefinition Height="0.00001*"/>
+                            <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                        </Grid.RowDefinitions>
+                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                      IsEnabled="{TemplateBinding IsMouseOver}"
+                                      Command="{x:Static ScrollBar.LineUpCommand}"
+                                      Margin="0,0,0,-1">
+                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 4 L 3.5 0 L 7 4 Z" />
+                        </RepeatButton>
+                        <Track Grid.Row="1"
+                               Name="PART_Track"
+                               IsEnabled="{TemplateBinding IsMouseOver}"
+                               IsDirectionReversed="true">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageUpCommand}"/>
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageDownCommand}"/>
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="4,0" />
+                            </Track.Thumb>
+                        </Track>
+                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                      Grid.Row="2"
+                                      IsEnabled="{TemplateBinding IsMouseOver}"
+                                      Command="{x:Static ScrollBar.LineDownCommand}"
+                                      Margin="0,-1,0,0">
+                            <Path Width="7" Height="4" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 3.5 4 L 7 0 Z" />
+                        </RepeatButton>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="MinWidth" Value="0"/>
+                <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <Grid Name="Bg"
+                                  Background="{TemplateBinding Background}"
+                                  SnapsToDevicePixels="true" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                    <ColumnDefinition Width="0.00001*"/>
+                                    <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                </Grid.ColumnDefinitions>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                              IsEnabled="{TemplateBinding IsMouseOver}"
+                                              Command="{x:Static ScrollBar.LineLeftCommand}"
+                                              Margin="0,0,-1,0">
+                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 3.5 L 4 7 L 4 0 Z" />
+                                </RepeatButton>
+                                <Track Grid.Column="1"
+                                       Name="PART_Track"
+                                       IsEnabled="{TemplateBinding IsMouseOver}"
+                                       IsDirectionReversed="False">
+                                    <Track.DecreaseRepeatButton>
+                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageLeftCommand}"/>
+                                    </Track.DecreaseRepeatButton>
+                                    <Track.IncreaseRepeatButton>
+                                        <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.Mui}" Command="{x:Static ScrollBar.PageRightCommand}"/>
+                                    </Track.IncreaseRepeatButton>
+                                    <Track.Thumb>
+                                        <Thumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.Mui}" Padding="0,4" />
+                                    </Track.Thumb>
+                                </Track>
+                                <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBar.Mui}"
+                                              Grid.Column="2"
+                                              IsEnabled="{TemplateBinding IsMouseOver}"
+                                              Command="{x:Static ScrollBar.LineRightCommand}"
+                                              Margin="-1,0,0,0">
+                                    <Path Width="4" Height="7" Stretch="Fill" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=RepeatButton}}" Data="M 0 0 L 0 7 L 4 3.5 Z" />
+                                </RepeatButton>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ScrollViewer.Mui" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid Background="Transparent">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
+                                                    Margin="{TemplateBinding Padding}"
+                                                    Content="{TemplateBinding Content}"
+                                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                    CanContentScroll="{TemplateBinding CanContentScroll}"/>
+
+                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                                       Grid.Column="1"
+                                       Minimum="0.0"
+                                       Maximum="{TemplateBinding ScrollableHeight}"
+                                       ViewportSize="{TemplateBinding ViewportHeight}"
+                                       Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
+                                       Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                       Cursor="Arrow"
+                                       AutomationProperties.AutomationId="VerticalScrollBar"/>
+                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
+                                        Orientation="Horizontal"
+                                        Grid.Row="1"
+                                        Minimum="0.0"
+                                        Maximum="{TemplateBinding ScrollableWidth}"
+                                        ViewportSize="{TemplateBinding ViewportWidth}"
+                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
+                                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                        Cursor="Arrow"
+                                        AutomationProperties.AutomationId="HorizontalScrollBar"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Mui" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid Background="Transparent">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <DockPanel Margin="{TemplateBinding Padding}">
+                            <ScrollViewer DockPanel.Dock="Top"
+                            HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Hidden"
+                            Focusable="false">
+                                <GridViewHeaderRowPresenter Margin="2,0,2,0"
+                                            Columns="{Binding Path=TemplatedParent.View.Columns,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderTemplate="{Binding Path=TemplatedParent.View.ColumnHeaderTemplate,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderTemplateSelector="{Binding Path=TemplatedParent.View.ColumnHeaderTemplateSelector,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderStringFormat="{Binding Path=TemplatedParent.View.ColumnHeaderStringFormat,RelativeSource={RelativeSource TemplatedParent}}"
+                                            AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderContextMenu="{Binding Path=TemplatedParent.View.ColumnHeaderContextMenu,RelativeSource={RelativeSource TemplatedParent}}"
+                                            ColumnHeaderToolTip="{Binding Path=TemplatedParent.View.ColumnHeaderToolTip,RelativeSource={RelativeSource TemplatedParent}}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </ScrollViewer>
+                            <ScrollContentPresenter Name="PART_ScrollContentPresenter"
+                                      KeyboardNavigation.DirectionalNavigation="Local"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      CanContentScroll="{TemplateBinding CanContentScroll}"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </DockPanel>
+
+                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                           Grid.Column="1"
+                           Minimum="0.0"
+                           Maximum="{TemplateBinding ScrollableHeight}"
+                           ViewportSize="{TemplateBinding ViewportHeight}"
+                           Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=VerticalOffset, Mode=OneWay}"
+                           Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                           Cursor="Arrow"
+                           AutomationProperties.AutomationId="VerticalScrollBar"/>
+                        <ScrollBar  x:Name="PART_HorizontalScrollBar"
+                            Orientation="Horizontal"
+                            Grid.Row="1"
+                            Minimum="0.0"
+                            Maximum="{TemplateBinding ScrollableWidth}"
+                            ViewportSize="{TemplateBinding ViewportWidth}"
+                            Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}"
+                            Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                            Cursor="Arrow"
+                            AutomationProperties.AutomationId="HorizontalScrollBar"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/MUI/Slider.xaml b/src/MahApps.Metro/Styles/MUI/Slider.xaml
new file mode 100644
index 0000000000..b832482b29
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Slider.xaml
@@ -0,0 +1,288 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.Mui" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Rectangle Fill="Transparent"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.BaseSlider.Mui" TargetType="Thumb">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackground.Mui}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDragging.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDragging.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderThumbBackgroundDisabled.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumbBorderDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.HorizontalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource MahApps.Styles.Thumb.BaseSlider.Mui}">
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Width" Value="11"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Thumb.VerticalSlider.Mui" TargetType="Thumb" BasedOn="{StaticResource  MahApps.Styles.Thumb.BaseSlider.Mui}">
+        <Setter Property="Height" Value="11"/>
+        <Setter Property="Width" Value="22"/>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.Slider.Mui"  TargetType="Slider">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Slider">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"
+                                               MinHeight="{TemplateBinding Slider.MinHeight}"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <TickBar x:Name="TopTick"
+                                     Grid.Row="0"
+                                     Visibility="Collapsed"
+                                     Placement="Top"
+                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                     Height="4"/>
+                            <TickBar x:Name="BottomTick"
+                                     Grid.Row="2"
+                                     Visibility="Collapsed"
+                                     Placement="Bottom"
+                                     Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                     Height="4"/>
+                            <Border x:Name="TrackBackground"
+                                    Grid.Row="1"
+                                    Margin="5,0"
+                                    VerticalAlignment="center"
+                                    BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
+                                    BorderThickness="1"
+                                    Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
+                                    Height="4.0">
+                                <Canvas Margin="-6,-1">
+                                    <Rectangle x:Name="PART_SelectionRange"
+                                               Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
+                                               Height="4.0"
+                                               Visibility="Hidden"
+                                               StrokeThickness="1.0"
+                                               Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
+                                </Canvas>
+                            </Border>
+                            <Track Grid.Row="1"
+                                   Name="PART_Track">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                  Command="{x:Static Slider.DecreaseLarge}"/>
+                                </Track.DecreaseRepeatButton>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                  Command="{x:Static Slider.IncreaseLarge}"/>
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb x:Name="Thumb"
+                                           Style="{StaticResource MahApps.Styles.Thumb.HorizontalSlider.Mui}"/>
+                                </Track.Thumb>
+                            </Track>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="TickPlacement"
+                                 Value="TopLeft">
+                            <Setter TargetName="TopTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="TrackBackground"
+                                    Property="Margin"
+                                    Value="5,2,5,0"/>
+                        </Trigger>
+                        <Trigger Property="TickPlacement"
+                                 Value="BottomRight">
+                            <Setter TargetName="BottomTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="TrackBackground"
+                                    Property="Margin"
+                                    Value="5,0,5,2"/>
+                        </Trigger>
+                        <Trigger Property="TickPlacement"
+                                 Value="Both">
+                            <Setter TargetName="TopTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                            <Setter TargetName="BottomTick"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsSelectionRangeEnabled"
+                                 Value="true">
+                            <Setter TargetName="PART_SelectionRange"
+                                    Property="Visibility"
+                                    Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled"
+                                 Value="false">
+                            <Setter TargetName="TopTick"
+                                    Property="Fill"
+                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                            <Setter TargetName="BottomTick"
+                                    Property="Fill"
+                                    Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation"
+                     Value="Vertical">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Slider}">
+                            <Border Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    SnapsToDevicePixels="true">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"
+                                                          MinWidth="{TemplateBinding Slider.MinWidth}"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TickBar x:Name="TopTick"
+                                             Grid.Column="0"
+                                             Visibility="Collapsed"
+                                             Placement="Left"
+                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                             Width="4"/>
+                                    <TickBar x:Name="BottomTick"
+                                             Grid.Column="2"
+                                             Visibility="Collapsed"
+                                             Placement="Right"
+                                             Fill="{DynamicResource MahApps.Brushes.SliderTick.Mui}"
+                                             Width="4"/>
+                                    <Border Name="TrackBackground"
+                                            Grid.Column="1"
+                                            Margin="0,5"
+                                            HorizontalAlignment="center"
+                                            BorderBrush="{DynamicResource MahApps.Brushes.SliderTrackBorder.Mui}"
+                                            BorderThickness="1"
+                                            Background="{DynamicResource MahApps.Brushes.SliderTrackBackground.Mui}"
+                                            Width="4.0">
+
+                                        <Canvas Margin="-1,-6">
+                                            <Rectangle x:Name="PART_SelectionRange"
+                                                       Fill="{DynamicResource MahApps.Brushes.SliderSelectionBackground.Mui}"
+                                                       Width="4.0"
+                                                       Visibility="Hidden"
+                                                       StrokeThickness="1.0"
+                                                       Stroke="{DynamicResource MahApps.Brushes.SliderSelectionBorder.Mui}"/>
+                                        </Canvas>
+                                    </Border>
+
+                                    <Track Grid.Column="1"
+                                           Name="PART_Track">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                          Command="{x:Static Slider.DecreaseLarge}"/>
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Style="{StaticResource MahApps.Styles.RepeatButton.Slider.Mui}"
+                                                          Command="{x:Static Slider.IncreaseLarge}"/>
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb x:Name="Thumb"
+                                                   Style="{StaticResource MahApps.Styles.Thumb.VerticalSlider.Mui}"/>
+                                        </Track.Thumb>
+                                    </Track>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="TickPlacement"
+                                         Value="TopLeft">
+                                    <Setter TargetName="TopTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="TrackBackground"
+                                            Property="Margin"
+                                            Value="2,5,0,5"/>
+                                </Trigger>
+                                <Trigger Property="TickPlacement"
+                                         Value="BottomRight">
+                                    <Setter TargetName="BottomTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="TrackBackground"
+                                            Property="Margin"
+                                            Value="0,5,2,5"/>
+                                </Trigger>
+                                <Trigger Property="TickPlacement"
+                                         Value="Both">
+                                    <Setter TargetName="TopTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                    <Setter TargetName="BottomTick"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="IsSelectionRangeEnabled"
+                                         Value="true">
+                                    <Setter TargetName="PART_SelectionRange"
+                                            Property="Visibility"
+                                            Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled"
+                                         Value="false">
+                                    <Setter TargetName="TopTick"
+                                            Property="Fill"
+                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                                    <Setter TargetName="BottomTick"
+                                            Property="Fill"
+                                            Value="{DynamicResource MahApps.Brushes.SliderTickDisabled.Mui}"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
new file mode 100644
index 0000000000..684aa03a44
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
@@ -0,0 +1,53 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.TextBlock.Heading1.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="30" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Heading2.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Title.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI Light" />
+        <Setter Property="FontSize" Value="23"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Fixed.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.ModernWindowTitle.Mui" TargetType="TextBlock">
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBlock.DataGrid.Mui" TargetType="TextBlock" >
+        <Setter Property="Margin" Value="2,0" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/TextBox.xaml b/src/MahApps.Metro/Styles/MUI/TextBox.xaml
new file mode 100644
index 0000000000..55829ec070
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/TextBox.xaml
@@ -0,0 +1,117 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="MahApps.Styles.TextBoxBase.Mui" TargetType="{x:Type TextBoxBase}" BasedOn="{x:Null}">
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputText.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackground.Mui}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorder.Mui}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2,1,1,1"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+        <Setter Property="Validation.ErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <Border BorderThickness="1" BorderBrush="#FFdc000c" VerticalAlignment="Top">
+                            <Grid>
+                                <AdornedElementPlaceholder x:Name="adorner" Margin="-1"/>
+                            </Grid>
+                        </Border>
+                        <Border x:Name="errorBorder" Background="#FFdc000c" Margin="8,0,0,0"
+                                Opacity="0" CornerRadius="0"
+                                IsHitTestVisible="False"
+                                MinHeight="24" >
+                            <TextBlock Text="{Binding ElementName=adorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"
+                                       Foreground="White" Margin="8,2,8,3" TextWrapping="Wrap" VerticalAlignment="Center"/>
+                        </Border>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Value="True">
+                            <DataTrigger.Binding>
+                                <Binding ElementName="adorner" Path="AdornedElement.IsKeyboardFocused" />
+                            </DataTrigger.Binding>
+                            <DataTrigger.EnterActions>
+                                <BeginStoryboard x:Name="fadeInStoryboard">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="00:00:00.15"
+                                                         Storyboard.TargetName="errorBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.EnterActions>
+                            <DataTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="fadeInStoryboard"/>
+                                <BeginStoryboard x:Name="fadeOutStoryBoard">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="00:00:00"
+                                                         Storyboard.TargetName="errorBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.ExitActions>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBoxBase}">
+                    <Border x:Name="Bd"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                        <ScrollViewer x:Name="PART_ContentHost" RenderOptions.ClearTypeHint="Enabled"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsReadOnly" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextDisabled.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="true">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent.Mui}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsReadOnly" Value="False"/>
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.InputBackgroundHover.Mui}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.InputBorderHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.InputTextHover.Mui}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type TextBox}" />
+
+    <Style x:Key="MahApps.Styles.RichTextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type RichTextBox}" />
+
+    <Style x:Key="MahApps.Styles.TextBox.DataGridEditing.Mui" TargetType="TextBox" BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+    </Style>
+
+</ResourceDictionary>
+
+
+
diff --git a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
new file mode 100644
index 0000000000..58398d2265
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
@@ -0,0 +1,40 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.ToolTip.Mui" TargetType="ToolTip">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontStyle" Value="Normal"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Padding" Value="5,1,5,4"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HasDropShadow" Value="False"/>
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToolTip}">
+                    <Grid Margin="4">
+                        <Border Background="#0C000000" BorderBrush="#0F000000" BorderThickness="1" CornerRadius="2.5" Margin="-1" />
+                        <Border Background="#0A000000" BorderBrush="#0C000000" BorderThickness="1" CornerRadius="2.75" Margin="-2" />
+
+                        <Border Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Padding="{TemplateBinding Padding}"
+                                CornerRadius="0">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/TreeView.xaml b/src/MahApps.Metro/Styles/MUI/TreeView.xaml
new file mode 100644
index 0000000000..4b5bd79e75
--- /dev/null
+++ b/src/MahApps.Metro/Styles/MUI/TreeView.xaml
@@ -0,0 +1,163 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MahApps.Styles.TreeView.Mui" TargetType="TreeView">
+        <Setter Property="BorderThickness" Value="0" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpandCollapse.Mui" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Width="16"
+                            Height="16"
+                            Background="Transparent"
+                            Padding="5,5,5,5" >
+                        <Path x:Name="ExpandPath"
+                              Stroke="#FF989898"
+                              StrokeThickness="1"
+                              Data="F1 M.5,.5, .5,6.5 6.5,.5 Z" UseLayoutRounding="True" SnapsToDevicePixels="True">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="135"
+                                                 CenterX="3"
+                                                 CenterY="3"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <!--<Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="{DynamicResource Accent}"/>
+                        </Trigger>-->
+
+                        <Trigger Property="IsChecked"
+                                 Value="True">
+                            <Setter TargetName="ExpandPath"
+                                    Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"
+                                                     CenterX="3"
+                                                     CenterY="3"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="ExpandPath"
+                                    Property="Fill"
+                                    Value="#FF595959"/>
+                            <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="#FF262626"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <!--<Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="{DynamicResource Accent}"/>-->
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TreeViewItem.Mui" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment"
+                Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="VerticalContentAlignment"
+                Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.TreeViewItem.FocusVisualStyle.Mui}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="19"
+                                              Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+
+                        <ToggleButton x:Name="Expander"
+                                      Style="{StaticResource MahApps.Styles.ToggleButton.ExpandCollapse.Mui}"
+                                      IsChecked="{Binding Path=IsExpanded,RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <Border Name="Bd"
+                                Grid.Column="1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="true">
+
+                            <ContentPresenter x:Name="PART_Header"
+                                              ContentSource="Header"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"/>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger SourceName="Bd" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundHover.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextHover.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.ItemBackgroundSelected.Mui}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextSelected.Mui}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemTextDisabled.Mui}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="VirtualizingStackPanel.IsVirtualizing"
+                 Value="true">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel/>
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file

From 5cee4fa98fde66d24419c235cec24ee35c9ec49a Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 16 Nov 2019 13:14:33 +0100
Subject: [PATCH 31/36] Fix generated MUI brushes and colors

---
 .../Styles/Themes/GeneratorParameters.json    |  2 +-
 .../Styles/Themes/Theme.Template.xaml         | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index c392d3834e..0d5c80ed48 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -257,7 +257,7 @@
         "MahApps.Colors.SubMenuText.Mui": "#99000000",
         "MahApps.Colors.SubMenuTextHover.Mui": "#66000000",
         "MahApps.Colors.SubMenuTextSelected.Mui": "#333333",
-        "MahApps.Colors.WindowHeaderGradient.Mui": "<LinearGradientBrush x:Key=\"MahApps.Brushes.WindowHeaderGradient.Mui\" StartPoint=\"0, 0\" EndPoint=\"0, 1\" Opacity=\".1\">\r\n<GradientStop Offset=\"0\" Color=\"{DynamicResource MahApps.Colors.Mui.AccentColor}\" />\r\n<GradientStop Offset=\".3\" Color=\"{DynamicResource MahApps.Colors.Mui.AccentColor}\" />\r\n<GradientStop Offset=\"1\" Color=\"Transparent\" />\r\n</LinearGradientBrush>",
+        "MahApps.Colors.WindowHeaderGradient.Mui": "<LinearGradientBrush x:Key=\"MahApps.Brushes.WindowHeaderGradient.Mui\" StartPoint=\"0, 0\" EndPoint=\"0, 1\" Opacity=\".1\">\r\n\t\t<GradientStop Offset=\"0\" Color=\"{StaticResource MahApps.Colors.Accent.Mui}\" />\r\n\t\t<GradientStop Offset=\".3\" Color=\"{StaticResource MahApps.Colors.Accent.Mui}\" />\r\n\t\t<GradientStop Offset=\"1\" Color=\"Transparent\" />\r\n\t</LinearGradientBrush>",
         "MahApps.Colors.WindowText.Mui": "#333333",
         "MahApps.Colors.WindowTextReadOnly.Mui": "#919191",
         "MahApps.Colors.CloseButtonBackgroundOnMoseOver.Mui": "#dddddd",
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 435e3a8863..1ad1f7d2f3 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -236,16 +236,16 @@
 
     <!--  ************* ModernUI *************  -->
     <Color x:Key="MahApps.Colors.Accent.Mui">{{MahApps.Colors.Accent.Mui}}</Color>
-    <SolidColorBrush x:Key="MahApps.Brushes.Accent.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
 
     <Color x:Key="MahApps.Colors.WindowBackground.Mui">{{MahApps.Colors.WindowBackground.Mui}}</Color>
 
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackground.Mui" Color="{{MahApps.Colors.ButtonBackground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackgroundHover.Mui" Color="{{MahApps.Colors.ButtonBackgroundHover.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBackgroundPressed.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorder.Mui" Color="{{MahApps.Colors.ButtonBorder.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorderHover.Mui" Color="{{MahApps.Colors.ButtonBorderHover.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorderPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ButtonBorderPressed.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonText.Mui" Color="{{MahApps.Colors.ButtonText.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonTextHover.Mui" Color="{{MahApps.Colors.ButtonTextHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ButtonTextPressed.Mui" Color="{{MahApps.Colors.ButtonTextPressed.Mui}}" />
@@ -255,23 +255,23 @@
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridForeground.Mui" Color="{{MahApps.Colors.DataGridForeground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackground.Mui" Color="{{MahApps.Colors.DataGridCellBackground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackgroundHover.Mui" Color="{{MahApps.Colors.DataGridCellBackgroundHover.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellBackgroundSelected.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForeground.Mui" Color="{{MahApps.Colors.DataGridCellForeground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForegroundHover.Mui" Color="{{MahApps.Colors.DataGridCellForegroundHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridCellForegroundSelected.Mui" Color="{{MahApps.Colors.DataGridCellForegroundSelected.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackground.Mui" Color="{{MahApps.Colors.DataGridHeaderBackground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundHover.Mui" Color="{{MahApps.Colors.DataGridHeaderBackgroundHover.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundPressed.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderBackgroundSelected.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForeground.Mui" Color="{{MahApps.Colors.DataGridHeaderForeground.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundHover.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundPressed.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundPressed.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridHeaderForegroundSelected.Mui" Color="{{MahApps.Colors.DataGridHeaderForegroundSelected.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGridGridLines.Mui" Color="{{MahApps.Colors.DataGridGridLines.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.DataGridDropSeparator.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGridDropSeparator.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.Hyperlink.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.HyperlinkHover.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Hyperlink.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.HyperlinkHover.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.HyperlinkDisabled.Mui" Color="{{MahApps.Colors.HyperlinkDisabled.Mui}}" />
 
     <SolidColorBrush x:Key="MahApps.Brushes.InputBackground.Mui" Color="{{MahApps.Colors.InputBackground.Mui}}" />
@@ -283,7 +283,7 @@
     <SolidColorBrush x:Key="MahApps.Brushes.InputTextDisabled.Mui" Color="{{MahApps.Colors.InputTextDisabled.Mui}}" />
 
     <SolidColorBrush x:Key="MahApps.Brushes.ItemBackgroundHover.Mui" Color="{{MahApps.Colors.ItemBackgroundHover.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ItemBackgroundSelected.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ItemBackgroundSelected.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ItemBorder.Mui" Color="{{MahApps.Colors.ItemBorder.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ItemText.Mui" Color="{{MahApps.Colors.ItemText.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ItemTextSelected.Mui" Color="{{MahApps.Colors.ItemTextSelected.Mui}}" />
@@ -303,7 +303,7 @@
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderHover.Mui" Color="{{MahApps.Colors.ModernButtonBorderHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderPressed.Mui" Color="{{MahApps.Colors.ModernButtonBorderPressed.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonBorderDisabled.Mui" Color="{{MahApps.Colors.ModernButtonBorderDisabled.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonIconBackgroundPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonIconBackgroundPressed.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonIconForegroundPressed.Mui" Color="{{MahApps.Colors.ModernButtonIconForegroundPressed.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonText.Mui" Color="{{MahApps.Colors.ModernButtonText.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.ModernButtonTextHover.Mui" Color="{{MahApps.Colors.ModernButtonTextHover.Mui}}" />
@@ -325,14 +325,14 @@
 
     <SolidColorBrush x:Key="MahApps.Brushes.SeparatorBackground.Mui" Color="{{MahApps.Colors.SeparatorBackground.Mui}}" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBackground.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBorder.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBackground.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderSelectionBorder.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackground.Mui" Color="{{MahApps.Colors.SliderThumbBackground.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundDragging.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundDragging.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundHover.Mui" Color="{{MahApps.Colors.SliderThumbBackgroundHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBackgroundDisabled.Mui" Color="{{MahApps.Colors.SliderThumbBackgroundDisabled.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorder.Mui" Color="{{MahApps.Colors.SliderThumbBorder.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderDragging.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderDragging.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderHover.Mui" Color="{{MahApps.Colors.SliderThumbBorderHover.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderThumbBorderDisabled.Mui" Color="{{MahApps.Colors.SliderThumbBorderDisabled.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SliderTrackBackground.Mui" Color="{{MahApps.Colors.SliderTrackBackground.Mui}}" />
@@ -345,8 +345,8 @@
     <SolidColorBrush x:Key="MahApps.Brushes.SubMenuTextSelected.Mui" Color="{{MahApps.Colors.SubMenuTextSelected.Mui}}" />
 
     <SolidColorBrush x:Key="MahApps.Brushes.WindowBackground.Mui" Color="{StaticResource MahApps.Colors.WindowBackground.Mui}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorder.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" Opacity=".5" />
-    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorderActive.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorder.Mui" Color="{{MahApps.Colors.Accent.Mui}}" Opacity=".5" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowBorderActive.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     {{MahApps.Colors.WindowHeaderGradient.Mui}}
     <SolidColorBrush x:Key="MahApps.Brushes.WindowText.Mui" Color="{{MahApps.Colors.WindowText.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.WindowTextReadOnly.Mui" Color="{{MahApps.Colors.WindowTextReadOnly.Mui}}" />
@@ -360,7 +360,7 @@
     <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackground.Mui" Color="{StaticResource MahApps.Colors.WindowBackground.Mui}" Opacity="0" />
     <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackgroundOnMoseOver.Mui" Color="{{MahApps.Colors.SystemButtonBackgroundOnMoseOver.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonForegroundOnMoseOver.Mui" Color="{{MahApps.Colors.SystemButtonForegroundOnMoseOver.Mui}}" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui" Color="{DynamicResource MahApps.Colors.Accent.Mui}" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonBackgroundIsPressed.Mui" Color="{{MahApps.Colors.Accent.Mui}}" />
     <SolidColorBrush x:Key="MahApps.Brushes.SystemButtonForegroundIsPressed.Mui" Color="{{MahApps.Colors.SystemButtonForegroundIsPressed.Mui}}" />
 
 </ResourceDictionary>
\ No newline at end of file

From 88c7820069ab19502174ac0628a1c9024e9f16a6 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 16 Nov 2019 14:03:32 +0100
Subject: [PATCH 32/36] Revert MUI samples

---
 .../ExampleViews/ButtonsExample.xaml          | 73 -------------------
 .../ExampleViews/DateExamples.xaml            | 32 --------
 .../Styles/Controls.CheckBox.xaml             |  1 -
 .../Styles/Controls.ListBox.xaml              |  1 -
 .../Styles/Controls.RadioButton.xaml          |  3 +-
 .../Styles/Controls.Tooltip.xaml              |  1 -
 6 files changed, 2 insertions(+), 109 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 82bcf8a3b5..901b6f2a8f 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -27,7 +27,6 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
-            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Column="0">
@@ -486,78 +485,6 @@
             </Controls:SplitButton>
 
         </StackPanel>
-
-        <StackPanel Grid.Row="2" Grid.Column="0">
-            <Label Content="MUI button" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <Button Width="100"
-                    Margin="{StaticResource ControlMargin}"
-                    Content="Enabled"
-                    Style="{DynamicResource MahApps.Styles.Button.Mui}" />
-            <Button Width="100"
-                    Margin="{StaticResource ControlMargin}"
-                    Content="Disabled"
-                    IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.Button.Mui}" />
-        </StackPanel>
-
-        <StackPanel Grid.Row="2"
-                    Grid.Column="1"
-                    HorizontalAlignment="Center">
-            <Label Content="MUI Checkbox" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Enabled"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Enabled checked"
-                      IsChecked="True"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Enabled three state"
-                      IsChecked="{x:Null}"
-                      IsThreeState="True"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Disabled"
-                      IsEnabled="False"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Disabled checked"
-                      IsChecked="True"
-                      IsEnabled="False"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-            <CheckBox Margin="{StaticResource ControlMargin}"
-                      Content="Disabled three state"
-                      IsChecked="{x:Null}"
-                      IsEnabled="False"
-                      IsThreeState="True"
-                      Style="{DynamicResource MahApps.Styles.CheckBox.Mui}" />
-        </StackPanel>
-
-        <StackPanel Grid.Row="2"
-                    Grid.Column="2"
-                    HorizontalAlignment="Center">
-            <Label Content="MUI Radio button" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <RadioButton Margin="{StaticResource ControlMargin}"
-                         Content="Enabled"
-                         GroupName="1"
-                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
-            <RadioButton Margin="{StaticResource ControlMargin}"
-                         Content="Enabled checked"
-                         GroupName="1"
-                         IsChecked="True"
-                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
-            <RadioButton Margin="{StaticResource ControlMargin}"
-                         Content="Disabled"
-                         GroupName="2"
-                         IsEnabled="False"
-                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
-            <RadioButton Margin="{StaticResource ControlMargin}"
-                         Content="Disabled checked"
-                         GroupName="2"
-                         IsChecked="True"
-                         IsEnabled="False"
-                         Style="{DynamicResource MahApps.Styles.RadioButton.Mui}" />
-        </StackPanel>
     </Grid>
 
 </UserControl>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
index 6407fc0529..366d1d3690 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
@@ -22,10 +22,6 @@
 
     <AdornerDecorator>
         <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition />
-            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -302,34 +298,6 @@
                     </AdornerDecorator>
                 </GroupBox>
             </StackPanel>
-
-            <StackPanel Grid.Row="1" Grid.Column="0">
-                <Label Content="MUI Calendar" Style="{DynamicResource DescriptionHeaderStyle}" />
-
-                <Calendar Margin="5"
-                          DisplayDateStart="{x:Static system:DateTime.Now}"
-                          IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                          SelectionMode="MultipleRange"
-                          Style="{DynamicResource MahApps.Styles.Calendar.Mui}"
-                          />
-                <Calendar Margin="5"
-                          HorizontalAlignment="Center"
-                          IsEnabled="False"
-                          Style="{DynamicResource MahApps.Styles.Calendar.Mui}"
-                          />
-            </StackPanel>
-
-            <StackPanel Grid.Row="1" Grid.Column="1">
-                <Label Content="MUI Date Picker" Style="{DynamicResource DescriptionHeaderStyle}" />
-
-                <DatePicker Width="200"
-                            Margin="0 10 0 0"
-                            Style="{DynamicResource MahApps.Styles.DatePicker.Mui}" />
-                <DatePicker Width="200"
-                            Margin="0 10 0 0"
-                            IsEnabled="False"
-                            Style="{DynamicResource MahApps.Styles.DatePicker.Mui}" />
-            </StackPanel>
         </Grid>
     </AdornerDecorator>
 
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index dd9ae0c664..45f4a49c8e 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -133,5 +133,4 @@
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
-
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 48fbb7f58e..50a24130bc 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -155,5 +155,4 @@
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
     </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index 4af500dc30..2b316b7dd3 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:System="clr-namespace:System;assembly=mscorlib">
 
     <!--  ********************************** RadioButton Style **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 87e9709161..943838e132 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -62,5 +62,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-
 </ResourceDictionary>
\ No newline at end of file

From 50775424541eaee441bee631add30c969b13fff1 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 16 Nov 2019 14:24:35 +0100
Subject: [PATCH 33/36] Rename Scrollbars -> Scrollbar

---
 src/MahApps.Metro/Styles/MUI/Controls.xaml                      | 2 +-
 .../Styles/MUI/{Scrollbars.xaml => Scrollbar.xaml}              | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/MahApps.Metro/Styles/MUI/{Scrollbars.xaml => Scrollbar.xaml} (100%)

diff --git a/src/MahApps.Metro/Styles/MUI/Controls.xaml b/src/MahApps.Metro/Styles/MUI/Controls.xaml
index f2a8e63bdc..ac705741a8 100644
--- a/src/MahApps.Metro/Styles/MUI/Controls.xaml
+++ b/src/MahApps.Metro/Styles/MUI/Controls.xaml
@@ -18,7 +18,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/PasswordBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/ProgressBar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/RadioButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Scrollbars.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Scrollbar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/Slider.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/TextBlock.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/MUI/TextBox.xaml" />
diff --git a/src/MahApps.Metro/Styles/MUI/Scrollbars.xaml b/src/MahApps.Metro/Styles/MUI/Scrollbar.xaml
similarity index 100%
rename from src/MahApps.Metro/Styles/MUI/Scrollbars.xaml
rename to src/MahApps.Metro/Styles/MUI/Scrollbar.xaml

From 05492c6ae2db650ae40cff9b08cab72e958685bd Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sun, 17 Nov 2019 16:03:20 +0100
Subject: [PATCH 34/36] MahApps.Fonts.Default.Mui ->
 MahApps.Fonts.Family.Default.Mui

---
 src/MahApps.Metro/Styles/Fonts.xaml           | 2 +-
 src/MahApps.Metro/Styles/MUI/ContextMenu.xaml | 2 +-
 src/MahApps.Metro/Styles/MUI/DataGrid.xaml    | 2 +-
 src/MahApps.Metro/Styles/MUI/Tooltip.xaml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 1e1284c89e..9d7ac04740 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -39,7 +39,7 @@
 
     <!-- MUI -->
 
-    <FontFamily x:Key="MahApps.Fonts.Default.Mui">Segoe UI</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Family.Default.Mui">Segoe UI</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Fixed.Mui">Consolas</FontFamily>
 
     <System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
diff --git a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
index 8afde875f6..08ca805a8a 100644
--- a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
diff --git a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
index 05970dc175..8bcf5550a8 100644
--- a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
@@ -181,7 +181,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGridHeaderForeground.Mui}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
         <Setter Property="Padding" Value="4,3,4,3"/>
         <Setter Property="HorizontalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
index 58398d2265..2655f38c68 100644
--- a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
@@ -6,7 +6,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.WindowBorderActive.Mui}"/>
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default.Mui}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
         <Setter Property="FontStyle" Value="Normal"/>
         <Setter Property="FontWeight" Value="Normal"/>

From 089d4aea3aa1c3ae6e22c03f406119162f8c40e1 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sun, 17 Nov 2019 20:25:57 +0100
Subject: [PATCH 35/36] MahApps.Fonts.Fixed.Mui ->
 MahApps.Fonts.Family.Fixed.Mui

---
 src/MahApps.Metro/Styles/Fonts.xaml         | 2 +-
 src/MahApps.Metro/Styles/MUI/TextBlock.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 9d7ac04740..63598ebdf9 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -40,7 +40,7 @@
     <!-- MUI -->
 
     <FontFamily x:Key="MahApps.Fonts.Family.Default.Mui">Segoe UI</FontFamily>
-    <FontFamily x:Key="MahApps.Fonts.Fixed.Mui">Consolas</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Family.Fixed.Mui">Consolas</FontFamily>
 
     <System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
     <System:Double x:Key="MahApps.Sizes.Font.Fixed.Mui">13.333</System:Double>
diff --git a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
index 684aa03a44..dd6e36c141 100644
--- a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
@@ -34,7 +34,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Fixed.Mui}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Fixed.Mui}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>

From 0e111cf7571350d413c3f6bc3e54faed45579bfe Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sun, 17 Nov 2019 20:32:24 +0100
Subject: [PATCH 36/36] MahApps.Sizes.Font -> MahApps.Font.Size

---
 src/MahApps.Metro/Styles/Fonts.xaml           | 6 +++---
 src/MahApps.Metro/Styles/MUI/Calendar.xaml    | 6 +++---
 src/MahApps.Metro/Styles/MUI/ContextMenu.xaml | 2 +-
 src/MahApps.Metro/Styles/MUI/DataGrid.xaml    | 2 +-
 src/MahApps.Metro/Styles/MUI/TextBlock.xaml   | 6 +++---
 src/MahApps.Metro/Styles/MUI/Tooltip.xaml     | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 63598ebdf9..b00ce6a81d 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -42,8 +42,8 @@
     <FontFamily x:Key="MahApps.Fonts.Family.Default.Mui">Segoe UI</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.Fixed.Mui">Consolas</FontFamily>
 
-    <System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Font.Fixed.Mui">13.333</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Font.Small.Mui">11</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Default.Mui">13</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Fixed.Mui">13.333</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Small.Mui">11</System:Double>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/MUI/Calendar.xaml b/src/MahApps.Metro/Styles/MUI/Calendar.xaml
index ecab82f2f6..c9b7f6b1bf 100644
--- a/src/MahApps.Metro/Styles/MUI/Calendar.xaml
+++ b/src/MahApps.Metro/Styles/MUI/Calendar.xaml
@@ -34,7 +34,7 @@
                     <ControlTemplate.Resources>
                         <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
                             <TextBlock x:Name="Text" FontWeight="Bold"
-                                       FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
+                                       FontSize="{DynamicResource MahApps.Font.Size.Default.Mui}"
                                        Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
                                        HorizontalAlignment="Center"
                                        Text="{Binding}"
@@ -154,7 +154,7 @@
     <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
         <Setter Property="MinWidth" Value="5"/>
         <Setter Property="MinHeight" Value="5"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -218,7 +218,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
         <Setter Property="MinWidth" Value="40"/>
         <Setter Property="MinHeight" Value="42"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
index 08ca805a8a..e20ecce13f 100644
--- a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
@@ -3,7 +3,7 @@
 
     <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>
diff --git a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
index 8bcf5550a8..74afde8dcf 100644
--- a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
@@ -182,7 +182,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
         <Setter Property="Padding" Value="4,3,4,3"/>
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
index dd6e36c141..19a98769fd 100644
--- a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
@@ -22,20 +22,20 @@
 
     <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Fixed.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Fixed.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
index 2655f38c68..678ab83236 100644
--- a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="FontStyle" Value="Normal"/>
         <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Padding" Value="5,1,5,4"/>