diff --git a/Material.Avalonia.Demo/MainView.axaml b/Material.Avalonia.Demo/MainView.axaml
index 090374a9..05ee5dd7 100644
--- a/Material.Avalonia.Demo/MainView.axaml
+++ b/Material.Avalonia.Demo/MainView.axaml
@@ -102,6 +102,7 @@
diff --git a/Material.Avalonia.Demo/Pages/ButtonsDemo.axaml b/Material.Avalonia.Demo/Pages/ButtonsDemo.axaml
index 6ca2ed94..52e3b697 100644
--- a/Material.Avalonia.Demo/Pages/ButtonsDemo.axaml
+++ b/Material.Avalonia.Demo/Pages/ButtonsDemo.axaml
@@ -7,185 +7,188 @@
xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
x:Class="Material.Avalonia.Demo.Pages.ButtonsDemo">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Material.Avalonia.Demo/Pages/ColorZonesDemo.axaml b/Material.Avalonia.Demo/Pages/ColorZonesDemo.axaml
index 1ff2add6..5ccc9ded 100644
--- a/Material.Avalonia.Demo/Pages/ColorZonesDemo.axaml
+++ b/Material.Avalonia.Demo/Pages/ColorZonesDemo.axaml
@@ -21,7 +21,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/Material.Avalonia.Demo/Pages/Home.axaml b/Material.Avalonia.Demo/Pages/Home.axaml
index b3fadb4f..01458726 100644
--- a/Material.Avalonia.Demo/Pages/Home.axaml
+++ b/Material.Avalonia.Demo/Pages/Home.axaml
@@ -33,13 +33,13 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/Material.Avalonia.Demo/Pages/TogglesDemo.axaml b/Material.Avalonia.Demo/Pages/TogglesDemo.axaml
index 16e37352..d6f3012b 100644
--- a/Material.Avalonia.Demo/Pages/TogglesDemo.axaml
+++ b/Material.Avalonia.Demo/Pages/TogglesDemo.axaml
@@ -2,224 +2,249 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
+ mc:Ignorable="d" d:DesignWidth="800"
xmlns:assist="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
x:Class="Material.Avalonia.Demo.Pages.TogglesDemo">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
- ToggleButton
-
-
-
- NoFeedback
-
-
-
- Disabled
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ ToggleButton
+
+
+
+ No feedback
+
+
+
+ Disabled
+
+
+
+ Primary
+
+
+
+ Primary light
+
+
+
+ Primary dark
+
+
+
+ Accent
+
+
+
+
+
+ Outline
+
+
+
+ Flat
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Button's ControlThemes if you don't want pressed state:
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/Material.Styles/Resources/Themes/Button.axaml b/Material.Styles/Resources/Themes/Button.axaml
index 246c4166..cdd957a4 100644
--- a/Material.Styles/Resources/Themes/Button.axaml
+++ b/Material.Styles/Resources/Themes/Button.axaml
@@ -9,20 +9,15 @@
0.26
-
+
-
-
-
-
-
+ Value="{Binding $self.Foreground, Converter={StaticResource BrushRoundConverter}}" />
+
@@ -122,16 +117,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -141,7 +158,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BasedOn="{StaticResource MaterialFlatToggleButton}">