From 90238e49b95205fe7b73cf20ad6b87ed466634f1 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 9 May 2019 09:35:21 +0800
Subject: [PATCH] Fixed solid-csd issues and header issues

---
 src/gtk-3.0/gtk-aliz.css      | 231 ++++++++++++++++++----------------
 src/gtk-3.0/gtk-azul.css      | 231 ++++++++++++++++++----------------
 src/gtk-3.0/gtk-dark-aliz.css | 229 +++++++++++++++++----------------
 src/gtk-3.0/gtk-dark-azul.css | 229 +++++++++++++++++----------------
 src/gtk-3.0/gtk-dark-sea.css  | 229 +++++++++++++++++----------------
 src/gtk-3.0/gtk-sea.css       | 231 ++++++++++++++++++----------------
 src/gtk-3.0/sass/_colors.scss |   5 +-
 src/gtk-3.0/sass/_common.scss |  85 ++++++++-----
 8 files changed, 774 insertions(+), 696 deletions(-)

diff --git a/src/gtk-3.0/gtk-aliz.css b/src/gtk-3.0/gtk-aliz.css
index 9b87c354..aa7fde29 100644
--- a/src/gtk-3.0/gtk-aliz.css
+++ b/src/gtk-3.0/gtk-aliz.css
@@ -38,7 +38,7 @@
   background-color: #f7f7f7;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #efe7e7;
   border: none;
