9 files changed, 12 insertions, 20 deletions
diff --git a/material_theme/src/button.rs b/crates/material_theme/src/button.rs
index 21d77b7..21d77b7 100644
--- a/material_theme/src/button.rs
+++ b/crates/material_theme/src/button.rs
diff --git a/material_theme/src/container.rs b/crates/material_theme/src/container.rs
index a14cfd5..a14cfd5 100644
--- a/material_theme/src/container.rs
+++ b/crates/material_theme/src/container.rs
diff --git a/material_theme/src/dialog.rs b/crates/material_theme/src/dialog.rs
index 68c61b5..68c61b5 100644
--- a/material_theme/src/dialog.rs
+++ b/crates/material_theme/src/dialog.rs
diff --git a/material_theme/src/lib.rs b/crates/material_theme/src/lib.rs
index 521af2c..521af2c 100644
--- a/material_theme/src/lib.rs
+++ b/crates/material_theme/src/lib.rs
diff --git a/material_theme/src/menu.rs b/crates/material_theme/src/menu.rs
index 9f43c72..9f43c72 100644
--- a/material_theme/src/menu.rs
+++ b/crates/material_theme/src/menu.rs
diff --git a/material_theme/src/pick_list.rs b/crates/material_theme/src/pick_list.rs
index c589100..c589100 100644
--- a/material_theme/src/pick_list.rs
+++ b/crates/material_theme/src/pick_list.rs
diff --git a/material_theme/src/scrollable.rs b/crates/material_theme/src/scrollable.rs
index 8a22e56..ee739ba 100644
--- a/material_theme/src/scrollable.rs
+++ b/crates/material_theme/src/scrollable.rs
@@ -98,21 +98,17 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             Style {
                 horizontal_rail: if is_horizontal_scrollbar_disabled {
                     disabled
+                } else if is_horizontal_scrollbar_hovered {
+                    hovered_rail
                 } else {
-                    if is_horizontal_scrollbar_hovered {
-                        hovered_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 vertical_rail: if is_vertical_scrollbar_disabled {
                     disabled
+                } else if is_vertical_scrollbar_hovered {
+                    hovered_rail
                 } else {
-                    if is_vertical_scrollbar_hovered {
-                        hovered_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 ..style
             }
@@ -138,21 +134,17 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             Style {
                 horizontal_rail: if is_horizontal_scrollbar_disabled {
                     disabled
+                } else if is_horizontal_scrollbar_dragged {
+                    dragged_rail
                 } else {
-                    if is_horizontal_scrollbar_dragged {
-                        dragged_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 vertical_rail: if is_vertical_scrollbar_disabled {
                     disabled
+                } else if is_vertical_scrollbar_dragged {
+                    dragged_rail
                 } else {
-                    if is_vertical_scrollbar_dragged {
-                        dragged_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 ..style
             }
diff --git a/material_theme/src/text.rs b/crates/material_theme/src/text.rs
index 10b2e65..10b2e65 100644
--- a/material_theme/src/text.rs
+++ b/crates/material_theme/src/text.rs
diff --git a/material_theme/src/utils.rs b/crates/material_theme/src/utils.rs
index a05bc62..a05bc62 100644
--- a/material_theme/src/utils.rs
+++ b/crates/material_theme/src/utils.rs