diff --git a/src/gtk-2.0/assets-dark.svg b/src/gtk-2.0/assets-dark.svg
index c4dc25f..ca1c32e 100644
--- a/src/gtk-2.0/assets-dark.svg
+++ b/src/gtk-2.0/assets-dark.svg
@@ -15,7 +15,7 @@
    height="416"
    id="svg9892"
    version="1.1"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="assets-dark.svg">
   <defs
      id="defs9894">
@@ -884,17 +884,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="57.829439"
-     inkscape:cy="78.998043"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="332.22647"
+     inkscape:cy="141.06159"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showborder="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -6050,5 +6050,71 @@
         </g>
       </g>
     </g>
+    <g
+       transform="translate(117.5,165)"
+       style="display:inline"
+       id="pathbar_button_active"
+       inkscape:label="#g5484">
+      <g
+         style="fill:#fafbfc;fill-opacity:1"
+         id="g946"
+         inkscape:label="#g5032"
+         transform="translate(57.5)">
+        <rect
+           inkscape:label="#rect5007"
+           y="-152.63782"
+           x="245"
+           height="15"
+           width="25"
+           id="rect944"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(1,0,0,0.13333351,57.5,-119.28608)"
+         inkscape:label="#g5032"
+         id="g950">
+        <rect
+           style="opacity:1;fill:#0046db;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect948"
+           width="25"
+           height="15"
+           x="245"
+           y="-152.63782"
+           inkscape:label="#rect5007" />
+      </g>
+    </g>
+    <g
+       id="pathbar_button_prelight"
+       transform="translate(117.5,189.99999)"
+       style="display:inline;opacity:0.5"
+       inkscape:label="#g5494">
+      <g
+         transform="translate(57.5)"
+         inkscape:label="#g5032"
+         id="g5488"
+         style="fill:#fafbfc;fill-opacity:1">
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5486"
+           width="25"
+           height="15"
+           x="245"
+           y="-152.63782"
+           inkscape:label="#rect5007" />
+      </g>
+      <g
+         id="g5492"
+         inkscape:label="#g5032"
+         transform="matrix(1,0,0,0.13333351,57.5,-119.28608)">
+        <rect
+           inkscape:label="#rect5007"
+           y="-152.63782"
+           x="245"
+           height="15"
+           width="25"
+           id="rect5490"
+           style="opacity:1;fill:#0046db;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/gtk-2.0/assets-dark/pathbar_button_active.png b/src/gtk-2.0/assets-dark/pathbar_button_active.png
new file mode 100644
index 0000000..a8e22a9
Binary files /dev/null and b/src/gtk-2.0/assets-dark/pathbar_button_active.png differ
diff --git a/src/gtk-2.0/assets-dark/pathbar_button_prelight.png b/src/gtk-2.0/assets-dark/pathbar_button_prelight.png
new file mode 100644
index 0000000..a43b7f9
Binary files /dev/null and b/src/gtk-2.0/assets-dark/pathbar_button_prelight.png differ
diff --git a/src/gtk-2.0/assets-light.svg b/src/gtk-2.0/assets-light.svg
index 134724f..69de93c 100644
--- a/src/gtk-2.0/assets-light.svg
+++ b/src/gtk-2.0/assets-light.svg
@@ -15,7 +15,7 @@
    height="416"
    id="svg9892"
    version="1.1"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="assets-light.svg">
   <defs
      id="defs9894">
@@ -1149,6 +1149,14 @@
        y1="-152.63782"
        x2="263"
        y2="-137.63782" />
+    <linearGradient
+       id="selected_bg_color-3"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop5012-6" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1157,17 +1165,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8119509"
-     inkscape:cx="111.72111"
-     inkscape:cy="77.772958"
+     inkscape:zoom="1.9883496"
+     inkscape:cx="382.65522"
+     inkscape:cy="114.9"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showborder="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -6328,5 +6336,71 @@
         </g>
       </g>
     </g>
