diff --git a/gtk-2.0/panel.rc b/gtk-2.0/panel.rc
index e5baad0..9974b76 100644
--- a/gtk-2.0/panel.rc
+++ b/gtk-2.0/panel.rc
@@ -2,20 +2,20 @@ style "theme-panel" {
 
   ythickness = 0
 
-  bg[NORMAL] = "#20242A"
+  bg[NORMAL] = "#25272d"
   bg[ACTIVE] = @selected_bg_color
   bg[PRELIGHT] = shade(1.1, @selected_bg_color)
   bg[SELECTED] = @selected_bg_color
 
-  fg[NORMAL] = "#edf5fb"
+  fg[NORMAL] = "#A8ADB5"
   fg[PRELIGHT] = @selected_fg_color
   fg[ACTIVE] = @selected_fg_color
   fg[SELECTED] = @selected_fg_color
 
-  text[NORMAL] = "#edf5fb"
-  text[PRELIGHT] = "#edf5fb"
-  text[ACTIVE] = "#edf5fb"
-  text[SELECTED] = "#edf5fb"
+  text[NORMAL] = "#A8ADB5"
+  text[PRELIGHT] = "#A8ADB5"
+  text[ACTIVE] = "#A8ADB5"
+  text[SELECTED] = "#A8ADB5"
 
   engine "murrine" {
     reliefstyle = 0
@@ -26,7 +26,7 @@ style "theme-panel" {
     gradient_shades = {1.0,1.0,1.0,1.0}
     textstyle = 0
     contrast = 0.0
-    textstyle = 1
+    textstyle = 0
   }
 }
 
@@ -48,7 +48,7 @@ style "panelbuttons" {
   ythickness = 0
 
   engine "murrine" {
-    textstyle = 1
+    textstyle = 0
   }
 }
 
@@ -63,7 +63,7 @@ style "theme-panel-text" {
   text[ACTIVE] = "#edf5fb"
 
   engine "murrine" {
-    textstyle = 1
+    textstyle = 0
     text_shade = 0.2
   }
 }
diff --git a/gtk-3.0/_applications.scss b/gtk-3.0/_applications.scss
index 18f95b5..701a936 100644
--- a/gtk-3.0/_applications.scss
+++ b/gtk-3.0/_applications.scss
@@ -170,15 +170,22 @@ NemoPathBar.linked > .button {
 .gedit-headerbar-paned { color: darken($header_bg, 7%); }
 
 .open-document-selector-treeview.view {
-    padding: 3px 6px 3px 6px;
-    border-color: $base_color;  // disable borders, making them transparent doesn't work for some reason
+  padding: 3px 6px 3px 6px;
+  border-color: $base_color;  // disable borders, making them transparent doesn't work for some reason
 
-    &:prelight { background-color: transparentize(black, 0.95); }
+  &:prelight {
+    background-color: transparentize(black, 0.95);
+
+    &:selected {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+  }
 }
 
 /* Only normal state is handle */
 .open-document-selector-name-label {
-    color: $fg_color;
+  color: $fg_color;
 }
 
 /* Only normal state is handle */
@@ -268,15 +275,36 @@ GeditFileBrowserWidget .toolbar {
 //
 
 GbSearchBox.linked {
+
+  > GtkMenuButton.button:last-child:dir(ltr),
+  > GtkMenuButton.button:first-child:dir(rtl) {
+    border-color: transparentize($header_fg, 0.7);
+    background-color: transparentize($button_bg, 0.1);
+
+    &:hover {
+      border-color: $selected_bg_color;
+    }
+    &:active, &:checked {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+      border-color: $selected_bg_color;
+    }
+  }
+
   > GtkMenuButton.button:last-child:dir(ltr) {
-    background-color: darken($header_bg, 6%);
+
+    border-left-style: none;
     border-radius: 0 14.5px 14.5px 0;
     outline-radius: 0 12.5px 12.5px 0;
+
+    &:hover { box-shadow: -1px 0 $selected_bg_color; }
   }
   > GtkMenuButton.button:first-child:dir(rtl) {
-    background-color: darken($header_bg, 6%);
+    border-right-style: none;
     border-radius: 14.5px 0 0 14.5px;
     outline-radius: 12.5px 0 0 12.5px;
+
+    &:hover { box-shadow: 1px 0 $selected_bg_color; }
   }
 }
 
@@ -307,21 +335,20 @@ GbPreferencesPageLanguage  {
 
 // Command Bar styling
 GtkBox.gb-command-bar-box {
-  //border: none;
-  //border-top: 1px solid nth($_borders_color, 2);
-  //background-image: linear-gradient(to bottom, nth($_base_color, 2));
-  //box-shadow: inset 0px 2px 3px -1px transparentize(black, 0.7);
+  border: none;
+  background-color: opacify($osd_bg_color, 1);
 
-  //GtkLabel { color: nth($_fg_color, 2); }
+  GtkLabel { color: $osd_fg_color; }
 }
 
 GtkEntry.gb-command-bar-entry.entry.flat,
 GtkEntry.gb-command-bar-entry.entry.flat:focus {
   font-family: Monospace;
+  color: $osd_fg_color;
   background-image: none;
-  background-color: transparent;
+  background-color: opacify($osd_bg_color, 1);
   padding: 6px 6px 6px 6px;
-  //color: nth($_fg_color, 2);
+  border: none;
 
   &:selected,
   &:selected:focus {
diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss
index 837c01d..aaf5bcd 100644
--- a/gtk-3.0/_common.scss
+++ b/gtk-3.0/_common.scss
@@ -1164,7 +1164,10 @@ GtkComboBox {
 
     &:backdrop { opacity: 0.85; }
 
-    &:focus { @include entry(header-focus); }
+    &:focus {
+      @include entry(header-focus);
+      background-clip: border-box;
+    }
     &:insensitive { @include entry(header-insensitive); }
 
     &:selected:focus {
@@ -1200,7 +1203,7 @@ GtkComboBox {
       @extend %linked;
     }
 
-  // Suggested and Destructive Action buttons
+  // Header-bar Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $suggested_color),
                              (destructive-action, $destructive_color) {
     .button.#{$b_type} {
@@ -1279,6 +1282,7 @@ GtkComboBox {
     &:backdrop { opacity: 0.75; }
   }
 
+  // Header-bar Scale
   .scale {
 
     &:backdrop { opacity: 0.75; }
@@ -2634,6 +2638,8 @@ GtkVolumeButton.button { padding: 8px; }
   &.ssd {
     border-radius: 4px 4px 0 0;
     box-shadow: 0 0 0 1px $_wm_border;
+
+    &.maximized { border-radius: 0; }
   }
   &.csd {
     &.popup, &.menu {
@@ -2681,7 +2687,6 @@ GtkVolumeButton.button { padding: 8px; }
     &:active, &:checked {
       @include button(header-active);
     }
-    //&:backdrop { color: $wm_unfocused_title; }
 
     &.close, &.maximize, &.minimize {
 
@@ -2713,28 +2718,6 @@ GtkVolumeButton.button { padding: 8px; }
 
 // catch all extend :)
 
-%dark_button {
-  color: $header_fg;
-  background-color: lighten($header_bg, 12.5%);
-
-  GtkLabel, GtkImage { color: $header_fg; }
-
-  &:hover {
-    color: $header_fg;
-    background-color: lighten($header_bg, 15%);
-
-    GtkLabel, GtkImage { color: $header_fg; }
-  }
-  &:active, &:checked {
-    color: $selected_bg_color;
-    background-image: none;
-    background-color: transparentize(darken($header_bg, 10%), 0.4);
-    border-color: transparentize(darken($header_bg, 14%), 0.4);
-
-    GtkLabel, GtkImage { color: $selected_bg_color; }
-  }
-}
-
 %selected_items {
   background-image: none;
   background-color: $selected_bg_color;
diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
index 3f2326c..a8a2e06 100644
--- a/gtk-3.0/gtk-contained.css
+++ b/gtk-3.0/gtk-contained.css
@@ -879,7 +879,8 @@ GtkComboBox {
   .primary-toolbar .entry:focus, .header-bar .entry:focus {
     color: #ffffff;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
+    background-image: linear-gradient(to bottom, #5294E2);
+    background-clip: border-box; }
   .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); }
@@ -2076,6 +2077,8 @@ GtkVolumeButton.button {
   .window-frame.ssd {
     border-radius: 4px 4px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); }
+    .window-frame.ssd.maximized {
+      border-radius: 0; }
   .window-frame.csd.popup, .window-frame.csd.menu {
     border-radius: 3px;
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); }
@@ -2352,6 +2355,9 @@ NemoPathBar.linked > .button {
   border-color: #ffffff; }
   .open-document-selector-treeview.view:prelight {
     background-color: rgba(0, 0, 0, 0.05); }
+    .open-document-selector-treeview.view:prelight:selected {
+      color: #ffffff;
+      background-color: #5294E2; }
 
 /* Only normal state is handle */
 .open-document-selector-name-label {
@@ -2420,14 +2426,31 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
+GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+  border-color: rgba(82, 93, 118, 0.1);
+  background-color: rgba(252, 253, 253, 0.9); }
+  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+    border-color: #5294E2; }
+  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active,
+  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+    color: #ffffff;
+    background-color: #5294E2;
+    border-color: #5294E2; }
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
-  background-color: rgba(214, 216, 221, 0.95);
+  border-left-style: none;
   border-radius: 0 14.5px 14.5px 0;
   outline-radius: 0 12.5px 12.5px 0; }
+  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
+    box-shadow: -1px 0 #5294E2; }
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
-  background-color: rgba(214, 216, 221, 0.95);
+  border-right-style: none;
   border-radius: 14.5px 0 0 14.5px;
   outline-radius: 12.5px 0 0 12.5px; }
+  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+    box-shadow: 1px 0 #5294E2; }
 
 GbEditorFrame .gb-search-slider {
   padding: 2px; }
@@ -2448,12 +2471,20 @@ GbPreferencesPageLanguage GtkSearchEntry {
 GbPreferencesPageLanguage GtkScrolledWindow {
   border-top-width: 0; }
 
+GtkBox.gb-command-bar-box {
+  border: none;
+  background-color: #3c4049; }
+  GtkBox.gb-command-bar-box GtkLabel {
+    color: #A8ADB5; }
+
 GtkEntry.gb-command-bar-entry.entry.flat,
 GtkEntry.gb-command-bar-entry.entry.flat:focus {
   font-family: Monospace;
+  color: #A8ADB5;
   background-image: none;
-  background-color: transparent;
-  padding: 6px 6px 6px 6px; }
+  background-color: #3c4049;
+  padding: 6px 6px 6px 6px;
+  border: none; }
 
 GbSourceStyleSchemeWidget GtkSourceView {
   font-family: Monospace; }