-  background-color: rgba(54, 54, 54, 0.95);
+  background-color: #252525;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
 .osd entry:disabled {
   color: rgba(239, 231, 231, 0.55);
-  background-color: rgba(110, 110, 110, 0.2);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #efe7e7;
-  background-color: rgba(54, 54, 54, 0.95);
-  border-color: rgba(34, 34, 34, 0.95);
+  background-color: #252525;
+  border-color: #101010;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
 button.osd:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 .osd button {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.4);
 }
 
 .osd button:hover {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(111, 111, 111, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
 .osd button:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(111, 111, 111, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(23, 23, 23, 0);
+  border-left-color: rgba(6, 6, 6, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 3px;
-  background-color: rgba(54, 54, 54, 0.85);
+  background-color: rgba(37, 37, 37, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(72, 72, 72, 0.95);
+  background-color: #363636;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #efe7e7;
-  background-color: alpha(rgba(54, 54, 54, 0.95),0.9);
+  background-color: alpha(#252525,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(111, 111, 111, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #323232;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.15);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #222222;
-  border-bottom: 1px solid #101010;
+  background-color: #f7f7f7;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#323232,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#323232,0.1);
   color: #323232;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(80, 80, 80, 0.95);
+  background-color: #252525;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #222222;
   border-radius: 0;
   margin: 0;
   background-color: #222222;
@@ -5504,8 +5513,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #fdfcfc;
-  background-color: rgba(54, 54, 54, 0.95);
-  border: 1px solid rgba(34, 34, 34, 0.95);
+  background-color: #252525;
+  border: 1px solid #101010;
   border-radius: 2px;
 }
 
@@ -5527,7 +5536,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(41, 41, 41, 0.95);
+  background-color: #181818;
 }
 
 #gf-bubble levelbar trough,
@@ -5597,7 +5606,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(54, 54, 54, 0.95);
+  color: #252525;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6801,7 +6810,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(34, 34, 34, 0.95);
+  border: 1px solid #101010;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6812,7 +6821,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(41, 41, 41, 0.95);
+  background-color: #181818;
   border: none;
   border-radius: 5px;
 }
@@ -7838,26 +7847,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(111, 111, 111, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7968,14 +7977,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(6, 6, 6, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8775,7 +8784,7 @@ scale.warmth trough {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: rgba(54, 54, 54, 0.95);
+  background-color: #252525;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -8785,26 +8794,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #efe7e7;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(111, 111, 111, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(6, 6, 6, 0.4);
   background-color: #F0544C;
 }
 
 #buttonbox_frame button:disabled {
-  color: #6e6b6b;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #615f5f;
+  border-color: rgba(6, 6, 6, 0.4);
+  background-color: rgba(93, 93, 93, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/gtk-azul.css b/src/gtk-3.0/gtk-azul.css
index 927b0488..0084f8c5 100644
--- a/src/gtk-3.0/gtk-azul.css
+++ b/src/gtk-3.0/gtk-azul.css
@@ -38,7 +38,7 @@
   background-color: #f7f7f7;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #e6ebee;
   border: none;
-  background-color: rgba(48, 52, 62, 0.95);
+  background-color: #1d1f27;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
 .osd entry:disabled {
   color: rgba(230, 235, 238, 0.55);
-  background-color: rgba(97, 105, 125, 0.2);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #e6ebee;
-  background-color: rgba(48, 52, 62, 0.95);
-  border-color: rgba(30, 33, 39, 0.95);
+  background-color: #1d1f27;
+  border-color: #0c0d10;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
 button.osd:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 .osd button {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.4);
 }
 
 .osd button:hover {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(93, 99, 123, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
 .osd button:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(93, 99, 123, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(21, 23, 28, 0);
+  border-left-color: rgba(3, 3, 4, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 3px;
-  background-color: rgba(48, 52, 62, 0.85);
+  background-color: rgba(29, 31, 39, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(64, 69, 82, 0.95);
+  background-color: #2c303b;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #e6ebee;
-  background-color: alpha(rgba(48, 52, 62, 0.95),0.9);
+  background-color: alpha(#1d1f27,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(93, 99, 123, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #2b2f3b;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.15);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #1b1d24;
-  border-bottom: 1px solid #0c0d10;
+  background-color: #f7f7f7;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#2b2f3b,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#2b2f3b,0.1);
   color: #2b2f3b;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(70, 76, 91, 0.95);
+  background-color: #1d1f27;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #1b1d24;
   border-radius: 0;
   margin: 0;
   background-color: #1b1d24;
@@ -5504,8 +5513,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #fbfcfc;
-  background-color: rgba(48, 52, 62, 0.95);
-  border: 1px solid rgba(30, 33, 39, 0.95);
+  background-color: #1d1f27;
+  border: 1px solid #0c0d10;
   border-radius: 2px;
 }
 
@@ -5527,7 +5536,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(37, 40, 48, 0.95);
+  background-color: #121418;
 }
 
 #gf-bubble levelbar trough,
@@ -5597,7 +5606,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(48, 52, 62, 0.95);
+  color: #1d1f27;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6801,7 +6810,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(30, 33, 39, 0.95);
+  border: 1px solid #0c0d10;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6812,7 +6821,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(37, 40, 48, 0.95);
+  background-color: #121418;
   border: none;
   border-radius: 5px;
 }
@@ -7838,26 +7847,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(93, 99, 123, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7968,14 +7977,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 3, 4, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8775,7 +8784,7 @@ scale.warmth trough {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: rgba(48, 52, 62, 0.95);
+  background-color: #1d1f27;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -8785,26 +8794,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #e6ebee;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(93, 99, 123, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(3, 3, 4, 0.4);
   background-color: #3498db;
 }
 
 #buttonbox_frame button:disabled {
-  color: #676b73;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #595c63;
+  border-color: rgba(3, 3, 4, 0.4);
+  background-color: rgba(77, 83, 103, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/gtk-dark-aliz.css b/src/gtk-3.0/gtk-dark-aliz.css
index b9013cf4..e982fe93 100644
--- a/src/gtk-3.0/gtk-dark-aliz.css
+++ b/src/gtk-3.0/gtk-dark-aliz.css
@@ -38,7 +38,7 @@
   background-color: #222222;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #cbbfbf;
   border: none;
-  background-color: rgba(54, 54, 54, 0.95);
+  background-color: #1d1d1d;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
 .osd entry:disabled {
   color: rgba(203, 191, 191, 0.55);
-  background-color: rgba(110, 110, 110, 0.2);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #cbbfbf;
-  background-color: rgba(54, 54, 54, 0.95);
-  border-color: rgba(34, 34, 34, 0.95);
+  background-color: #1d1d1d;
+  border-color: #090909;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
 button.osd:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 .osd button {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.4);
 }
 
 .osd button:hover {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(103, 103, 103, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
 .osd button:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(103, 103, 103, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(23, 23, 23, 0);
+  border-left-color: rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 3px;
-  background-color: rgba(54, 54, 54, 0.85);
+  background-color: rgba(29, 29, 29, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(72, 72, 72, 0.95);
+  background-color: #2f2f2f;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #cbbfbf;
-  background-color: alpha(rgba(54, 54, 54, 0.95),0.9);
+  background-color: alpha(#1d1d1d,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(103, 103, 103, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #cbbfbf;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.2);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #1a1a1a;
-  border-bottom: 1px solid #090909;
+  background-color: #222222;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#cbbfbf,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#cbbfbf,0.1);
   color: #cbbfbf;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(80, 80, 80, 0.95);
+  background-color: #1d1d1d;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #1a1a1a;
   border-radius: 0;
   margin: 0;
   background-color: #1a1a1a;
@@ -5503,8 +5512,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #dbd3d3;
-  background-color: rgba(54, 54, 54, 0.95);
-  border: 1px solid rgba(34, 34, 34, 0.95);
+  background-color: #1d1d1d;
+  border: 1px solid #090909;
   border-radius: 2px;
 }
 
@@ -5526,7 +5535,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(41, 41, 41, 0.95);
+  background-color: #101010;
 }
 
 #gf-bubble levelbar trough,
@@ -5596,7 +5605,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(54, 54, 54, 0.95);
+  color: #1d1d1d;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6796,7 +6805,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(34, 34, 34, 0.95);
+  border: 1px solid #090909;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6807,7 +6816,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(41, 41, 41, 0.95);
+  background-color: #101010;
   border: none;
   border-radius: 5px;
 }
@@ -7833,26 +7842,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(103, 103, 103, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7963,14 +7972,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(23, 23, 23, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8776,26 +8785,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #cbbfbf;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(128, 128, 128, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(103, 103, 103, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(23, 23, 23, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #F0544C;
 }
 
 #buttonbox_frame button:disabled {
-  color: #635f5f;
-  border-color: rgba(23, 23, 23, 0.35);
-  background-color: rgba(110, 110, 110, 0.2);
+  color: #514e4e;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(85, 85, 85, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/gtk-dark-azul.css b/src/gtk-3.0/gtk-dark-azul.css
index 0e4f8cc9..b17d3a3f 100644
--- a/src/gtk-3.0/gtk-dark-azul.css
+++ b/src/gtk-3.0/gtk-dark-azul.css
@@ -38,7 +38,7 @@
   background-color: #1b1d24;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #bbc3c8;
   border: none;
-  background-color: rgba(48, 52, 62, 0.95);
+  background-color: #17181e;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
 .osd entry:disabled {
   color: rgba(187, 195, 200, 0.55);
-  background-color: rgba(97, 105, 125, 0.2);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #bbc3c8;
-  background-color: rgba(48, 52, 62, 0.95);
-  border-color: rgba(30, 33, 39, 0.95);
+  background-color: #17181e;
+  border-color: #050607;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
 button.osd:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 .osd button {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.4);
 }
 
 .osd button:hover {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 92, 115, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
 .osd button:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 92, 115, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(21, 23, 28, 0);
+  border-left-color: rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 3px;
-  background-color: rgba(48, 52, 62, 0.85);
+  background-color: rgba(23, 24, 30, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(64, 69, 82, 0.95);
+  background-color: #262933;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #bbc3c8;
-  background-color: alpha(rgba(48, 52, 62, 0.95),0.9);
+  background-color: alpha(#17181e,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 92, 115, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #bbc3c8;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.2);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #14161b;
-  border-bottom: 1px solid #050607;
+  background-color: #1b1d24;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#bbc3c8,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#bbc3c8,0.1);
   color: #bbc3c8;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(70, 76, 91, 0.95);
+  background-color: #17181e;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #14161b;
   border-radius: 0;
   margin: 0;
   background-color: #14161b;
@@ -5503,8 +5512,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #cfd4d8;
-  background-color: rgba(48, 52, 62, 0.95);
-  border: 1px solid rgba(30, 33, 39, 0.95);
+  background-color: #17181e;
+  border: 1px solid #050607;
   border-radius: 2px;
 }
 
@@ -5526,7 +5535,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(37, 40, 48, 0.95);
+  background-color: #0c0d10;
 }
 
 #gf-bubble levelbar trough,
@@ -5596,7 +5605,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(48, 52, 62, 0.95);
+  color: #17181e;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6796,7 +6805,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(30, 33, 39, 0.95);
+  border: 1px solid #050607;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6807,7 +6816,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(37, 40, 48, 0.95);
+  background-color: #0c0d10;
   border: none;
   border-radius: 5px;
 }
@@ -7833,26 +7842,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 92, 115, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7963,14 +7972,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8776,26 +8785,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #bbc3c8;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(113, 122, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 92, 115, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(21, 23, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #3498db;
 }
 
 #buttonbox_frame button:disabled {
-  color: #5a5f67;
-  border-color: rgba(21, 23, 28, 0.35);
-  background-color: rgba(97, 105, 125, 0.2);
+  color: #484c51;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 76, 94, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/gtk-dark-sea.css b/src/gtk-3.0/gtk-dark-sea.css
index f9512f3e..1dc38ab1 100644
--- a/src/gtk-3.0/gtk-dark-sea.css
+++ b/src/gtk-3.0/gtk-dark-sea.css
@@ -38,7 +38,7 @@
   background-color: #1b2224;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #ccd7d4;
   border: none;
-  background-color: rgba(48, 59, 62, 0.95);
+  background-color: #171c1e;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
 .osd entry:disabled {
   color: rgba(204, 215, 212, 0.55);
-  background-color: rgba(97, 119, 125, 0.2);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #ccd7d4;
-  background-color: rgba(48, 59, 62, 0.95);
-  border-color: rgba(30, 37, 39, 0.95);
+  background-color: #171c1e;
+  border-color: #050607;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
 button.osd:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 .osd button {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.4);
 }
 
 .osd button:hover {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 108, 115, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
 .osd button:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 108, 115, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(21, 26, 28, 0);
+  border-left-color: rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 3px;
-  background-color: rgba(48, 59, 62, 0.85);
+  background-color: rgba(23, 28, 30, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(64, 78, 82, 0.95);
+  background-color: #263033;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #ccd7d4;
-  background-color: alpha(rgba(48, 59, 62, 0.95),0.9);
+  background-color: alpha(#171c1e,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 108, 115, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #ccd7d4;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.2);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #141a1b;
-  border-bottom: 1px solid #050607;
+  background-color: #1b2224;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#ccd7d4,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#ccd7d4,0.1);
   color: #ccd7d4;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(70, 86, 91, 0.95);
+  background-color: #171c1e;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #141a1b;
   border-radius: 0;
   margin: 0;
   background-color: #141a1b;
@@ -5503,8 +5512,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #e0e7e5;
-  background-color: rgba(48, 59, 62, 0.95);
-  border: 1px solid rgba(30, 37, 39, 0.95);
+  background-color: #171c1e;
+  border: 1px solid #050607;
   border-radius: 2px;
 }
 
@@ -5526,7 +5535,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(37, 45, 48, 0.95);
+  background-color: #0c0f10;
 }
 
 #gf-bubble levelbar trough,
@@ -5596,7 +5605,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(48, 59, 62, 0.95);
+  color: #171c1e;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6796,7 +6805,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(30, 37, 39, 0.95);
+  border: 1px solid #050607;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6807,7 +6816,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(37, 45, 48, 0.95);
+  background-color: #0c0f10;
   border: none;
   border-radius: 5px;
 }
@@ -7833,26 +7842,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 108, 115, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7963,14 +7972,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(0, 0, 0, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8776,26 +8785,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #ccd7d4;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(86, 108, 115, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: #2eb398;
 }
 
 #buttonbox_frame button:disabled {
-  color: #5f6a6b;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #4d5455;
+  border-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(71, 89, 94, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/gtk-sea.css b/src/gtk-3.0/gtk-sea.css
index 726df441..6bdd9aae 100644
--- a/src/gtk-3.0/gtk-sea.css
+++ b/src/gtk-3.0/gtk-sea.css
@@ -38,7 +38,7 @@
   background-color: #f7f7f7;
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px;
 }
 
@@ -169,7 +169,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd .scale-popup, .osd {
   color: #e5eceb;
   border: none;
-  background-color: rgba(48, 59, 62, 0.95);
+  background-color: #1d2527;
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -316,8 +316,8 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.4);
 }
 
 .osd entry image, .osd entry image:hover {
@@ -326,13 +326,13 @@ entry:drop(active):focus, entry:drop(active) {
 
 .osd entry:focus {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
 .osd entry:disabled {
   color: rgba(229, 236, 235, 0.55);
-  background-color: rgba(97, 119, 125, 0.2);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 .osd entry selection:focus, .osd entry selection {
@@ -499,8 +499,8 @@ button:drop(active), combobox:drop(active) button.combo {
 
 button.osd {
   color: #e5eceb;
-  background-color: rgba(48, 59, 62, 0.95);
-  border-color: rgba(30, 37, 39, 0.95);
+  background-color: #1d2527;
+  border-color: #0c0f10;
 }
 
 button.osd.image-button {
@@ -515,39 +515,39 @@ button.osd:hover {
 
 button.osd:active, button.osd:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
 button.osd:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 .osd button {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.4);
 }
 
 .osd button:hover {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(93, 117, 123, 0.5);
 }
 
 .osd button:active, .osd button:checked {
   background-clip: padding-box;
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
 .osd button:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 .osd button.flat, .osd button.sidebar-button, .osd button.budgie-menu-launcher, .osd .budgie-panel #tasklist-button, .budgie-panel .osd #tasklist-button, .osd .budgie-panel button.flat.launcher, .budgie-panel .osd button.flat.launcher {
@@ -559,20 +559,20 @@ button.osd:disabled {
 
 .osd button.flat:hover, .osd button.sidebar-button:hover, .osd button.budgie-menu-launcher:hover, .osd .budgie-panel #tasklist-button:hover, .budgie-panel .osd #tasklist-button:hover {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(93, 117, 123, 0.5);
 }
 
 .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd button.budgie-menu-launcher:disabled, .osd .budgie-panel #tasklist-button:disabled, .budgie-panel .osd #tasklist-button:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
   background-image: none;
 }
 
 .osd button.flat:active, .osd button.sidebar-button:active, .osd button.budgie-menu-launcher:active, .osd .budgie-panel #tasklist-button:active, .budgie-panel .osd #tasklist-button:active, .osd button.flat:checked, .osd button.sidebar-button:checked, .osd button.budgie-menu-launcher:checked, .osd .budgie-panel #tasklist-button:checked, .budgie-panel .osd #tasklist-button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
@@ -869,7 +869,7 @@ button.font separator, button.file separator {
 }
 
 .osd .linked:not(.vertical) > entry + entry {
-  border-left-color: rgba(21, 26, 28, 0);
+  border-left-color: rgba(3, 4, 4, 0);
 }
 
 .osd .linked:not(.vertical) > entry.error + entry,
@@ -942,12 +942,12 @@ button.font separator, button.file separator {
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0.4);
 }
 
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .osd .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0);
 }
 
 .osd .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button {
 
 .osd spinbutton:not(.vertical) > button:hover:not(:active),
 .osd spinbutton:not(.vertical) > button:hover + button {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0.4);
 }
 
 .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active),
@@ -1329,7 +1329,7 @@ toolbar.osd, .osd.inline-toolbar {
   padding: 7px;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 3px;
-  background-color: rgba(48, 59, 62, 0.85);
+  background-color: rgba(29, 37, 39, 0.9);
 }
 
 toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar {
@@ -1540,15 +1540,15 @@ headerbar.default-decoration,
   border-top-right-radius: 2px;
 }
 
-.titlebar, .titlebar > headerbar {
+.titlebar, .titlebar headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
 .tiled .titlebar,
 .maximized .titlebar,
-.fullscreen .titlebar, .tiled .titlebar > headerbar,
-.maximized .titlebar > headerbar,
-.fullscreen .titlebar > headerbar {
+.fullscreen .titlebar, .tiled .titlebar headerbar,
+.maximized .titlebar headerbar,
+.fullscreen .titlebar headerbar {
   box-shadow: none;
 }
 
@@ -1653,7 +1653,6 @@ window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
   background: none;
   border: none;
-  box-shadow: none;
 }
 
 .titlebar:not(headerbar) > separator {
@@ -3396,7 +3395,7 @@ scale trough:disabled {
 }
 
 .osd scale trough {
-  background-color: rgba(64, 78, 82, 0.95);
+  background-color: #2c383b;
 }
 
 .osd scale trough highlight {
@@ -3840,12 +3839,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 .app-notification {
   padding: 10px;
   color: #e5eceb;
-  background-color: alpha(rgba(48, 59, 62, 0.95),0.9);
+  background-color: alpha(#1d2527,0.9);
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
 }
 
 .app-notification border {
@@ -3854,8 +3853,8 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.4);
 }
 
 .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.budgie-menu-launcher, .app-notification .budgie-panel #tasklist-button, .budgie-panel .app-notification #tasklist-button, .app-notification .budgie-panel button.flat.launcher, .budgie-panel .app-notification button.flat.launcher {
@@ -3864,21 +3863,21 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification button:hover {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(93, 117, 123, 0.5);
 }
 
 .app-notification button:active, .app-notification button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
   background-clip: padding-box;
 }
 
 .app-notification button:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 .app-notification .linked:not(.vertical) > entry + entry {
@@ -3955,12 +3954,12 @@ row.activatable:selected.has-open-popup, .view:selected.has-open-popup, textview
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0.4);
 }
 
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .app-notification .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0);
 }
 
 .app-notification .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -4033,44 +4032,28 @@ calendar.highlight {
   color: #273134;
 }
 
-messagedialog .linked:not(.vertical) > button,
-messagedialog .linked:not(.vertical) > button:hover,
-messagedialog .linked:not(.vertical) > button:active,
-messagedialog .linked:not(.vertical) > button:checked,
-messagedialog .linked:not(.vertical) > button:disabled {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled {
   border-radius: 0;
   border-top: 1px solid rgba(0, 0, 0, 0.15);
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:last-child,
-messagedialog .linked:not(.vertical) > button:hover:last-child,
-messagedialog .linked:not(.vertical) > button:active:last-child,
-messagedialog .linked:not(.vertical) > button:checked:last-child,
-messagedialog .linked:not(.vertical) > button:disabled:last-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 0;
   border-right: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:first-child,
-messagedialog .linked:not(.vertical) > button:hover:first-child,
-messagedialog .linked:not(.vertical) > button:active:first-child,
-messagedialog .linked:not(.vertical) > button:checked:first-child,
-messagedialog .linked:not(.vertical) > button:disabled:first-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 0;
   border-left: none;
   border-bottom: none;
 }
 
-messagedialog .linked:not(.vertical) > button:only-child,
-messagedialog .linked:not(.vertical) > button:hover:only-child,
-messagedialog .linked:not(.vertical) > button:active:only-child,
-messagedialog .linked:not(.vertical) > button:checked:only-child,
-messagedialog .linked:not(.vertical) > button:disabled:only-child {
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog.csd .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-left: none;
@@ -4078,37 +4061,63 @@ messagedialog .linked:not(.vertical) > button:disabled:only-child {
   border-bottom: none;
 }
 
-messagedialog .titlebar {
+messagedialog.csd .titlebar {
   min-height: 20px;
-  background-color: #1b2224;
-  border-bottom: 1px solid #0c0f10;
+  background-color: #f7f7f7;
+  border: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.13);
 }
 
-messagedialog .dialog-action-area button {
-  padding: 8px;
-  min-height: 0;
+messagedialog .dialog-action-area.linked:not(.vertical) > button {
+  padding: 5px 10px;
+  border-radius: 0;
+  border: none;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
 }
 
-messagedialog.background, messagedialog.csd.background {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border: none;
+messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked {
+  transition: background-color 0.00001s 0.2s;
+  animation: ripple_effect 0.2s cubic-bezier(0, 0, 0.2, 1);
 }
 
-messagedialog .dialog-action-area button:active, messagedialog .dialog-action-area button:checked, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:checked {
-  transition: background-color 0.00001s 0.3s;
-  animation: ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
+messagedialog .dialog-action-area.linked:not(.vertical) > button, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover, messagedialog .dialog-action-area.linked:not(.vertical) > button:active, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled {
+  border-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:first-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:last-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:last-child {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):hover {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:hover:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:active:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:checked:only-child, messagedialog .dialog-action-area.linked:not(.vertical) > button:disabled:only-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):hover {
   background-color: alpha(#273134,0.06);
 }
 
-messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):active, messagedialog.csd .dialog-action-area button:not(.suggested-action):not(.destructive-action):checked {
+messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active, messagedialog .dialog-action-area.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked {
   background-color: alpha(#273134,0.1);
   color: #273134;
 }
 
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none;
+}
+
+messagedialog.csd .dialog-action-area.linked:not(.vertical) > button {
+  padding: 6px 10px 8px 10px;
+}
+
 filechooser #pathbarbox {
   border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
@@ -4366,7 +4375,7 @@ tooltip {
 }
 
 tooltip.background {
-  background-color: rgba(70, 86, 91, 0.95);
+  background-color: #1d2527;
   background-clip: padding-box;
 }
 
@@ -4597,7 +4606,7 @@ messagedialog.csd decoration {
 }
 
 .solid-csd decoration {
-  border: none;
+  border: 1px solid #1b2224;
   border-radius: 0;
   margin: 0;
   background-color: #1b2224;
@@ -5504,8 +5513,8 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #fafbfb;
-  background-color: rgba(48, 59, 62, 0.95);
-  border: 1px solid rgba(30, 37, 39, 0.95);
+  background-color: #1d2527;
+  border: 1px solid #0c0f10;
   border-radius: 2px;
 }
 
@@ -5527,7 +5536,7 @@ list#AutostartListBoxTweakGroup.tweak-group-startup {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: rgba(37, 45, 48, 0.95);
+  background-color: #121718;
 }
 
 #gf-bubble levelbar trough,
@@ -5597,7 +5606,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: rgba(48, 59, 62, 0.95);
+  color: #1d2527;
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6801,7 +6810,7 @@ UnityPanelWidget:backdrop,
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid rgba(30, 37, 39, 0.95);
+  border: 1px solid #0c0f10;
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6812,7 +6821,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: rgba(37, 45, 48, 0.95);
+  background-color: #121718;
   border: none;
   border-radius: 5px;
 }
@@ -7838,26 +7847,26 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-notification-window button, .budgie-osd-window button, .budgie-switcher-window button {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.4);
 }
 
 .budgie-notification-window button:hover, .budgie-osd-window button:hover, .budgie-switcher-window button:hover {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(93, 117, 123, 0.5);
 }
 
 .budgie-notification-window button:active, .budgie-osd-window button:active, .budgie-switcher-window button:active, .budgie-notification-window button:checked, .budgie-osd-window button:checked, .budgie-switcher-window button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
 .budgie-notification-window button:disabled, .budgie-osd-window button:disabled, .budgie-switcher-window button:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 .budgie-notification-window .linked:not(.vertical) > entry + entry, .budgie-osd-window .linked:not(.vertical) > entry + entry, .budgie-switcher-window .linked:not(.vertical) > entry + entry {
@@ -7968,14 +7977,14 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0.35);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0.4);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child), .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled:not(:only-child),
 .budgie-notification-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-osd-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover),
 .budgie-switcher-window .linked:not(.vertical) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):disabled + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):not(:hover) {
-  box-shadow: inset 1px 0 rgba(21, 26, 28, 0);
+  box-shadow: inset 1px 0 rgba(3, 4, 4, 0);
 }
 
 .budgie-notification-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-osd-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, .budgie-switcher-window .linked:not(.vertical) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover,
@@ -8775,7 +8784,7 @@ scale.warmth trough {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: rgba(48, 59, 62, 0.95);
+  background-color: #1d2527;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -8785,26 +8794,26 @@ scale.warmth trough {
 
 #buttonbox_frame button {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.4);
 }
 
 #buttonbox_frame button:hover {
   color: #e5eceb;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(113, 138, 145, 0.45);
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(93, 117, 123, 0.5);
 }
 
 #buttonbox_frame button:active, #buttonbox_frame button:checked {
   color: #ffffff;
-  border-color: rgba(21, 26, 28, 0.35);
+  border-color: rgba(3, 4, 4, 0.4);
   background-color: #2eb398;
 }
 
 #buttonbox_frame button:disabled {
-  color: #667072;
-  border-color: rgba(21, 26, 28, 0.35);
-  background-color: rgba(97, 119, 125, 0.2);
+  color: #596162;
+  border-color: rgba(3, 4, 4, 0.4);
+  background-color: rgba(77, 97, 103, 0.25);
 }
 
 #login_window #user_combobox {
diff --git a/src/gtk-3.0/sass/_colors.scss b/src/gtk-3.0/sass/_colors.scss
index 6ecd7b13..9103915d 100644
--- a/src/gtk-3.0/sass/_colors.scss
+++ b/src/gtk-3.0/sass/_colors.scss
@@ -47,18 +47,21 @@ $suggested_color: #db5b5b;
 $destructive_fg_color: white;
 $suggested_fg_color: white;
 $progress_color: #db5b5b;
+
 @if $color=='aliz' {
     $progress_color: #00C487;
     $success_color: #3498db;
     $destructive_color: #db5b5b;
     $suggested_color: #2eb398;
 }
+
 @if $color=='azul' {
     $progress_color: #7C4DFF;
     $success_color: #2eb398;
     $destructive_color: #db5b5b;
     $suggested_color: #4146d1;
 }
+
 $drop_target_color: #F08437;
 
 //insensitive state derived colors
@@ -85,7 +88,7 @@ $dark_sidebar_fg: $header_fg;
 $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%));
 
 $osd_fg_color: $dark_sidebar_fg;
-$osd_bg_color: $dark_sidebar_bg;
+$osd_bg_color: lighten($header_bg, 1%);
 
 $osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
 $osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index d6ad2d83..c878b9ad 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -35,7 +35,7 @@ $asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark var
   background-color: if($transparency == 'true', rgba($bg_color, 1), $bg_color); // without this headerbar transparency doesn't seem to work
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px; // menus background
 }
 
@@ -1118,7 +1118,7 @@ headerbar,
     border-top-right-radius: 2px;
   }
 
-  &, & > headerbar {
+  &, & headerbar {
     box-shadow: inset 0 1px $highlight;
 
     .tiled &,
@@ -1229,7 +1229,7 @@ headerbar {
       padding: 0;
       background: none;
       border: none;
-      box-shadow: none;
+      // box-shadow: none;
     }
   }
 
@@ -2843,42 +2843,44 @@ calendar {
 
 messagedialog { // Message Dialog styling
 
-  .titlebar {
+  &.csd .titlebar {
     min-height: 20px;
-    background-color: $header_bg;
-    border-bottom: 1px solid darken($header_bg, 7%);
+    background-color: $bg_color;
+    border: none;
+    box-shadow: inset 0 1px $highlight;
   }
 
-  .dialog-action-area button { padding: 8px; min-height: 0; }
-
-  .linked:not(.vertical) > button,
-  .linked:not(.vertical) > button:hover,
-  .linked:not(.vertical) > button:active,
-  .linked:not(.vertical) > button:checked,
-  .linked:not(.vertical) > button:disabled {
-    @extend %middle_button;
-    &:first-child { @extend %first_button; }
-    &:last-child { @extend %last_button; }
-    &:only-child { @extend %single_button; }
-  }
+  .dialog-action-area.linked:not(.vertical) > button {
+    padding: 5px 10px;
+    border-radius: 0;
+    border: none;
+    border-top: 1px solid $borders_color;
 
-  &, &.csd { // rounded bottom border styling for csd version
-    &.background {
-      border-bottom-left-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border: none;
+    &:active, &:checked {
+      transition: background-color 0.00001s 0.2s;
+      animation: ripple_effect 0.2s cubic-bezier(0.0, 0.0, 0.2, 1);
     }
 
-    .dialog-action-area {
-      button {
-        &:active, &:checked {
-          transition: background-color 0.00001s 0.3s;
-          animation: ripple_effect 0.3s cubic-bezier(0.0, 0.0, 0.2, 1);
-        }
+    &, &:hover, &:active, &:checked, &:disabled {
+      border-radius: 0;
+
+      &:first-child {
+        border-bottom-left-radius: 0;
+        border-top-left-radius: 0;
+      }
+
+      &:last-child {
+        border-bottom-right-radius: 0;
+        border-top-right-radius: 0;
+      }
+
+      &:only-child {
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
       }
     }
 
-    .dialog-action-area button:not(.suggested-action):not(.destructive-action) {
+    &:not(.suggested-action):not(.destructive-action) {
       &:hover { background-color: gtkalpha($fg_color, 0.06); }
       &:active, &:checked {
         background-color: gtkalpha($fg_color, 0.1);
@@ -2886,6 +2888,25 @@ messagedialog { // Message Dialog styling
       }
     }
   }
+
+  &.csd { // rounded bottom border styling for csd version
+    &.background {
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px;
+      border: none;
+    }
+
+    .dialog-action-area.linked:not(.vertical) > button {
+      padding: 6px 10px 8px 10px;
+
+      &, &:hover, &:active, &:checked, &:disabled {
+        @extend %middle_button;
+        &:first-child { @extend %first_button; }
+        &:last-child { @extend %last_button; }
+        &:only-child { @extend %single_button; }
+      }
+    }
+  }
 }
 
 //
@@ -3162,7 +3183,7 @@ tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: lighten($osd_bg_color, 10%);
+    background-color: $osd_bg_color;
     background-clip: padding-box;
 
     label { padding: 4px; }
@@ -3390,7 +3411,7 @@ decoration {
     border-radius: 3px;
   }
   .solid-csd & {
-    border: none;
+    border: 1px solid $header_bg;
     border-radius: 0;
     margin: 0;
     background-color: $header_bg;