+    <g
+       transform="translate(117.5,165)"
+       style="display:inline"
+       id="pathbar_button_active"
+       inkscape:label="#g5484">
+      <g
+         style="fill:#fafbfc;fill-opacity:1"
+         id="g946"
+         inkscape:label="#g5032"
+         transform="translate(57.5)">
+        <rect
+           inkscape:label="#rect5007"
+           y="-152.63782"
+           x="245"
+           height="15"
+           width="25"
+           id="rect944"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(1,0,0,0.13333351,57.5,-119.28608)"
+         inkscape:label="#g5032"
+         id="g950">
+        <rect
+           style="opacity:1;fill:#0046db;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect948"
+           width="25"
+           height="15"
+           x="245"
+           y="-152.63782"
+           inkscape:label="#rect5007" />
+      </g>
+    </g>
+    <g
+       id="pathbar_button_prelight"
+       transform="translate(117.5,189.99999)"
+       style="display:inline;opacity:0.5"
+       inkscape:label="#g5494">
+      <g
+         transform="translate(57.5)"
+         inkscape:label="#g5032"
+         id="g5488"
+         style="fill:#fafbfc;fill-opacity:1">
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5486"
+           width="25"
+           height="15"
+           x="245"
+           y="-152.63782"
+           inkscape:label="#rect5007" />
+      </g>
+      <g
+         id="g5492"
+         inkscape:label="#g5032"
+         transform="matrix(1,0,0,0.13333351,57.5,-119.28608)">
+        <rect
+           inkscape:label="#rect5007"
+           y="-152.63782"
+           x="245"
+           height="15"
+           width="25"
+           id="rect5490"
+           style="opacity:1;fill:#0046db;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/gtk-2.0/assets-light/pathbar_button_active.png b/src/gtk-2.0/assets-light/pathbar_button_active.png
new file mode 100644
index 0000000..a8e22a9
Binary files /dev/null and b/src/gtk-2.0/assets-light/pathbar_button_active.png differ
diff --git a/src/gtk-2.0/assets-light/pathbar_button_prelight.png b/src/gtk-2.0/assets-light/pathbar_button_prelight.png
new file mode 100644
index 0000000..a43b7f9
Binary files /dev/null and b/src/gtk-2.0/assets-light/pathbar_button_prelight.png differ
diff --git a/src/gtk-2.0/assets.txt b/src/gtk-2.0/assets.txt
index 706430e..61e50cc 100644
--- a/src/gtk-2.0/assets.txt
+++ b/src/gtk-2.0/assets.txt
@@ -132,3 +132,5 @@ inline-toolbar
 toolbar
 menubar
 focus-line
