don't change background-color of unfocused window decorations

29 files changed, 135 insertions, 239 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 5111d94..cc38c6a 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -877,8 +877,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -913,8 +911,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -990,7 +987,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
 
 .titlebar {
@@ -1003,13 +999,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1433,7 +1428,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3329,7 +3324,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 5264246..ae08696 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -993,7 +990,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
 
 .titlebar {
@@ -1006,13 +1002,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1436,7 +1431,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3332,7 +3327,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 74afd0f..3048a2c 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -877,8 +877,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -913,8 +911,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -990,7 +987,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
 
 .titlebar {
@@ -1003,13 +999,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1433,7 +1428,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3329,7 +3324,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #363b48; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index dd1a710..4d5a6e9 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -993,7 +990,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
 
 .titlebar {
@@ -1006,13 +1002,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1436,7 +1431,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3332,7 +3327,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #363b48; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 757cc78..fd78f2b 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, #d4d5db) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #eff0f2; }
   .header-bar .title {
@@ -993,7 +990,6 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
 
 .titlebar {
@@ -1006,13 +1002,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #eff0f2; }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1436,7 +1431,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3332,7 +3327,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #eff0f2; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #eff0f2);
       color: rgba(82, 93, 118, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 922825a..b608836 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, rgba(212, 213, 219, 0.95)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: rgba(231, 232, 235, 0.95);
     border-color: rgba(212, 213, 219, 0.95); }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .header-bar .title {
@@ -993,7 +990,6 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
 
 .titlebar {
@@ -1006,13 +1002,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1436,7 +1431,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3332,7 +3327,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #eff0f2);
       color: rgba(82, 93, 118, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 8f34cf9..fee7076 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -996,7 +996,7 @@ GtkComboBox {
   border-image: linear-gradient(to bottom, opacify($header_bg, 1),
                                            darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   .separator { @extend %header_separator; }
 
@@ -1046,7 +1046,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
   }
@@ -1134,7 +1134,7 @@ GtkComboBox {
     border-color: opacify($header_border, 1);
 
     &:backdrop {
-      background-color: opacify($header_bg_backdrop, 1);
+      //background-color: opacify($header_bg_backdrop, 1);
       border-color: opacify($header_border, 1);
     }
   }
@@ -1152,7 +1152,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1160,7 +1160,11 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    &:backdrop {
+    //background-color: opacify($header_bg_backdrop, 1);
+
+    .csd & { background-color: opacify($header_bg_backdrop, 1); }
+    }
   }
 }
 
@@ -1552,7 +1556,10 @@ column-header.button.dnd { // for treeview-like derive widgets
   background-color: opacify($header_bg, 1);
   color: $header_fg;
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    //background-color: opacify($header_bg_backdrop, 1);
+  }
 
   & > .menuitem {
     padding: 6px 8px;
diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss
index c0b9060..48ebb2b 100644
--- a/common/gtk-3.0/3.14/sass/_unity.scss
+++ b/common/gtk-3.0/3.14/sass/_unity.scss
@@ -30,7 +30,7 @@ UnityDecoration {
 
     &:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
+      //background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index a917368..120a90d 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -877,8 +877,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -913,8 +911,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -990,15 +987,13 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1010,13 +1005,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1449,7 +1443,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3295,7 +3289,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 115e47b..297698f 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -993,15 +990,13 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1013,13 +1008,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1452,7 +1446,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3298,7 +3292,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 36d9550..ba3e0e2 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -877,8 +877,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -913,8 +911,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -990,15 +987,13 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1010,13 +1005,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1449,7 +1443,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3295,7 +3289,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #363b48; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index a4cf73a..93dc45b 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -993,15 +990,13 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1013,13 +1008,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1452,7 +1446,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3298,7 +3292,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #363b48; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #323843);
       color: rgba(207, 218, 231, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 6786c23..612138a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, #d4d5db) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #eff0f2; }
   .header-bar .title {
@@ -993,15 +990,13 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #eff0f2; }
 
 .titlebar {
   padding-left: 7px;
@@ -1013,13 +1008,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #eff0f2; }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1452,7 +1446,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3298,7 +3292,6 @@ UnityDecoration {
     box-shadow: inset 0 1px #eff0f2; }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #eff0f2);
       color: rgba(82, 93, 118, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 751c11e..a0f8e2e 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -880,8 +880,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, rgba(212, 213, 219, 0.95)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -916,8 +914,7 @@ GtkComboBox {
     background-color: rgba(231, 232, 235, 0.95);
     border-color: rgba(212, 213, 219, 0.95); }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .header-bar .title {
@@ -993,15 +990,13 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
-      background-color: #eff0f2; }
 
 .titlebar {
   padding-left: 7px;
@@ -1013,13 +1008,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1452,7 +1446,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
@@ -3298,7 +3292,6 @@ UnityDecoration {
     box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); }
     UnityDecoration.top:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, #eff0f2);
       color: rgba(82, 93, 118, 0.5); }
   UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom,
   UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop {
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 1d3abd3..77bdf4c 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -996,7 +996,7 @@ GtkComboBox {
   border-image: linear-gradient(to bottom, opacify($header_bg, 1),
                                            darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   .separator { @extend %header_separator; }
 
@@ -1046,7 +1046,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
   }
@@ -1134,18 +1134,19 @@ GtkComboBox {
     border-color: opacify($header_border, 1);
 
     &:backdrop {
-      background-color: opacify($header_bg_backdrop, 1);
+      //background-color: opacify($header_bg_backdrop, 1);
       border-color: opacify($header_border, 1);
     }
   }
 
-  &.default-decoration {
+  &.default-decoration,
+  .csd &.default-decoration {  // needed under wayland, since all gtk3 windows are csd windows
     padding-top: 5px;	    // less padding for ssd
     padding-bottom: 5px;  //
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
-    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1161,7 +1162,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1169,7 +1170,11 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    &:backdrop {
+    //background-color: opacify($header_bg_backdrop, 1);
+
+    .csd & { background-color: opacify($header_bg_backdrop, 1); }
+    }
   }
 }
 
@@ -1575,7 +1580,10 @@ column-header.button.dnd { // for treeview-like derive widgets
   background-color: opacify($header_bg, 1);
   color: $header_fg;
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    //background-color: opacify($header_bg_backdrop, 1);
+  }
 
   & > .menuitem {
     padding: 6px 8px;
diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss
index c0b9060..48ebb2b 100644
--- a/common/gtk-3.0/3.16/sass/_unity.scss
+++ b/common/gtk-3.0/3.16/sass/_unity.scss
@@ -30,7 +30,7 @@ UnityDecoration {
 
     &:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
+      //background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index eac2e32..29c7496 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -965,8 +965,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -1001,8 +999,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -1079,7 +1076,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1087,9 +1083,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1101,13 +1094,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1581,7 +1573,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 4cffb6e..513732e 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -968,8 +968,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -1004,8 +1002,7 @@ GtkComboBox {
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
@@ -1082,7 +1079,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1090,9 +1086,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1104,13 +1097,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1584,7 +1576,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index b5c2865..15d731c 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -965,8 +965,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #313541;
@@ -1001,8 +999,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -1079,7 +1076,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1087,9 +1083,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1101,13 +1094,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1581,7 +1573,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index c8b996d..8ca1bc4 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -968,8 +968,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #323843; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -1004,8 +1002,7 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
   .header-bar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #323843; }
   .header-bar .title {
@@ -1082,7 +1079,6 @@ GtkComboBox {
     background-color: #2f343f;
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
-      background-color: #323843;
       border-color: #262a33; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1090,9 +1086,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #323843; }
 
 .titlebar {
   padding-left: 7px;
@@ -1104,13 +1097,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5);
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
 
 .titlebar .titlebar,
@@ -1584,7 +1576,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #2f343f;
   color: rgba(207, 218, 231, 0.8); }
   .menubar:backdrop {
-    background-color: #323843; }
+    color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 8fbe17b..dcecd0e 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -968,8 +968,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, #d4d5db) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -1004,8 +1002,7 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: #eff0f2; }
   .header-bar .title {
@@ -1082,7 +1079,6 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1090,9 +1086,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #eff0f2; }
 
 .titlebar {
   padding-left: 7px;
@@ -1104,13 +1097,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: #eff0f2; }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1588,7 +1580,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 0757c7b..c327774 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -968,8 +968,6 @@ GtkComboBox {
   border-width: 0 0 1px 0;
   border-style: solid;
   border-image: linear-gradient(to bottom, #e7e8eb, rgba(212, 213, 219, 0.95)) 1 0 1 0; }
-  .primary-toolbar:backdrop {
-    background-color: #eff0f2; }
 
 .inline-toolbar {
   background-color: #edeef0;
@@ -1004,8 +1002,7 @@ GtkComboBox {
     background-color: rgba(231, 232, 235, 0.95);
     border-color: rgba(212, 213, 219, 0.95); }
   .header-bar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .header-bar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .header-bar .title {
@@ -1082,7 +1079,6 @@ GtkComboBox {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
-      background-color: #eff0f2;
       border-color: #d4d5db; }
   .header-bar.default-decoration,
   .csd .header-bar.default-decoration {
@@ -1090,9 +1086,6 @@ GtkComboBox {
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
-      background-color: #eff0f2; }
 
 .titlebar {
   padding-left: 7px;
@@ -1104,13 +1097,12 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5);
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
     .csd .titlebar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
 
 .titlebar .titlebar,
@@ -1588,7 +1580,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   background-color: #e7e8eb;
   color: rgba(82, 93, 118, 0.8); }
   .menubar:backdrop {
-    background-color: #eff0f2; }
+    color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
     padding: 6px 8px;
     border: solid transparent;
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index afe11a5..0f28be6 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1040,7 +1040,7 @@ GtkComboBox {
   border-image: linear-gradient(to bottom, opacify($header_bg, 1),
                                            darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   .separator { @extend %header_separator; }
 
@@ -1090,7 +1090,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
   }
@@ -1178,7 +1178,7 @@ GtkComboBox {
     border-color: opacify($header_border, 1);
 
     &:backdrop {
-      background-color: opacify($header_bg_backdrop, 1);
+      //background-color: opacify($header_bg_backdrop, 1);
       border-color: opacify($header_border, 1);
     }
   }
@@ -1190,7 +1190,7 @@ GtkComboBox {
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
-    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1206,7 +1206,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
+    //background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1214,7 +1214,11 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    &:backdrop {
+    //background-color: opacify($header_bg_backdrop, 1);
+
+    .csd & { background-color: opacify($header_bg_backdrop, 1); }
+    }
   }
 }
 
@@ -1675,7 +1679,10 @@ column-header.button.dnd { // for treeview-like derive widgets
   background-color: opacify($header_bg, 1);
   color: $header_fg;
 
-  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    //background-color: opacify($header_bg_backdrop, 1);
+  }
 
   & > .menuitem {
     padding: 6px 8px;
diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss
index c0b9060..48ebb2b 100644
--- a/common/gtk-3.0/3.18/sass/_unity.scss
+++ b/common/gtk-3.0/3.18/sass/_unity.scss
@@ -30,7 +30,7 @@ UnityDecoration {
 
     &:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
+      //background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 56abe4d..36f69f7 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -14,7 +14,7 @@
 <constant name="C_title_unfocused" value="#8a939f" />
 
 <constant name="C_wm_bg_focused" value="#2f343f" />
-<constant name="C_wm_bg_unfocused" value="#323843" />
+<constant name="C_wm_bg_unfocused" value="#2f343f" />
 
 <constant name="C_wm_highlight" value="#353a48" />
 
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 8c56f3e..01f4262 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -14,7 +14,7 @@
 <constant name="C_title_unfocused" value="#979dac" />
 
 <constant name="C_wm_bg_focused" value="#e7e8eb" />
-<constant name="C_wm_bg_unfocused" value="#eff0f2" />
+<constant name="C_wm_bg_unfocused" value="#e7e8eb" />
 
 <constant name="C_wm_highlight" value="#eeeff1" />
 
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 56abe4d..36f69f7 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -14,7 +14,7 @@
 <constant name="C_title_unfocused" value="#8a939f" />
 
 <constant name="C_wm_bg_focused" value="#2f343f" />
-<constant name="C_wm_bg_unfocused" value="#323843" />
+<constant name="C_wm_bg_unfocused" value="#2f343f" />
 
 <constant name="C_wm_highlight" value="#353a48" />
 
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 8c56f3e..01f4262 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -14,7 +14,7 @@
 <constant name="C_title_unfocused" value="#979dac" />
 
 <constant name="C_wm_bg_focused" value="#e7e8eb" />
-<constant name="C_wm_bg_unfocused" value="#eff0f2" />
+<constant name="C_wm_bg_unfocused" value="#e7e8eb" />
 
 <constant name="C_wm_highlight" value="#eeeff1" />
 
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index c4ed2c4..ad01884 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -14,7 +14,7 @@
 <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,#979dac)" />
 
 <constant name="C_wm_bg_focused" value="gtk:custom(wm_bg,#e7e8eb)" />
-<constant name="C_wm_bg_unfocused" value="gtk:custom(wm_bg_unfocused,#eff0f2)" />
+<constant name="C_wm_bg_unfocused" value="gtk:custom(wm_bg,#e7e8eb)" />
 
 <constant name="C_wm_highlight" value="gtk:custom(wm_highlight,#eeeff1)" />