diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss
index ccc28d7..7ddbddb 100755
--- a/gtk-3.20/scss/widgets/_button.scss
+++ b/gtk-3.20/scss/widgets/_button.scss
@@ -53,6 +53,13 @@
         outline-color: transparent;
     }
 
+    %undecorated_button {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: none;
+    }
+
     %linked_middle {
         border-radius: 0;
         border-left-style: none;
diff --git a/gtk-3.20/scss/widgets/_calendar.scss b/gtk-3.20/scss/widgets/_calendar.scss
index 5e5f990..d515a93 100644
--- a/gtk-3.20/scss/widgets/_calendar.scss
+++ b/gtk-3.20/scss/widgets/_calendar.scss
@@ -7,17 +7,62 @@
         padding: $spacing;
         outline-offset: -1px;
 
-        &:indeterminate { color: mix($fg_color, $bg_color, .5); }
+        color: $text_color;
 
-        &.view, &.highlight, &.header, &.button {
-            &, &:focus, &:hover, &:disabled {
-                border: 0;
-                background-color: transparent;
-                background-image: none;
+        &.view {
+            &, &:backdrop { @extend %undecorated_button; }
+        }
+
+        &:selected {
+            @extend %selected_items;
+
+            padding: 5px;
+            border-radius: $roundness;
+        }
+
+        &.header {
+            border-bottom: 1px solid transparentize($black, .9);
+            border-radius: 0;
+
+            &:backdrop { border-color: transparentize($black, .9); }
+        }
+
+        &.button {
+            @extend %undecorated_button;
+
+            color: alpha($fg_color, .55);
+
+            &:hover {
+                @extend %undecorated_button;
+
+                color: $fg_color;
+            }
+
+            &:backdrop {
+                @extend %undecorated_button;
+
+                color: alpha($backdrop_fg_color, .55);
+            }
+
+            &:disabled {
+                @extend %undecorated_button;
+
+                color: alpha($insensitive_fg_color, .55);
             }
         }
 
-        &.highlight { color: $selected_bg_color; }
+        &:indeterminate,
+        &:indeterminate:backdrop { color: mix($fg_color, $bg_color, .5); }
+
+        &.highlight,
+        &.highlight:backdrop {
+            font-size: smaller;
+            color: $selected_bg_color;
+        }
+
+        &:backdrop {
+            color: $backdrop_text_color;
+        }
     }
 
     /* gnome-calendar */
diff --git a/gtk-3.20/scss/widgets/_menu.scss b/gtk-3.20/scss/widgets/_menu.scss
index be904c3..35938fc 100755
--- a/gtk-3.20/scss/widgets/_menu.scss
+++ b/gtk-3.20/scss/widgets/_menu.scss
@@ -185,13 +185,6 @@
     }
 }
 
-%undecorated_button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: none;
-}
-
 
 /*********
  ! Popover