+pathbar_button_active
+pathbar_button_prelight
diff --git a/src/gtk-2.0/common/panel.rc b/src/gtk-2.0/common/panel.rc
index 4526dab..f3dee16 100644
--- a/src/gtk-2.0/common/panel.rc
+++ b/src/gtk-2.0/common/panel.rc
@@ -1,5 +1,5 @@
 style "theme-panel" {
-
+  GtkButton::inner-border = { 0, 0, 0, 0 }
   xthickness = 2
   ythickness = 0
 
@@ -18,15 +18,13 @@ style "theme-panel" {
   text[ACTIVE] = shade(1.0, @tooltip_fg_color)
   text[SELECTED] = @selected_fg_color
 
-  engine "murrine" {
-    reliefstyle = 0
-    glazestyle = 0
-    glow_shade = 1.0
-    highlight_shade = 1.0
-    roundness = 0
-    gradient_shades = {1.0,1.0,1.0,1.0}
-    textstyle = 0
-    contrast = 0.0
+  engine "pixmap" {
+    image {
+      function = SHADOW
+      file     = "assets/null.png"
+      border   = { 0, 0, 0, 0 }
+      stretch  = TRUE
+    }
   }
 }
 
@@ -47,15 +45,54 @@ style "panelbar" {
 }
 
 style "panelbuttons" {
-
+  GtkButton::inner-border = { 0, 0, 0, 0 }
   xthickness = 4
   ythickness = 0
 
-  engine "murrine" {
-    textstyle = 0
+  fg[NORMAL] = shade(0.8, @tooltip_fg_color)
+  fg[PRELIGHT] = @selected_fg_color
+  fg[ACTIVE] = @selected_fg_color
+  fg[SELECTED] = @selected_fg_color
+  fg[INSENSITIVE] = mix(0.28, @tooltip_fg_color, @tooltip_bg_color)
+  bg[PRELIGHT] = shade(1.2, @tooltip_bg_color)
+  bg[ACTIVE] = shade(1.5, @tooltip_bg_color)
+
+  engine "pixmap" {
+    image {
+      function = BOX
+      state    = NORMAL
+      file     = "assets/null.png"
+      border   = { 0, 0, 0, 2 }
+      stretch  = TRUE
+    }
+    image {
+      function = BOX
+      state    = ACTIVE
+      file     = "assets/pathbar_button_active.png"
+      border   = { 0, 0, 0, 2 }
+      stretch  = TRUE
+    }
+    image {
+      function = BOX
+      state    = PRELIGHT
+      file     = "assets/pathbar_button_prelight.png"
+      border   = { 0, 0, 0, 2 }
+      stretch  = TRUE
+    }
+    image {
+      function = BOX
+      state    = INSENSITIVE
+      file     = "assets/null.png"
+      border   = { 0, 0, 0, 2 }
+      stretch  = TRUE
+    }
   }
 }
 
+style "regular-label" {
+  font_name = "Regular"
+}
+
 style "theme-panel-text" {
 
   fg[NORMAL] = shade(1.0, @tooltip_fg_color)
@@ -111,9 +148,12 @@ widget_class "*Xfce*Panel*Button*"                    style "panelbuttons"
 widget_class "*<XfceArrowButton>"                     style "panelbuttons"
 widget_class "*<XfceActionsPlugin>*"                  style "panelbuttons"
 widget_class "*XfcePanelPlugin.GtkButton"             style "panelbuttons"
+widget_class "*XfcePanelPlugin.GtkToggleButton"       style "panelbuttons"
 widget "*dict*Applet*"                                style "panelbuttons"
 widget_class "*Xfce*NetkTasklist*GtkToggleButton"     style "panelbuttons"
 widget_class "*Tasklist*"                             style:highest "panelbuttons"
+widget_class "*Tasklist*.GtkLabel"                    style:highest "regular-label"
+widget_class "*Mixer*lugin*"                          style:highest "panelbuttons"
 
 class "*Panel*MenuBar*"                               style "panelbar"
 widget_class "*Panel*MenuBar*"                        style "panelbar"
diff --git a/src/gtk-2.0/gtkrc-dark b/src/gtk-2.0/gtkrc-dark
index aee814f..00a4fa5 100644
--- a/src/gtk-2.0/gtkrc-dark
+++ b/src/gtk-2.0/gtkrc-dark
@@ -2,7 +2,7 @@ gtk-color-scheme = "base_color: #242424"
 gtk-color-scheme = "text_color: #dedede"
 gtk-color-scheme = "bg_color: #333333"
 gtk-color-scheme = "fg_color: #dedede"
-gtk-color-scheme = "tooltip_bg_color: #373737"
+gtk-color-scheme = "tooltip_bg_color: #3B3B3B"
 gtk-color-scheme = "tooltip_fg_color: #dedede"
 gtk-color-scheme = "selected_bg_color: #0062FF"
 gtk-color-scheme = "selected_fg_color: #ffffff"
diff --git a/src/gtk-2.0/gtkrc-light b/src/gtk-2.0/gtkrc-light
index 715b15a..98b1e1f 100644
--- a/src/gtk-2.0/gtkrc-light
+++ b/src/gtk-2.0/gtkrc-light
@@ -2,7 +2,7 @@ gtk-color-scheme = "base_color: #ffffff"
 gtk-color-scheme = "text_color: #363636"
 gtk-color-scheme = "bg_color: #f5f5f5"
 gtk-color-scheme = "fg_color: #242424"
-gtk-color-scheme = "tooltip_bg_color: #e5e5e5"
+gtk-color-scheme = "tooltip_bg_color: #FEFEFE"
 gtk-color-scheme = "tooltip_fg_color: #363636"
 gtk-color-scheme = "selected_bg_color: #0e6bff"
 gtk-color-scheme = "selected_fg_color: #ffffff"
diff --git a/src/gtk-3.0/gtk-compact-dark-solid-thin.css b/src/gtk-3.0/gtk-compact-dark-solid-thin.css
index f082552..0920aaf 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-thin.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2448,6 +2448,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4237,9 +4242,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4248,7 +4257,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5121,6 +5136,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6253,62 +6273,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: #3B3B3B;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: #3B3B3B;
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: #555555;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8853,7 +8967,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index accd13e..4439d58 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2448,6 +2448,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4237,9 +4242,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4248,7 +4257,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5121,6 +5136,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6253,62 +6273,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: #3B3B3B;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: #3B3B3B;
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: #555555;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8853,7 +8967,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-dark-thin.css b/src/gtk-3.0/gtk-compact-dark-thin.css
index 4c4d6f6..9b2015f 100644
--- a/src/gtk-3.0/gtk-compact-dark-thin.css
+++ b/src/gtk-3.0/gtk-compact-dark-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2448,6 +2448,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4237,9 +4242,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4248,7 +4257,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5121,6 +5136,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6253,62 +6273,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(59, 59, 59, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: rgba(59, 59, 59, 0.95);
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(85, 85, 85, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8853,7 +8967,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index 93d7df5..f6a6cba 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2448,6 +2448,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4237,9 +4242,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4248,7 +4257,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5121,6 +5136,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6253,62 +6273,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(59, 59, 59, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: rgba(59, 59, 59, 0.95);
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(85, 85, 85, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8853,7 +8967,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-light-solid-thin.css b/src/gtk-3.0/gtk-compact-light-solid-thin.css
index e6bdc6f..a55ed10 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-thin.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2452,6 +2452,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4245,9 +4250,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4256,7 +4265,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5131,6 +5146,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6258,62 +6278,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: #FEFEFE;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: #FEFEFE;
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: white;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6524,8 +6638,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6676,8 +6790,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6688,8 +6802,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7728,16 +7842,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8867,10 +8981,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 1f822f7..704d666 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2452,6 +2452,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4245,9 +4250,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4256,7 +4265,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5131,6 +5146,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6258,62 +6278,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: #FEFEFE;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: #FEFEFE;
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: white;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6524,8 +6638,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6676,8 +6790,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6688,8 +6802,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7728,16 +7842,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8867,10 +8981,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-light-thin.css b/src/gtk-3.0/gtk-compact-light-thin.css
index bb28880..473609f 100644
--- a/src/gtk-3.0/gtk-compact-light-thin.css
+++ b/src/gtk-3.0/gtk-compact-light-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2452,6 +2452,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4245,9 +4250,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4256,7 +4265,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5131,6 +5146,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6258,62 +6278,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(254, 254, 254, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: rgba(254, 254, 254, 0.95);
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(255, 255, 255, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6524,8 +6638,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6676,8 +6790,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6688,8 +6802,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7728,16 +7842,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8867,10 +8981,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 5f03992..77fa1b1 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2452,6 +2452,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4245,9 +4250,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4256,7 +4265,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5131,6 +5146,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6258,62 +6278,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(254, 254, 254, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: rgba(254, 254, 254, 0.95);
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(255, 255, 255, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6524,8 +6638,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6676,8 +6790,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6688,8 +6802,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7728,16 +7842,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8867,10 +8981,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-dark-solid-thin.css b/src/gtk-3.0/gtk-dark-solid-thin.css
index c802d49..3b5b6b4 100644
--- a/src/gtk-3.0/gtk-dark-solid-thin.css
+++ b/src/gtk-3.0/gtk-dark-solid-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2446,6 +2446,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4235,9 +4240,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4246,7 +4255,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5120,6 +5135,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6254,62 +6274,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: #3B3B3B;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: #3B3B3B;
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: #555555;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8854,7 +8968,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index 9fcadcd..8a5e15c 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2446,6 +2446,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4235,9 +4240,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4246,7 +4255,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5120,6 +5135,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6254,62 +6274,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: #3B3B3B;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: #3B3B3B;
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: #555555;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8854,7 +8968,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-dark-thin.css b/src/gtk-3.0/gtk-dark-thin.css
index 5e669a9..0f1a641 100644
--- a/src/gtk-3.0/gtk-dark-thin.css
+++ b/src/gtk-3.0/gtk-dark-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2446,6 +2446,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4235,9 +4240,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4246,7 +4255,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5120,6 +5135,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6254,62 +6274,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(59, 59, 59, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: rgba(59, 59, 59, 0.95);
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(85, 85, 85, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8854,7 +8968,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 9e06a7a..1c6b2b8 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #2c2c2c;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #166dff;
   background-color: rgba(22, 109, 255, 0.2);
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2446,6 +2446,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(222, 222, 222, 0.45);
@@ -4235,9 +4240,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #484848;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4246,7 +4255,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5120,6 +5135,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6254,62 +6274,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #dedede;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #dedede;
+  box-shadow: inset 0 -2px rgba(73, 141, 255, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #dedede;
+  box-shadow: inset 0 -2px #498dff;
+  background-color: rgba(222, 222, 222, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(222, 222, 222, 0.18);
+  color: #dedede;
+  background-image: none;
+  box-shadow: inset 0 -2px #498dff;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(59, 59, 59, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(222, 222, 222, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-#tasklist-button:hover {
-  color: #f8f8f8;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #333333;
+  color: #dedede;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #498dff;
+.xfce4-panel {
+  background-color: rgba(59, 59, 59, 0.95);
+  color: #dedede;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #dedede;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(59, 59, 59, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(85, 85, 85, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #498dff;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #498dff;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #242424;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #498dff;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: #dedede;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -8854,7 +8968,7 @@ window.budgie-switcher-window flowboxchild {
   text-shadow: none;
   -gtk-icon-shadow: none;
   border-color: rgba(255, 255, 255, 0.12);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-light-solid-thin.css b/src/gtk-3.0/gtk-light-solid-thin.css
index b66b2ae..7476ed7 100644
--- a/src/gtk-3.0/gtk-light-solid-thin.css
+++ b/src/gtk-3.0/gtk-light-solid-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2468,6 +2468,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4261,9 +4266,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4272,7 +4281,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5148,6 +5163,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6272,62 +6292,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: #FEFEFE;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: #FEFEFE;
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: white;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6538,8 +6652,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6690,8 +6804,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6702,8 +6816,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7742,16 +7856,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8881,10 +8995,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index ec76eaa..0f4c996 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2468,6 +2468,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4261,9 +4266,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4272,7 +4281,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5148,6 +5163,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6272,62 +6292,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: #FEFEFE;
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: #FEFEFE;
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: white;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6538,8 +6652,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6690,8 +6804,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6702,8 +6816,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7742,16 +7856,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8881,10 +8995,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-light-thin.css b/src/gtk-3.0/gtk-light-thin.css
index 973e10f..b19a6ad 100644
--- a/src/gtk-3.0/gtk-light-thin.css
+++ b/src/gtk-3.0/gtk-light-thin.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2468,6 +2468,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4261,9 +4266,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4272,7 +4281,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5148,6 +5163,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6272,62 +6292,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(254, 254, 254, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: rgba(254, 254, 254, 0.95);
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(255, 255, 255, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6538,8 +6652,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6690,8 +6804,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6702,8 +6816,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7742,16 +7856,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8881,10 +8995,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index c151841..1bb8cfc 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -110,7 +110,7 @@ textview border {
   background-color: #fafafa;
 }
 
-rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband,
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, XfdesktopIconView.view .rubberband,
 .rubberband {
   border: 1px solid #0036a8;
   background-color: rgba(0, 54, 168, 0.2);
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: solid;
+  border-left-style: none;
 }
 
 .linked.vertical > entry + entry {
@@ -2468,6 +2468,11 @@ menu menuitem:hover menu arrow,
   -gtk-icon-shadow: none;
 }
 
+menu menuitem:hover menu menuitem:hover arrow,
+.menu menuitem:hover menu menuitem:hover arrow {
+  color: #ffffff;
+}
+
 menu menuitem:disabled,
 .menu menuitem:disabled {
   color: rgba(36, 36, 36, 0.55);
@@ -4261,9 +4266,13 @@ messagedialog .titlebar {
   border-bottom: 1px solid #afafaf;
 }
 
+messagedialog .dialog-action-area {
+  padding: 6px;
+}
+
 messagedialog .dialog-action-area button {
-  padding: 5px 8px 6px 8px;
-  min-height: 0;
+  min-height: 16px;
+  padding: 2px 8px;
 }
 
 messagedialog.csd.background {
@@ -4272,7 +4281,13 @@ messagedialog.csd.background {
   border: none;
 }
 
+messagedialog.csd .dialog-action-area {
+  padding: 0;
+}
+
 messagedialog.csd .dialog-action-area button {
+  min-height: 16px;
+  padding: 4px 8px;
   border-bottom-style: none;
   background-image: none;
 }
@@ -5148,6 +5163,11 @@ terminal-window notebook > header.top button,
   min-height: 24px;
 }
 
+.nautilus-window headerbar .path-bar-box.background.frame {
+  border: none;
+  background-color: transparent;
+}
+
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -6272,62 +6292,156 @@ panel-toplevel.background na-tray-applet {
   -NaTrayApplet-icon-size: 16px;
 }
 
+.mate-panel-menu-bar button:not(#tasklist-button),
+panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher, .xfce4-panel button.flat, .xfce4-panel button.budgie-menu-launcher, .xfce4-panel .budgie-panel button.flat.launcher, .budgie-panel .xfce4-panel button.flat.launcher, .xfce4-panel button {
+  color: #363636;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
+panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button), .xfce4-panel button:hover:not(:active):not(:checked) {
+  color: #242424;
+  box-shadow: inset 0 -2px rgba(0, 70, 219, 0.5);
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button),
+panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel button:checked {
+  color: #242424;
+  box-shadow: inset 0 -2px #0046DB;
+  background-color: rgba(36, 36, 36, 0.12);
+  background-image: none;
+}
+
+.mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) image, panel-toplevel.background button:checked:not(#tasklist-button) image, .xfce4-panel button:checked image {
+  color: inherit;
+}
+
+.mate-panel-menu-bar button:active:not(#tasklist-button),
+panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel button:active {
+  background-color: rgba(36, 36, 36, 0.18);
+  color: #242424;
+  background-image: none;
+  box-shadow: inset 0 -2px #0046DB;
+}
+
 .xfce4-panel.panel {
   background-color: rgba(254, 254, 254, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none;
-}
-
-#tasklist-button {
-  color: rgba(54, 54, 54, 0.8);
-  border-radius: 0;
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-#tasklist-button:hover {
-  color: #505050;
-  background-color: rgba(0, 0, 0, 0.17);
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: #f5f5f5;
+  color: #242424;
 }
 
-#tasklist-button:checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 -2px #0046DB;
+.xfce4-panel {
+  background-color: rgba(254, 254, 254, 0.95);
+  color: #363636;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
 }
 
-.mate-panel-menu-bar button:not(#tasklist-button),
-panel-toplevel.background button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.budgie-menu-launcher {
-  color: #363636;
-  border-radius: 0;
+.xfce4-panel,
+.xfce4-panel frame > border {
   border: none;
-  background-color: rgba(254, 254, 254, 0);
 }
 
-.mate-panel-menu-bar button:hover:not(#tasklist-button),
-panel-toplevel.background button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.budgie-menu-launcher:hover {
+.xfce4-panel#XfcePanelWindow {
   border: none;
-  background-color: rgba(255, 255, 255, 0.95);
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button),
-panel-toplevel.background button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.budgie-menu-launcher:active, .mate-panel-menu-bar button:checked:not(#tasklist-button),
-panel-toplevel.background button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.budgie-menu-launcher:checked {
+.xfce4-panel#XfcePanelWindow, .xfce4-panel#XfcePanelWindow.marching-ants {
+  transition: none;
+}
+
+.xfce4-panel button {
+  font-weight: 700;
+}
+
+.xfce4-panel button#launcher-arrow:hover, .xfce4-panel button#launcher-arrow + button.toggle:hover {
+  box-shadow: none;
+}
+
+.xfce4-panel button#launcher-arrow + button.toggle:checked {
+  color: #0046DB;
+  box-shadow: none;
+}
+
+.xfce4-panel button#xfce4-notification-plugin {
+  padding: 0 1px;
+}
+
+.xfce4-panel menu {
+  font-weight: 400;
+  text-shadow: none;
+  -gtk-icon-effect: none;
+}
+
+.xfce4-panel widget.tasklist > button.toggle {
+  font-weight: 400;
+}
+
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
   color: #ffffff;
-  border: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+}
+
+XfdesktopIconView.view:active, XfdesktopIconView.view:checked {
   background-color: #0046DB;
+  color: #ffffff;
+  text-shadow: none;
 }
 
-.mate-panel-menu-bar button:active:not(#tasklist-button) label, panel-toplevel.background button:active:not(#tasklist-button) label, .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.budgie-menu-launcher:active label,
-.mate-panel-menu-bar button:active:not(#tasklist-button) image,
-panel-toplevel.background button:active:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:active image,
-.xfce4-panel.panel button.budgie-menu-launcher:active image, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, panel-toplevel.background button:checked:not(#tasklist-button) label, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.budgie-menu-launcher:checked label,
-.mate-panel-menu-bar button:checked:not(#tasklist-button) image,
-panel-toplevel.background button:checked:not(#tasklist-button) image,
-.xfce4-panel.panel button.flat:checked image,
-.xfce4-panel.panel button.budgie-menu-launcher:checked image {
-  color: inherit;
+window#whiskermenu-window {
+  background-color: #ffffff;
+}
+
+window#whiskermenu-window > frame > border {
+  border-radius: 0;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio {
+  padding: 2px 6px;
+  margin: 2px;
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:hover {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+window#whiskermenu-window scrolledwindow > viewport button.radio:checked, window#whiskermenu-window scrolledwindow > viewport button.radio:active {
+  background-color: #0046DB;
+  color: #ffffff;
+}
+
+window#whiskermenu-window scrolledwindow treeview.view:selected:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: #242424;
+}
+
+window.thunar toolbar#location-toolbar, window.thunar #location-toolbar.inline-toolbar {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.11);
+}
+
+window.thunar toolbar#location-toolbar entry, window.thunar #location-toolbar.inline-toolbar entry {
+  min-height: 0;
+}
+
+window.thunar notebook stack > scrolledwindow.frame.standard-view {
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+window.thunar notebook header.top tab.reorderable-page > box > label {
+  min-height: 0;
 }
 
 /*********
@@ -6538,8 +6652,8 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 window.background.chromium headerbar.titlebar button.titlebutton {
@@ -6690,8 +6804,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:active label {
@@ -6702,8 +6816,8 @@ menubar .panel,
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .panel popover button:checked label {
@@ -7742,16 +7856,16 @@ filechooser placessidebar.sidebar scrollbar trough, .nautilus-window placessideb
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.65);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:active, .budgie-popover:not(.budgie-menu) button.flat:active:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:active:not(.image-button), .workspace-switcher .workspace-add-button:active, .raven-mpris button.image-button:active, .drop-shadow button:active {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-settings-window buttonbox.inline-toolbar button:disabled, .budgie-popover:not(.budgie-menu) button.flat:disabled:not(.image-button), .budgie-popover:not(.budgie-menu) button.budgie-menu-launcher:disabled:not(.image-button), .workspace-switcher .workspace-add-button:disabled, .raven-mpris button.image-button:disabled, .drop-shadow button:disabled {
@@ -8881,10 +8995,10 @@ window.budgie-switcher-window flowboxchild {
   background-image: none;
   color: #ffffff;
   background-color: rgba(0, 0, 0, 0.5);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
   border-color: rgba(0, 0, 0, 0.11);
-  text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
 }
 
 .budgie-polkit-dialog .message {
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 15ebf77..73d8661 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -34,6 +34,27 @@ terminal-window,
 //
 // Nautilus
 //
+
+.nautilus-window headerbar {
+  .path-bar-box {
+//    color: $header_fg;
+//    background-color: transparent;
+//
+//    button { @extend %pathbar_box_button; }
+//
+//    &.width-maximized {
+//      border: 1px solid if($titlebar == 'light', rgba(black, 0.12), rgba(white, 0.12));
+//      background-color: rgba($header_fg, 0.06);
+//    }
+
+    // workaround for 3.30.1
+    &.background.frame {
+      border: none;
+      background-color: transparent;
+    }
+  }
+}
+
 .nautilus-canvas-item {
     border-radius: 2px;
 }
@@ -1207,57 +1228,169 @@ panel-toplevel.background {
     }
 }
 
-// Xfce Panel
-.xfce4-panel.panel {
-    background-color: $panel_bg;
+//
+// Xfce4
+//
 
-    text-shadow: none;
-    -gtk-icon-shadow: none;
+$text_shadow: 0 0 1px rgba(0, 0, 0, 0.26),
+              0 1px 2px rgba(0, 0, 0, 0.32),
+              0 2px 3px rgba(0, 0, 0, 0.12);
 
-    button.flat {
-        @extend %panelbutton;
-    }
+%panelbutton {
+  color: $panel_fg;
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+
+  &:hover:not(:active):not(:checked) {
+    color: $fg_color;
+    box-shadow: inset 0 -2px rgba($selected_bg_color, 0.5);
+  }
+  &:checked {
+    color: $fg_color;
+    box-shadow: inset 0 -2px $selected_bg_color;
+    background-color: rgba($fg_color, 0.12);
+    background-image: none;
+    label, image { color: inherit; }
+  }
+  &:active {
+    background-color: rgba($fg_color, 0.18);
+    color: $fg_color;
+    background-image: none;
+    box-shadow: inset 0 -2px $selected_bg_color;
+  }
 }
 
-#tasklist-button {
-    color: transparentize($panel_fg, 0.2);
-    border-radius: 0;
+.xfce4-panel.panel {
+  background-color: $panel_bg;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  border: none;
+  button, button.flat { @extend %panelbutton; }
+}
+
+.XfceHeading {
+  border: 0 none transparent;
+  background-color: $bg_color;
+  color: $fg_color;
+}
+
+.xfce4-panel {
+  background-color: $panel_bg;
+  color: $panel_fg;
+  font-weight: 700;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+
+  &, // unset borders
+  frame > border { border: none; }
+
+  &#XfcePanelWindow { // main panel container >= 4.13.3?
+    // FIXME: unneeded 1px borders are reserved by its code itself
     border: none;
-    background-color: transparentize($panel_bg, 1);
 
-    &:hover {
-        color: lighten($panel_fg, 10%);
-        background-color: transparentize(black, 0.83);
+    &, &.marching-ants { transition: none; } // unset transitions
+  }
+
+  button.flat { @extend %panelbutton; }
+
+  button {
+    font-weight: 700;
+    @extend %panelbutton;
+
+    &#launcher-arrow { // launcher applet
+      // FIXME: quite weird pseudo-classe transitions, especially :hover
+      // state can't be cleared properly ( -> an upstream issue)
+      &, + button.toggle {
+        &:hover { box-shadow: none; } // hide indicators
+      }
+
+      + button.toggle:checked { // 'arrow' toggle button
+        color: $selected_bg_color;
+        box-shadow: none;
+      }
     }
 
-    &:checked {
-        color: white;
-        background-color: transparentize(black, 0.75);
-        box-shadow: inset 0 -2px $selected_bg_color;
+    &#xfce4-notification-plugin {
+      padding: 0 1px; // for 4.12.2
     }
+  }
+
+  menu {
+    font-weight: 400; // for enforcing regular weight
+    text-shadow: none;
+    -gtk-icon-effect: none;
+  }
+
+  widget.tasklist > button.toggle { font-weight: 400; }
 }
 
-%panelbutton {
-    color: $panel_fg;
+XfdesktopIconView.view {
+  border-radius: 2px;
+  background: transparent;
+  color: $selected_fg_color;
+  text-shadow: $text_shadow;
+
+  &:active, &:checked {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+    text-shadow: none;
+  }
+
+  .rubberband { @extend rubberband; }
+}
+
+window#whiskermenu-window {
+  background-color: $base_color;
+
+  // no CSD class even if the sw compositor was enabled.
+  > frame > border {
     border-radius: 0;
-    border: none;
-    background-color: transparentize($panel_bg, 1);
+  }
 
-    &:hover {
-        border: none;
-        background-color: lighten($panel_bg, 10%);
-    }
-    &:active,
-    &:checked {
-        color: $selected_fg_color;
-        border: none;
+  scrolledwindow {
+    > viewport button.radio {
+      padding: 2px 6px;
+      margin: 2px;
+      &:hover { background-color: if($variant == 'light', rgba(black, 0.12), rgba(white, 0.12)); }
+      &:checked, &:active {
         background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
+    }
 
-        label,
-        image {
-            color: inherit;
-        }
+    treeview.view {
+      &:selected:hover {
+        background-color: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1));
+        color: $fg_color;
+      }
+    }
+  }
+}
+
+//
+//  * Thunar *
+//
+
+window.thunar {
+  toolbar#location-toolbar {
+    border-bottom: 1px solid $borders_color;
+
+    // FIXME: need to unset for weird allocation height
+    entry { min-height: 0; }
+  }
+
+  notebook {
+    // hide unneeded border
+    stack > scrolledwindow.frame.standard-view {
+      border-top-width: 0;
+      border-right-width: 0;
     }
+
+    // an allocation height of label node affects to close button's
+    // image height (it's quite weird).
+    header.top tab.reorderable-page > box > label { min-height: 0; }
+  }
 }
 
  /*********
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 60febbf..2feccab 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -730,7 +730,7 @@ toolbar.inline-toolbar toolbutton {
 // special case, because path-bars are bugged
 @mixin pathbar_linking_rules($sep_color:if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5))) {
 
-  > button + button { border-left-style: solid; }
+  > button + button { border-left-style: none; }
 
   > button:hover:not(:checked):not(:active):not(:only-child) {
 
@@ -1945,6 +1945,9 @@ menu,
           text-shadow: none;
           -gtk-icon-shadow: none;
         }
+        menuitem:hover {
+          arrow { color: $selected_fg_color; }
+        }
       }
     }
 
@@ -3167,7 +3170,13 @@ messagedialog { // Message Dialog styling
     border-bottom: 1px solid $header_border;
   }
 
-  .dialog-action-area button { padding: 5px 8px 6px 8px; min-height: 0; }
+  .dialog-action-area {
+    padding: 6px;
+    button {
+      min-height: 16px;
+      padding: 2px 8px;
+    }
+  }
 
   &.csd { // rounded bottom border styling for csd version
     &.background {
@@ -3175,14 +3184,20 @@ messagedialog { // Message Dialog styling
       border-bottom-right-radius: $wm_radius;
       border: none;
     }
-    .dialog-action-area button {
-      border-bottom-style: none;
-      background-image: none;
 
-      @extend %middle_button;
-      &:first-child{ @extend %first_button; }
-      &:last-child { @extend %last_button; }
-      &:only-child { @extend %single_button; }
+    .dialog-action-area {
+      padding: 0;
+      button {
+        min-height: 16px;
+        padding: 4px 8px;
+        border-bottom-style: none;
+        background-image: none;
+
+        @extend %middle_button;
+        &:first-child{ @extend %first_button; }
+        &:last-child { @extend %last_button; }
+        &:only-child { @extend %single_button; }
+      }
     }
 
     .dialog-action-area button:not(.suggested-action):not(.destructive-action) {