diff --git a/Paper/gtk-3.18/_colors.scss b/Paper/gtk-3.18/_colors.scss
index d59cdac..7f554c2 100644
--- a/Paper/gtk-3.18/_colors.scss
+++ b/Paper/gtk-3.18/_colors.scss
@@ -23,11 +23,11 @@ $purple: #673ab7;
 $borders_color: if($variant == 'light', darken($bg_color,20%), darken($bg_color,10%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', $blue, lighten($blue,10%));
+$selected_bg_color: if($variant == 'light', darken($blue,5%), $blue);
 $selected_borders_color: if($variant == 'light', darken($selected_bg_color, 10%), $borders_color);
 $link_color: blue;
 $link_visited_color:transparentize($link_color,0.5);
-$top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.7));
+$top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
 $bottom_highlight: if($variant == 'light', transparentize(white, 0.7), transparentize(white, 0.9));
 $dark_fill: mix($borders_color, $bg_color, 35%);
 $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
diff --git a/Paper/gtk-3.18/apps/_budgie.scss b/Paper/gtk-3.18/apps/_budgie.scss
index 8d38694..2e0b2f6 100644
--- a/Paper/gtk-3.18/apps/_budgie.scss
+++ b/Paper/gtk-3.18/apps/_budgie.scss
@@ -3,63 +3,66 @@
 **********/
 
 $budgie_panel_bg_color: if($variant == 'light', $bg_color, #263238);
-$budgie_panel_fg_color: if($variant == 'light', $fg_color, #cfd8dc);;
-
+$budgie_panel_fg_color: if($variant == 'light', $fg_color, #fff);
 
+$pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
 
 @function gtkalpha($c,$a) {
   @return unquote("alpha(#{$c},#{$a})");
 }
 
-$pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
-$asset_suffix: if($variant == 'default', '', '-hc');
+%app_indicators {
 
-%underscores {
-  &:hover { background-color: transparentize(black, 0.9); }
-  &:active, &:checked { background-color: transparentize(black, 0.8); }
+  &:hover {
+    background-color: transparentize(black, 0.9);
+  }
 
-  @each $pos, $b_pos in $pos_list {
+  &:active,
+  &:checked {
+    // background-color: transparentize(black, 0.8);
+  }
+
+  @each $pos, $alt_pos in $pos_list {
     .#{$pos} & {
-      border-#{$b_pos}: 2px solid transparentize($budgie_panel_bg_color, 1.0);
-      border-#{$pos}: 2px solid transparentize($budgie_panel_bg_color, 1.0);
 
       @at-root {
         .#{$pos} .budgie-panel .unpinned .launcher,
-        .#{$pos} .budgie-panel .pinned .launcher.running { border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5); }
+        .#{$pos} .budgie-panel .pinned .launcher.running {
+          border-#{$pos}: 2px solid transparentize($budgie_panel_fg_color, 0.8);
+        }
       }
 
       &:hover {
-        border-#{$b_pos}: 2px solid transparentize(black, 0.9);
-        border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5);
+        border-#{$pos}: 3px solid transparentize($budgie_panel_fg_color, 0.5);
       }
 
-      &:active, &:checked {
-        border-#{$b_pos}: 2px solid transparentize(black, 0.8);
-        border-#{$pos}: 2px solid $selected_bg_color;
+      &:active,
+      &:checked {
+        border-#{$pos}: 3px solid $budgie_panel_fg_color;
       }
     }
   }
 }
 
 // Positional Styles
-@each $pos, $b_pos in $pos_list {
+@each $pos, $alt_pos in $pos_list {
 
   // Panel borders
   .#{$pos} .budgie-panel {
-    border-#{$b_pos}: 1px solid transparentize(black,0.8);
+    border-#{$alt_pos}: 1px solid transparentize(black,0.8);
     box-shadow:inset 0 1px 0 0 transparentize(white,0.9);
   }
 
   // Raven borders
   .#{$pos} .raven-frame {
-    border-#{$b_pos}: 1px solid transparentize(black, 0.2);
+    border-#{$alt_pos}: 1px solid transparentize(black, 0.2);
     box-shadow:inset 0 0 0 1px transparentize(white, 0.7);
   }
 
   // Shadows
   .#{$pos} .shadow-block {
     background-color: transparent;
-    background-image: linear-gradient(to $b_pos,
+    background-image: linear-gradient(to $alt_pos,
                       $shadow_color,
                       transparent,
                       transparent);
@@ -79,6 +82,7 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 
 // Budgie Menu
 .budgie-menu {
+
   GtkSearchEntry.entry:not(:selected) {
     border: none;
     box-shadow: none;
@@ -136,7 +140,7 @@ $asset_suffix: if($variant == 'default', '', '-hc');
         background-clip: padding-box;
         border: none;
 
-        @extend %underscores;
+        @extend %app_indicators;
       }
     }
   }
@@ -155,11 +159,19 @@ $asset_suffix: if($variant == 'default', '', '-hc');
   .unpinned {
     .launcher,
     .launcher.running {
-      @extend %underscores;
+      @extend %app_indicators;
+      padding: 2px 6px;
     }
   }
 }
 
+// Panel borders
+.bottom .budgie-panel {
+  border: none;
+  box-shadow:none;
+  background:none;
+}
+
 // Raven
 
 .raven {
diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css
index 2d27d2e..87f5aa3 100644
--- a/Paper/gtk-3.18/gtk-dark.css
+++ b/Paper/gtk-3.18/gtk-dark.css
@@ -27,7 +27,7 @@
 /* text widgets and the like base background color */
 @define-color theme_base_color #455a64;
 /* base background color of selections */
-@define-color theme_selected_bg_color #51adf6;
+@define-color theme_selected_bg_color #2196f3;
 /* text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /* base background color of insensitive widgets */
@@ -45,7 +45,7 @@
 /* text widgets and the like base background color on backdrop windows */
 @define-color theme_unfocused_base_color #475d67;
 /* base background color of selections on backdrop windows */
-@define-color theme_unfocused_selected_bg_color #51adf6;
+@define-color theme_unfocused_selected_bg_color #2196f3;
 /* text/foreground color of selections on backdrop windows */
 @define-color theme_unfocused_selected_fg_color #ffffff;
 /* widgets main borders color */
@@ -166,7 +166,7 @@ read if you used those and something break with a version upgrade you're on your
     background-color: #3d4f57; }
   .gtkstyle-fallback:selected {
     color: #ffffff;
-    background-color: #51adf6; }
+    background-color: #2196f3; }
 
 .view, GtkIconView,
 GtkTextView GtkLabel {
@@ -213,8 +213,8 @@ GtkFlow treeview.view .rubberband,
 treeview.view GtkFlow .rubberband,
 GtkFlow treeview.view rubberband,
 treeview.view GtkFlow rubberband {
-  border: 1px solid #2196f3;
-  background-color: rgba(33, 150, 243, 0.2); }
+  border: 1px solid #0c7cd5;
+  background-color: rgba(12, 124, 213, 0.2); }
 
 GtkFlow flowboxchild {
   padding: 3px;
@@ -227,7 +227,7 @@ GtkLabel.separator {
   GtkLabel.separator:backdrop {
     color: #839096; }
 GtkLabel:selected {
-  background-color: #51adf6;
+  background-color: #2196f3;
   color: #ffffff; }
 GtkLabel:insensitive {
   color: #839096; }
@@ -265,7 +265,7 @@ GtkTextView GtkLabel:selected, GtkTextView GtkLabel selection:focus, GtkTextView
 .entry:selected, .list-row:selected, GtkTreeView.view:selected:focus, GtkTreeView.view:selected,
 treeview.view:selected:focus,
 treeview.view:selected {
-  background-color: #51adf6; }
+  background-color: #2196f3; }
   .list-row:selected GtkLabel, row:selected GtkLabel, GtkLabel:selected, .view:selected:focus, GtkIconView:selected:focus, .view:selected, GtkIconView:selected,
   GtkTextView GtkLabel:selected:focus,
   GtkTextView GtkLabel:selected, GtkTextView GtkLabel selection:focus, GtkTextView GtkLabel selection, GtkFlow flowboxchild:selected, modelbutton.flat:selected, .popover .check:selected,
@@ -281,7 +281,7 @@ treeview.view:selected {
     .popover .radio:insensitive:selected,
     .menuitem.button.flat:insensitive:selected, GtkCalendar:insensitive:selected, .spinbutton:insensitive:selected:not(.vertical),
     .entry:insensitive:selected, .list-row:insensitive:selected {
-      color: #a8d6fb; }
+      color: #90cbf9; }
     .list-row:selected GtkLabel:backdrop, row:selected GtkLabel:backdrop, GtkLabel:backdrop:selected, GtkIconView:backdrop:selected:focus, .view:backdrop:selected, GtkIconView:backdrop:selected,
     GtkTextView GtkLabel:backdrop:selected:focus, GtkTextView GtkLabel selection:backdrop, GtkFlow flowboxchild:backdrop:selected, GtkLabel:backdrop:selected, modelbutton.flat:backdrop:selected, .popover .check:backdrop:selected,
     .popover .radio:backdrop:selected,
@@ -292,7 +292,7 @@ treeview.view:selected {
       .popover .radio:backdrop:insensitive:selected,
       .menuitem.button.flat:backdrop:insensitive:selected, GtkCalendar:backdrop:insensitive:selected, .spinbutton:backdrop:insensitive:selected:not(.vertical),
       .entry:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected {
-        color: rgba(103, 183, 247, 0.85); }
+        color: rgba(61, 163, 245, 0.85); }
 
 .monospace {
   font: Monospace; }
@@ -302,9 +302,9 @@ treeview.view:selected {
  ***********/
 @keyframes needs_attention {
   from {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#9acffa), to(transparent)); }
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#6ab8f7), to(transparent)); }
   to {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#51adf6), to(transparent)); } }
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#2196f3), to(transparent)); } }
 .button {
   padding: 4px 9px;
   border: 1px solid #222c31;
@@ -641,8 +641,8 @@ row:selected
 .button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #0a6ebd;
-  background-image: linear-gradient(to bottom, #51adf6, #39a1f4);
+  border-color: #08528d;
+  background-image: linear-gradient(to bottom, #2196f3, #0d8aee);
   text-shadow: 0 1px rgba(0, 0, 0, 0.2);
   icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
@@ -654,12 +654,12 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #51adf6; }
+    color: #2196f3; }
   .button.suggested-action:hover {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #0a6ebd;
-    background-image: linear-gradient(to bottom, #56aff6, #48a8f5 60%, #3ea4f5);
+    border-color: #08528d;
+    background-image: linear-gradient(to bottom, #2698f3, #1791f2 60%, #0e8df2);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
@@ -667,16 +667,16 @@ row:selected
   .button.suggested-action:checked {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #0a6ebd;
-    background-image: linear-gradient(to bottom, #309df4, #48a8f5);
+    border-color: #08528d;
+    background-image: linear-gradient(to bottom, #0c84e4, #1791f2);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
   .button.suggested-action:backdrop,
   .button.suggested-action.flat:backdrop {
-    border-color: #0a6ebd;
-    background-image: linear-gradient(to bottom, #51adf6);
+    border-color: #08528d;
+    background-image: linear-gradient(to bottom, #2196f3);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -684,12 +684,12 @@ row:selected
     .button.suggested-action:backdrop,
     .button.suggested-action.flat:backdrop GtkLabel,
     .button.suggested-action.flat:backdrop {
-      color: #dceffd; }
+      color: #d3eafd; }
     .button.suggested-action:backdrop:active,
     .button.suggested-action:backdrop:checked,
     .button.suggested-action.flat:backdrop:active,
     .button.suggested-action.flat:backdrop:checked {
-      border-color: #0a6ebd;
+      border-color: #08528d;
       background-image: none;
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
       .button.suggested-action:backdrop:active GtkLabel,
@@ -700,7 +700,7 @@ row:selected
       .button.suggested-action.flat:backdrop:active,
       .button.suggested-action.flat:backdrop:checked GtkLabel,
       .button.suggested-action.flat:backdrop:checked {
-        color: #d3eafd; }
+        color: #cee5f7; }
       .button.suggested-action:backdrop:active label,
       .button.suggested-action:backdrop:active,
       .button.suggested-action:backdrop:checked label,
@@ -709,7 +709,7 @@ row:selected
       .button.suggested-action.flat:backdrop:active,
       .button.suggested-action.flat:backdrop:checked label,
       .button.suggested-action.flat:backdrop:checked {
-        color: #d3eafd; }
+        color: #cee5f7; }
     .button.suggested-action:backdrop:insensitive,
     .button.suggested-action.flat:backdrop:insensitive {
       border-color: #242f34;
@@ -727,15 +727,15 @@ row:selected
       .button.suggested-action:backdrop:insensitive:checked,
       .button.suggested-action.flat:backdrop:insensitive:active,
       .button.suggested-action.flat:backdrop:insensitive:checked {
-        border-color: #0a6ebd;
+        border-color: #08528d;
         background-image: none;
-        background-color: #3995dc;
+        background-color: #1f80cc;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
         .button.suggested-action:backdrop:insensitive:active GtkLabel,
         .button.suggested-action:backdrop:insensitive:checked GtkLabel,
         .button.suggested-action.flat:backdrop:insensitive:active GtkLabel,
         .button.suggested-action.flat:backdrop:insensitive:checked GtkLabel {
-          color: #7ebae8; }
+          color: #6dacde; }
   .button.suggested-action.flat:backdrop,
   .button.suggested-action.flat:insensitive,
   .button.suggested-action.flat:backdrop:insensitive {
@@ -745,7 +745,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: rgba(81, 173, 246, 0.8); }
+    color: rgba(33, 150, 243, 0.8); }
   .button.suggested-action:insensitive {
     border-color: #222c31;
     background-image: none;
@@ -758,21 +758,21 @@ row:selected
       color: #839096; }
     .button.suggested-action:insensitive:active,
     .button.suggested-action:insensitive:checked {
-      border-color: #0a6ebd;
+      border-color: #08528d;
       background-image: none;
-      background-color: #3995dc;
+      background-color: #1f80cc;
       text-shadow: none;
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.05); }
       .button.suggested-action:insensitive:active GtkLabel,
       .button.suggested-action:insensitive:active,
       .button.suggested-action:insensitive:checked GtkLabel,
       .button.suggested-action:insensitive:checked {
-        color: #b0d5f1; }
+        color: #a5cceb; }
   .osd
   .button.suggested-action {
     color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(81, 173, 246, 0.5));
+    background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -782,7 +782,7 @@ row:selected
     .button.suggested-action:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(81, 173, 246, 0.7));
+      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.7));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -795,7 +795,7 @@ row:selected
     .button.suggested-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, #51adf6);
+      background-image: linear-gradient(to bottom, #2196f3);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -815,7 +815,7 @@ row:selected
     .button.suggested-action:backdrop {
       color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(81, 173, 246, 0.5));
+      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1046,7 +1046,7 @@ row:selected
 .stack-switcher >
 .button.needs-attention > image {
   animation: needs_attention 150ms ease-in;
-  background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#9acffa), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.7898)), to(transparent));
+  background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#6ab8f7), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.7898)), to(transparent));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
   background-position: right 3px, right 2px; }
@@ -1842,7 +1842,7 @@ GtkMessageDialog .titlebar,
   border-style: none;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
   GtkMessageDialog .header-bar:backdrop,
   GtkMessageDialog .titlebar:backdrop,
   .message-dialog .header-bar:backdrop,
@@ -1968,7 +1968,7 @@ GtkFileChooserDialog {
       color: #cfd8dc; }
     .spinbutton:not(.vertical) GtkImage:active, GeditWindow > .entry GtkImage:active,
     .entry GtkImage:active {
-      color: #51adf6; }
+      color: #2196f3; }
     .spinbutton:not(.vertical) GtkImage:backdrop, GeditWindow > .entry GtkImage:backdrop,
     .entry GtkImage:backdrop {
       color: #77868d; }
@@ -2067,7 +2067,7 @@ GtkFileChooserDialog {
   background-image: none;
   border-radius: 0;
   border-width: 0 0 2px;
-  border-color: #51adf6;
+  border-color: #2196f3;
   border-style: solid;
   box-shadow: none; }
   .spinbutton:not(.vertical) .progressbar:backdrop, GeditWindow > .entry .progressbar:backdrop,
@@ -2115,14 +2115,14 @@ GeditWindow.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > box
   border-top-color: #222c31; }
 
 GtkTreeView .acceleditor > GtkLabel {
-  background-color: #51adf6; }
+  background-color: #2196f3; }
 
 GtkTreeView .entry.flat, GtkTreeView .entry {
   border-radius: 0;
   background-image: none;
   background-color: #455a64; }
   GtkTreeView .entry.flat:focus, GtkTreeView .entry:focus {
-    border-color: #51adf6; }
+    border-color: #2196f3; }
 
 /*************
  * Expanders *
@@ -2146,7 +2146,7 @@ expander .arrow {
   border-style: solid solid none;
   border-color: #222c31;
   border-radius: 3px 3px 0 0;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
   .floating-bar.bottom.left {
     border-left-style: none;
     border-top-left-radius: 0;
@@ -2312,7 +2312,7 @@ GraniteWidgetsPopOver {
     background: none;
     border: none; }
     GraniteWidgetsPopOver .button:active, GraniteWidgetsPopOver .button:active:hover {
-      color: #51adf6; }
+      color: #2196f3; }
   GraniteWidgetsPopOver > .frame {
     border: none; }
   GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver GtkIconView.sidebar {
@@ -2450,7 +2450,7 @@ GraniteWidgetsWelcome {
   border-radius: 4px 4px 0 0;
   background-color: #303f46;
   color: rgba(255, 255, 255, 0.8);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
   .titlebar:backdrop:not(headerbar),
   .header-bar:backdrop {
     background-color: #303f46;
@@ -2479,7 +2479,7 @@ GraniteWidgetsWelcome {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #222c31;
     background-color: #347D9F;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     .header-bar.selection-mode:backdrop {
       background-color: #275f79;
@@ -2488,8 +2488,8 @@ GraniteWidgetsWelcome {
     .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu,
     .header-bar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu {
-      border-color: rgba(81, 173, 246, 0);
-      background-image: linear-gradient(to bottom, rgba(81, 173, 246, 0));
+      border-color: rgba(33, 150, 243, 0);
+      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0));
       box-shadow: none;
       text-shadow: none;
       padding-left: 10px;
@@ -2744,25 +2744,25 @@ GraniteWidgetsWelcome {
       padding: 5px 10px;
       border-radius: 2px;
       background-color: rgba(255, 255, 255, 0.8);
-      color: #51adf6;
+      color: #2196f3;
       box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); }
       .titlebar:not(headerbar) .button.suggested-action GtkLabel,
       .header-bar .button.suggested-action GtkLabel {
-        color: #51adf6; }
+        color: #2196f3; }
       .titlebar:not(headerbar) .button.suggested-action:hover,
       .header-bar .button.suggested-action:hover {
         background-color: rgba(255, 255, 255, 0.8);
         box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); }
         .titlebar:not(headerbar) .button.suggested-action:hover GtkLabel,
         .header-bar .button.suggested-action:hover GtkLabel {
-          color: #51adf6; }
+          color: #2196f3; }
         .titlebar:not(headerbar) .button.suggested-action:hover:backdrop,
         .header-bar .button.suggested-action:hover:backdrop {
           background-color: rgba(255, 255, 255, 0.6);
           box-shadow: none; }
           .titlebar:not(headerbar) .button.suggested-action:hover:backdrop GtkLabel,
           .header-bar .button.suggested-action:hover:backdrop GtkLabel {
-            color: rgba(81, 173, 246, 0.8); }
+            color: rgba(33, 150, 243, 0.8); }
       .titlebar:not(headerbar) .button.suggested-action:insensitive,
       .header-bar .button.suggested-action:insensitive {
         background-color: rgba(0, 0, 0, 0.1);
@@ -2783,7 +2783,7 @@ GraniteWidgetsWelcome {
         box-shadow: none; }
         .titlebar:not(headerbar) .button.suggested-action:backdrop GtkLabel,
         .header-bar .button.suggested-action:backdrop GtkLabel {
-          color: rgba(81, 173, 246, 0.2); }
+          color: rgba(33, 150, 243, 0.2); }
     .titlebar:not(headerbar) .button.linked:first-child, .titlebar:not(headerbar) .button.linked:last-child,
     .header-bar .button.linked:first-child,
     .header-bar .button.linked:last-child {
@@ -2929,22 +2929,22 @@ infobar {
 .level-bar.fill-block, .level-bar .indicator-continuous.fill-block {
   border-radius: 3px;
   margin: 2px;
-  background-color: #51adf6;
+  background-color: #2196f3;
   border: 1px solid;
   border-color: #222c31;
-  box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.3); }
+  box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
   .low.level-bar.fill-block, .level-bar .low.indicator-continuous.fill-block, .level-low.level-bar.fill-block, .level-bar .level-low.indicator-continuous.fill-block {
     background-color: #d32f2f;
     border-color: #222c31;
-    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.3); }
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
   .high.level-bar.fill-block, .level-bar .high.indicator-continuous.fill-block, .level-high.level-bar.fill-block, .level-bar .level-high.indicator-continuous.fill-block {
     background-color: #4caf50;
     border-color: #222c31;
-    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.3); }
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
   .full.level-bar.fill-block, .level-bar .full.indicator-continuous.fill-block, .level-full.level-bar.fill-block, .level-bar .level-full.indicator-continuous.fill-block {
-    background-color: #51adf6;
+    background-color: #2196f3;
     border-color: #222c31;
-    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.3); }
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
   .empty.level-bar.fill-block, .level-bar .empty.indicator-continuous.fill-block, .empty-fill-block.level-bar.fill-block, .level-bar .empty-fill-block.indicator-continuous.fill-block, .level-empty.level-bar.fill-block, .level-bar .level-empty.indicator-continuous.fill-block {
     background-color: rgba(0, 0, 0, 0.1);
     border-color: #222c31;
@@ -2985,30 +2985,30 @@ GtkLevelBar.vertical {
     color: rgba(0, 0, 255, 0.5); }
     *:selected *:link:visited,
     *:selected .button:visited {
-      color: #b9defb; }
+      color: #a6d5fa; }
   *:link:hover, .button:hover:link,
   .button:hover:visited {
     color: #3333ff; }
     *:selected *:link:hover, *:selected .button:hover:link,
     *:selected .button:hover:visited {
-      color: #eef7fe; }
+      color: #e9f5fe; }
   *:link:active, .button:active:link,
   .button:active:visited {
     color: blue; }
     *:selected *:link:active, *:selected .button:active:link,
     *:selected .button:active:visited {
-      color: #dceffd; }
+      color: #d3eafd; }
   *:link:backdrop:backdrop:hover, .button:backdrop:backdrop:hover:link,
   .button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:backdrop:hover:link, .button:backdrop:backdrop:hover:selected:link,
   .button:backdrop:backdrop:hover:selected:visited, *:link:backdrop, .button:backdrop:link,
   .button:backdrop:visited {
-    color: #51adf6; }
+    color: #2196f3; }
   *:link:selected, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   .header-bar.selection-mode .subtitle:link, .button:selected:link,
   .button:selected:visited, *:selected *:link, *:selected .button:link,
   *:selected .button:visited {
-    color: #dceffd; }
+    color: #d3eafd; }
 
 .button:link,
 .button:visited {
@@ -3057,68 +3057,64 @@ GtkLevelBar.vertical {
   .menubar > .menuitem {
     padding: 4px 8px; }
     .menubar > .menuitem:hover {
-      box-shadow: inset 0 -3px #51adf6;
+      box-shadow: inset 0 -3px #2196f3;
       color: rgba(255, 255, 255, 0.8); }
     .menubar > .menuitem:insensitive {
       color: #839096;
       box-shadow: none; }
 
-.content-view .menu,
-.menu,
-.popup {
+.menu, .content-view .menu,
+.popup,
+.context-menu {
   padding: 4px 0px;
   background-color: #425660;
-  border: 1px solid #222c31;
-  border-radius: 4px;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1), inset 0 1px 0 0 rgba(255, 255, 255, 0.3); }
-  .csd
-  .content-view .menu, .csd
-  .menu, .csd
-  .popup {
-    border: none; }
-  .content-view .menu:backdrop,
+  border: 1px solid #222c31; }
   .menu:backdrop,
-  .popup:backdrop {
+  .popup:backdrop,
+  .context-menu:backdrop {
     background-color: #445962; }
-  .content-view .menu .menuitem,
   .menu .menuitem,
-  .popup .menuitem {
+  .popup .menuitem,
+  .context-menu .menuitem {
     padding: 8px 4px;
     text-shadow: none; }
-    .content-view .menu .menuitem:hover,
     .menu .menuitem:hover,
-    .popup .menuitem:hover {
+    .popup .menuitem:hover,
+    .context-menu .menuitem:hover {
       color: #ffffff;
-      background-color: #51adf6; }
-    .content-view .menu .menuitem:insensitive,
+      background-color: #2196f3; }
     .menu .menuitem:insensitive,
-    .popup .menuitem:insensitive {
+    .popup .menuitem:insensitive,
+    .context-menu .menuitem:insensitive {
       color: #839096; }
-      .content-view .menu .menuitem:insensitive:backdrop,
       .menu .menuitem:insensitive:backdrop,
-      .popup .menuitem:insensitive:backdrop {
+      .popup .menuitem:insensitive:backdrop,
+      .context-menu .menuitem:insensitive:backdrop {
         color: #56707c; }
-    .content-view .menu .menuitem:backdrop,
-    .content-view .menu .menuitem:backdrop:hover,
     .menu .menuitem:backdrop,
-    .menu .menuitem:backdrop:hover,
     .popup .menuitem:backdrop,
-    .popup .menuitem:backdrop:hover {
+    .context-menu .menuitem:backdrop, .menu .menuitem:backdrop:hover,
+    .popup .menuitem:backdrop:hover,
+    .context-menu .menuitem:backdrop:hover {
       color: #839096;
       background-color: transparent; }
-    .content-view .menu .menuitem .arrow:dir(ltr),
     .menu .menuitem .arrow:dir(ltr),
-    .popup .menuitem .arrow:dir(ltr) {
+    .popup .menuitem .arrow:dir(ltr),
+    .context-menu .menuitem .arrow:dir(ltr) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
       margin-left: 10px; }
-    .content-view .menu .menuitem .arrow:dir(rtl),
     .menu .menuitem .arrow:dir(rtl),
-    .popup .menuitem .arrow:dir(rtl) {
+    .popup .menuitem .arrow:dir(rtl),
+    .context-menu .menuitem .arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
       margin-right: 10px; }
-  .content-view .menu > .arrow,
-  .menu > .arrow,
-  .popup > .arrow {
+    .menu .menuitem.separator,
+    .popup .menuitem.separator,
+    .context-menu .menuitem.separator {
+      color: rgba(0, 0, 0, 0.2); }
+  .menu > .arrow, .content-view .menu > .arrow,
+  .popup > .arrow,
+  .context-menu > .arrow {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -3128,41 +3124,51 @@ GtkLevelBar.vertical {
     padding: 4px;
     background-color: #425660;
     border-radius: 0; }
-    .content-view .menu > .arrow.top,
-    .menu > .arrow.top,
-    .popup > .arrow.top {
+    .menu > .arrow.top, .content-view .menu > .arrow.top,
+    .popup > .arrow.top,
+    .context-menu > .arrow.top {
       margin-top: -6px;
       border-bottom: 1px solid #536770;
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-    .content-view .menu > .arrow.bottom,
-    .menu > .arrow.bottom,
-    .popup > .arrow.bottom {
+    .menu > .arrow.bottom, .content-view .menu > .arrow.bottom,
+    .popup > .arrow.bottom,
+    .context-menu > .arrow.bottom {
       margin-bottom: -6px;
       border-top: 1px solid #536770;
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-    .content-view .menu > .arrow:hover,
-    .menu > .arrow:hover,
-    .popup > .arrow:hover {
+    .menu > .arrow:hover, .content-view .menu > .arrow:hover,
+    .popup > .arrow:hover,
+    .context-menu > .arrow:hover {
       background-color: #536770; }
-    .content-view .menu > .arrow:backdrop,
-    .menu > .arrow:backdrop,
-    .popup > .arrow:backdrop {
+    .menu > .arrow:backdrop, .content-view .menu > .arrow:backdrop,
+    .popup > .arrow:backdrop,
+    .context-menu > .arrow:backdrop {
       background-color: #445962; }
-    .content-view .menu > .arrow:insensitive,
-    .menu > .arrow:insensitive,
-    .popup > .arrow:insensitive {
+    .menu > .arrow:insensitive, .content-view .menu > .arrow:insensitive,
+    .popup > .arrow:insensitive,
+    .context-menu > .arrow:insensitive {
       color: transparent;
       background-color: transparent;
       border-color: transparent; }
 
-.menuitem .accelerator {
+.menuitem.accelerator {
   color: alpha(currentColor,0.55); }
-.menuitem .check:dir(ltr),
-.menuitem .radio:dir(ltr) {
-  margin-right: 7px; }
-.menuitem .check:dir(rtl),
-.menuitem .radio:dir(rtl) {
-  margin-left: 7px; }
+.menuitem.check, .menuitem.radio {
+  padding: 4px; }
+  .menuitem.check:dir(ltr), .menuitem.radio:dir(ltr) {
+    margin-right: 7px; }
+  .menuitem.check:dir(rtl), .menuitem.radio:dir(rtl) {
+    margin-left: 7px; }
+
+.menu {
+  box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
+  .csd .menu {
+    border: none; }
+
+.content-view .menu,
+.popup,
+.context-menu {
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1), inset 0 1px 0 0 rgba(255, 255, 255, 0.1); }
 
 /********
  * Misc *
@@ -3306,7 +3312,7 @@ GtkAssistant {
     background-color: #222c31;
     background-size: 1px 1px; }
     .paned > .separator:selected {
-      background-color: #51adf6; }
+      background-color: #2196f3; }
     .paned > .separator:backdrop {
       background-color: #242f34; }
   .paned.horizontal > .separator {
@@ -3381,7 +3387,7 @@ GtkAssistant {
   text-shadow: none; }
   .popover .menuitem:hover {
     color: #ffffff;
-    background-color: #51adf6; }
+    background-color: #2196f3; }
   .popover .menuitem:insensitive {
     color: #839096; }
     .popover .menuitem:insensitive:backdrop {
@@ -3413,12 +3419,12 @@ GtkProgressBar,
   .progressbar:active {
     border-radius: 0px;
     color: rgba(0, 0, 0, 0.5);
-    background-color: #51adf6;
-    border-color: #2196f3; }
+    background-color: #2196f3;
+    border-color: #0c7cd5; }
     GtkProgressBar:active:backdrop,
     .progressbar:active:backdrop {
-      background-color: #82c4f8;
-      border-color: #51adf6; }
+      background-color: #51adf6;
+      border-color: #2196f3; }
   GtkProgressBar:backdrop,
   .progressbar:backdrop {
     transition: 200ms ease-out; }
@@ -3458,9 +3464,9 @@ GtkProgressBar,
   GtkProgressBar .list-row:selected,
   .progressbar row:selected,
   .progressbar .list-row:selected {
-    border: 1px solid #2196f3;
+    border: 1px solid #0c7cd5;
     color: rgba(0, 0, 0, 0.5);
-    background-color: #51adf6; }
+    background-color: #2196f3; }
 
 /**********
  * Scales *
@@ -3503,8 +3509,8 @@ GtkProgressBar,
 GtkProgressBar .progressbar,
 .progressbar .progressbar, .scale .highlight, .scale.fine-tune .highlight {
   border: 1px solid #222c31;
-  background-color: #51adf6;
-  box-shadow: inset 0px 1px rgba(255, 255, 255, 0.3);
+  background-color: #2196f3;
+  box-shadow: inset 0px 1px rgba(255, 255, 255, 0.1);
   border-radius: 4px; }
   GtkProgressBar .progressbar:insensitive,
   .progressbar .progressbar:insensitive, .scale .highlight:insensitive {
@@ -3517,8 +3523,8 @@ GtkProgressBar .progressbar,
   .progressbar .progressbar:active:backdrop, GtkProgressBar:backdrop .progressbar:active,
   .progressbar:backdrop .progressbar:active, GtkProgressBar:backdrop progress:active,
   .progressbar:backdrop progress:active, .scale .highlight:active:backdrop {
-    border-color: #82c4f8;
-    background-color: #82c4f8; }
+    border-color: #51adf6;
+    background-color: #51adf6; }
     GtkProgressBar .progressbar:backdrop:insensitive,
     .progressbar .progressbar:backdrop:insensitive, GtkProgressBar:backdrop .progressbar:insensitive,
     .progressbar:backdrop .progressbar:insensitive, GtkProgressBar:backdrop progress:insensitive,
@@ -3560,14 +3566,14 @@ GtkProgressBar .progressbar,
     margin: 2px;
     background-color: #455a64;
     border: 1px solid #222c31;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     border-radius: 12px;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     transition-property: background, border, box-shadow; }
     .scale .slider:active {
-      background-color: #51adf6;
+      background-color: #2196f3;
       border: 1px solid #222c31;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
       .scale .slider:active:insensitive {
         box-shadow: none;
         border: 1px solid rgba(0, 0, 0, 0.2); }
@@ -3716,7 +3722,7 @@ GtkProgressBar .progressbar,
     .scrollbar .slider:hover {
       background-color: #b1bbc0; }
     .scrollbar .slider:hover:active {
-      background-color: #82c4f8; }
+      background-color: #51adf6; }
     .scrollbar .slider:backdrop {
       background-color: #55646b; }
     .scrollbar .slider:insensitive {
@@ -3778,7 +3784,7 @@ GtkProgressBar .progressbar,
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       icon-shadow: none;
-      color: #82c4f8; }
+      color: #51adf6; }
     .scrollbar .button:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -3825,11 +3831,11 @@ GtkTreeView ~ .scrollbar.vertical {
  *********************/
 OsThumb,
 OsScrollbar {
-  color: #51adf6; }
+  color: #2196f3; }
   OsThumb:active, OsThumb:selected,
   OsScrollbar:active,
   OsScrollbar:selected {
-    background-color: #51adf6; }
+    background-color: #2196f3; }
   OsThumb:backdrop, OsThumb:active:backdrop,
   OsScrollbar:backdrop,
   OsScrollbar:active:backdrop {
@@ -3869,18 +3875,18 @@ OsScrollbar {
     .sidebar .sidebar-item:selected, .sidebar .sidebar-item:active,
     .sidebar .sidebar-row:selected,
     .sidebar .sidebar-row:active {
-      background-color: #51adf6;
+      background-color: #2196f3;
       color: #ffffff; }
       .sidebar .sidebar-item:selected:hover, .sidebar .sidebar-item:active:hover,
       .sidebar .sidebar-row:selected:hover,
       .sidebar .sidebar-row:active:hover {
-        background-color: #51adf6;
+        background-color: #2196f3;
         color: #ffffff;
         box-shadow: none; }
       .sidebar .sidebar-item:selected:backdrop, .sidebar .sidebar-item:active:backdrop,
       .sidebar .sidebar-row:selected:backdrop,
       .sidebar .sidebar-row:active:backdrop {
-        background-color: #b2dbfb; }
+        background-color: #82c4f8; }
     .sidebar .sidebar-item:hover,
     .sidebar .sidebar-row:hover {
       background-color: #455a64;
@@ -3997,7 +4003,7 @@ OsScrollbar {
   box-shadow: none;
   color: #cfd8dc; }
   .spinbutton.vertical .button:hover {
-    background-color: #51adf6;
+    background-color: #2196f3;
     color: #ffffff;
     icon-shadow: none; }
   .spinbutton.vertical .button:active {
@@ -4064,7 +4070,7 @@ GtkTreeView .spinbutton:not(.vertical) {
 .menu.spinner,
 menu spinner,
 .primary-toolbar .spinner {
-  color: #51adf6; }
+  color: #2196f3; }
 
 /*********************
  * Spinner Animation *
@@ -4104,15 +4110,15 @@ GtkSwitch {
   border-radius: 16px;
   color: transparent;
   background-color: rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0px 1px rgba(255, 255, 255, 0.1); }
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.25), 0px 1px rgba(255, 255, 255, 0.1); }
   GtkSwitch:insensitive {
     background-color: #3b4c55;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2); }
   GtkSwitch:active, GtkSwitch:checked {
-    background-color: #51adf6;
+    background-color: #2196f3;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2); }
     GtkSwitch:active:backdrop, GtkSwitch:active:insensitive, GtkSwitch:checked:backdrop, GtkSwitch:checked:insensitive {
-      background-color: #6ab8f7; }
+      background-color: #39a1f4; }
   GtkSwitch .slider {
     border: none;
     padding: 2px;
@@ -4129,9 +4135,9 @@ GtkSwitch {
     GtkSwitch .slider:insensitive {
       box-shadow: none; }
   GtkSwitch .trough:active, GtkSwitch .trough:checked {
-    background-color: #51adf6; }
+    background-color: #2196f3; }
     GtkSwitch .trough:active:backdrop, GtkSwitch .trough:checked:backdrop {
-      background-color: #6ab8f7; }
+      background-color: #39a1f4; }
 
 /************
  * Toolbars *
@@ -4408,7 +4414,7 @@ searchbar,
     .inline-toolbar .entry:selected,
     .inline-toolbar entry:selected {
       color: #455a64;
-      background-color: #51adf6; }
+      background-color: #2196f3; }
 
 searchbar,
 .search-bar, .location-bar {
@@ -4475,17 +4481,17 @@ treeview.view {
   GtkTreeView.view:selected:backdrop, GtkTreeView.view:selected,
   treeview.view:selected:backdrop,
   treeview.view:selected {
-    border-left-color: #a8d6fb;
+    border-left-color: #90cbf9;
     border-top-color: rgba(207, 216, 220, 0.1); }
   GtkTreeView.view:insensitive,
   treeview.view:insensitive {
     color: #839096; }
     GtkTreeView.view:insensitive:selected,
     treeview.view:insensitive:selected {
-      color: #97cefa; }
+      color: #7ac0f8; }
       GtkTreeView.view:insensitive:selected:backdrop,
       treeview.view:insensitive:selected:backdrop {
-        color: rgba(103, 183, 247, 0.85); }
+        color: rgba(61, 163, 245, 0.85); }
     GtkTreeView.view:insensitive:backdrop,
     treeview.view:insensitive:backdrop {
       color: #56707c; }
@@ -4511,13 +4517,13 @@ treeview.view {
       color: #cfd8dc; }
     GtkTreeView.view.expander:selected,
     treeview.view.expander:selected {
-      color: #cbe6fc; }
+      color: #bce0fb; }
       GtkTreeView.view.expander:selected:hover,
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop,
       treeview.view.expander:selected:backdrop {
-        color: rgba(157, 209, 250, 0.65); }
+        color: rgba(130, 196, 248, 0.65); }
     GtkTreeView.view.expander:checked,
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
@@ -4528,8 +4534,8 @@ treeview.view {
   treeview.view.progressbar {
     border: 1px solid #222c31;
     border-radius: 4px;
-    background-color: #51adf6;
-    background-image: linear-gradient(to bottom, #51adf6, #2196f3);
+    background-color: #2196f3;
+    background-image: linear-gradient(to bottom, #2196f3, #0c7cd5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), 0 1px rgba(0, 0, 0, 0.1); }
     GtkTreeView.view.progressbar:selected:focus, GtkTreeView.view.progressbar:selected,
     treeview.view.progressbar:selected:focus,
@@ -4554,7 +4560,7 @@ treeview.view {
     GtkTreeView.view.trough:selected:focus, GtkTreeView.view.trough:selected,
     treeview.view.trough:selected:focus,
     treeview.view.trough:selected {
-      background-color: #2196f3;
+      background-color: #0c7cd5;
       border-radius: 4px; }
   GtkTreeView.view column-header .button,
   GtkTreeView.view column-header button,
@@ -4630,7 +4636,7 @@ treeview.view {
     padding: 4px 6px;
     transition: none;
     background-image: none;
-    background-color: #51adf6;
+    background-color: #2196f3;
     color: #455a64;
     border-radius: 0;
     border-style: none;
@@ -4733,90 +4739,58 @@ treeview.view header button:active {
 .budgie-panel .pinned .launcher:hover,
 .budgie-panel .unpinned .launcher:hover {
   background-color: rgba(0, 0, 0, 0.1); }
-.budgie-panel .pinned .launcher:active,
-.budgie-panel .unpinned .launcher:active, .budgie-panel .pinned .launcher:checked,
-.budgie-panel .unpinned .launcher:checked {
-  background-color: rgba(0, 0, 0, 0.2); }
-.top .budgie-panel .pinned .launcher, .budgie-panel .pinned .top .launcher,
 .top .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .top .launcher {
-  border-bottom: 2px solid rgba(38, 50, 56, 0);
-  border-top: 2px solid rgba(38, 50, 56, 0); }
-  .top .budgie-panel .unpinned .launcher,
-  .top .budgie-panel .pinned .launcher.running {
-    border-top: 2px solid rgba(81, 173, 246, 0.5); }
-  .top .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .top .launcher:hover,
-  .top .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .top .launcher:hover {
-    border-bottom: 2px solid rgba(0, 0, 0, 0.1);
-    border-top: 2px solid rgba(81, 173, 246, 0.5); }
-  .top .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .top .launcher:active,
-  .top .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .top .launcher:active, .top .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .top .launcher:checked,
-  .top .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .top .launcher:checked {
-    border-bottom: 2px solid rgba(0, 0, 0, 0.2);
-    border-top: 2px solid #51adf6; }
-.bottom .budgie-panel .pinned .launcher, .budgie-panel .pinned .bottom .launcher,
+.top .budgie-panel .pinned .launcher.running {
+  border-top: 2px solid rgba(255, 255, 255, 0.2); }
+.top .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .top .launcher:hover,
+.top .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .top .launcher:hover {
+  border-top: 3px solid rgba(255, 255, 255, 0.5); }
+.top .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .top .launcher:active,
+.top .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .top .launcher:active, .top .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .top .launcher:checked,
+.top .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .top .launcher:checked {
+  border-top: 3px solid #fff; }
 .bottom .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .bottom .launcher {
-  border-top: 2px solid rgba(38, 50, 56, 0);
-  border-bottom: 2px solid rgba(38, 50, 56, 0); }
-  .bottom .budgie-panel .unpinned .launcher,
-  .bottom .budgie-panel .pinned .launcher.running {
-    border-bottom: 2px solid rgba(81, 173, 246, 0.5); }
-  .bottom .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .bottom .launcher:hover,
-  .bottom .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .bottom .launcher:hover {
-    border-top: 2px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 2px solid rgba(81, 173, 246, 0.5); }
-  .bottom .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .bottom .launcher:active,
-  .bottom .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .bottom .launcher:active, .bottom .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .bottom .launcher:checked,
-  .bottom .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .bottom .launcher:checked {
-    border-top: 2px solid rgba(0, 0, 0, 0.2);
-    border-bottom: 2px solid #51adf6; }
-.left .budgie-panel .pinned .launcher, .budgie-panel .pinned .left .launcher,
+.bottom .budgie-panel .pinned .launcher.running {
+  border-bottom: 2px solid rgba(255, 255, 255, 0.2); }
+.bottom .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .bottom .launcher:hover,
+.bottom .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .bottom .launcher:hover {
+  border-bottom: 3px solid rgba(255, 255, 255, 0.5); }
+.bottom .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .bottom .launcher:active,
+.bottom .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .bottom .launcher:active, .bottom .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .bottom .launcher:checked,
+.bottom .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .bottom .launcher:checked {
+  border-bottom: 3px solid #fff; }
 .left .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .left .launcher {
-  border-right: 2px solid rgba(38, 50, 56, 0);
-  border-left: 2px solid rgba(38, 50, 56, 0); }
-  .left .budgie-panel .unpinned .launcher,
-  .left .budgie-panel .pinned .launcher.running {
-    border-left: 2px solid rgba(81, 173, 246, 0.5); }
-  .left .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .left .launcher:hover,
-  .left .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .left .launcher:hover {
-    border-right: 2px solid rgba(0, 0, 0, 0.1);
-    border-left: 2px solid rgba(81, 173, 246, 0.5); }
-  .left .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .left .launcher:active,
-  .left .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .left .launcher:active, .left .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .left .launcher:checked,
-  .left .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .left .launcher:checked {
-    border-right: 2px solid rgba(0, 0, 0, 0.2);
-    border-left: 2px solid #51adf6; }
-.right .budgie-panel .pinned .launcher, .budgie-panel .pinned .right .launcher,
+.left .budgie-panel .pinned .launcher.running {
+  border-left: 2px solid rgba(255, 255, 255, 0.2); }
+.left .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .left .launcher:hover,
+.left .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .left .launcher:hover {
+  border-left: 3px solid rgba(255, 255, 255, 0.5); }
+.left .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .left .launcher:active,
+.left .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .left .launcher:active, .left .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .left .launcher:checked,
+.left .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .left .launcher:checked {
+  border-left: 3px solid #fff; }
 .right .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .right .launcher {
-  border-left: 2px solid rgba(38, 50, 56, 0);
-  border-right: 2px solid rgba(38, 50, 56, 0); }
-  .right .budgie-panel .unpinned .launcher,
-  .right .budgie-panel .pinned .launcher.running {
-    border-right: 2px solid rgba(81, 173, 246, 0.5); }
-  .right .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .right .launcher:hover,
-  .right .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .right .launcher:hover {
-    border-left: 2px solid rgba(0, 0, 0, 0.1);
-    border-right: 2px solid rgba(81, 173, 246, 0.5); }
-  .right .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .right .launcher:active,
-  .right .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .right .launcher:active, .right .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .right .launcher:checked,
-  .right .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .right .launcher:checked {
-    border-left: 2px solid rgba(0, 0, 0, 0.2);
-    border-right: 2px solid #51adf6; }
+.right .budgie-panel .pinned .launcher.running {
+  border-right: 2px solid rgba(255, 255, 255, 0.2); }
+.right .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .right .launcher:hover,
+.right .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .right .launcher:hover {
+  border-right: 3px solid rgba(255, 255, 255, 0.5); }
+.right .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .right .launcher:active,
+.right .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .right .launcher:active, .right .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .right .launcher:checked,
+.right .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .right .launcher:checked {
+  border-right: 3px solid #fff; }
 
 .top .budgie-panel {
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
@@ -4886,22 +4860,22 @@ treeview.view header button:active {
   color: inherit; }
 
 .budgie-panel {
-  color: #cfd8dc;
+  color: #fff;
   background-color: #263238; }
   .budgie-panel:backdrop {
-    color: #cfd8dc;
+    color: #fff;
     background-color: #263238; }
   .budgie-panel BudgieMenuApplet {
     font: bold; }
     .budgie-panel BudgieMenuApplet .label {
-      color: #cfd8dc;
+      color: #fff;
       icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
       text-shadow: 0 1px rgba(0, 0, 0, 0.2); }
   .budgie-panel ClockApplet {
     font: monospace bold;
     font-size: 90%; }
     .budgie-panel ClockApplet .label {
-      color: #cfd8dc;
+      color: #fff;
       icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
       text-shadow: 0 1px rgba(0, 0, 0, 0.2); }
   .budgie-panel WnckTasklist .button,
@@ -4914,6 +4888,16 @@ treeview.view header button:active {
     border-color: rgba(38, 50, 56, 0); }
     .budgie-panel .launcher:hover {
       -gtk-image-effect: highlight; }
+  .budgie-panel .pinned .launcher,
+  .budgie-panel .pinned .launcher.running,
+  .budgie-panel .unpinned .launcher,
+  .budgie-panel .unpinned .launcher.running {
+    padding: 2px 6px; }
+
+.bottom .budgie-panel {
+  border: none;
+  box-shadow: none;
+  background: none; }
 
 .raven {
   color: #cfd8dc;
@@ -4974,7 +4958,7 @@ treeview.view header button:active {
 .raven-mpris {
   text-shadow: 0 1px rgba(0, 0, 0, 0.2);
   icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
-  color: #cfd8dc;
+  color: #fff;
   background-color: rgba(38, 50, 56, 0.8);
   border: solid rgba(0, 0, 0, 0.2);
   border-width: 1px 0;
@@ -4997,7 +4981,7 @@ treeview.view header button:active {
   color: #cfd8dc; }
 .budgie-notification .notification-body {
   border: none;
-  color: rgba(207, 216, 220, 0.7); }
+  color: rgba(255, 255, 255, 0.7); }
 
 .budgie-session-dialog, .budgie-polkit-dialog {
   border-radius: 4px;
@@ -5017,7 +5001,7 @@ treeview.view header button:active {
       border-radius: 0 0 4px 0; }
 
 .budgie-polkit-dialog .message {
-  color: rgba(207, 216, 220, 0.7); }
+  color: rgba(255, 255, 255, 0.7); }
 .budgie-polkit-dialog .failure {
   color: #d32f2f; }
 
@@ -5050,7 +5034,7 @@ GucharmapChartable {
 GucharmapChartable:active,
 GucharmapChartable:focus,
 GucharmapChartable:selected {
-  background-color: #51adf6;
+  background-color: #2196f3;
   color: #ffffff; }
 
 /********
@@ -5452,7 +5436,7 @@ YelpWindow .header-bar {
   .button.app .app:hover {
     border-radius: 8px;
     border: none;
-    background-color: rgba(81, 173, 246, 0.3);
+    background-color: rgba(33, 150, 243, 0.3);
     color: white; }
   .button.app .app:focus {
     /*background-color: transparentize(black, 0.20);*/ }
@@ -5464,7 +5448,7 @@ YelpWindow .header-bar {
   background: none; }
   .search-item:hover, .search-item:focus {
     border-radius: 0;
-    background-color: rgba(81, 173, 246, 0.3);
+    background-color: rgba(33, 150, 243, 0.3);
     color: #ffffff; }
 
 .search-entry-large,
@@ -5656,7 +5640,7 @@ UnityDecoration {
   /* Glow applied to the selected scaled window */
   -UnityDecoration-glow-size: 8px;
   /* Size property, size of glow */
-  -UnityDecoration-glow-color: #51adf6;
+  -UnityDecoration-glow-color: #2196f3;
   /* Color property of the glow */
   /* Title settings */
   -UnityDecoration-title-indent: 10px;
@@ -5776,7 +5760,7 @@ SheetStyleDialog.unity-force-quit {
 .menu IdoPlaybackMenuItem.menuitem:active {
   -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
   animation: playbackmenuitem_spinner 1s infinite linear;
-  color: #51adf6; }
+  color: #2196f3; }
 
 /***********************
  * App-Specific Styles *
@@ -5838,17 +5822,17 @@ ConversationListView {
   -GtkWidget-focus-line-width: 1px;
   -GtkTreeView-grid-line-width: 0; }
   ConversationListView .view:active, ConversationListView GtkIconView:active, ConversationListView .view:selected, ConversationListView GtkIconView:selected {
-    background-color: #51adf6;
+    background-color: #2196f3;
     color: #ffffff; }
     ConversationListView .view:active:backdrop, ConversationListView GtkIconView:active:backdrop, ConversationListView .view:selected:backdrop, ConversationListView GtkIconView:selected:backdrop {
-      background-color: #6ab8f7;
+      background-color: #39a1f4;
       color: rgba(255, 255, 255, 0.5); }
   ConversationListView .view .cell, ConversationListView GtkIconView .cell {
     border: solid rgba(0, 0, 0, 0.2);
     border-width: 0 0 1px 0; }
     ConversationListView .view .cell:selected, ConversationListView GtkIconView .cell:selected {
       color: #ffffff;
-      border: 0px solid #2196f3; }
+      border: 0px solid #0c7cd5; }
 
 /***********
  * LightDm *
diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css
index 2ea10bd..1a0d530 100644
--- a/Paper/gtk-3.18/gtk.css
+++ b/Paper/gtk-3.18/gtk.css
@@ -27,7 +27,7 @@
 /* text widgets and the like base background color */
 @define-color theme_base_color #ffffff;
 /* base background color of selections */
-@define-color theme_selected_bg_color #2196f3;
+@define-color theme_selected_bg_color #0d8aee;
 /* text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /* base background color of insensitive widgets */
@@ -45,7 +45,7 @@
 /* text widgets and the like base background color on backdrop windows */
 @define-color theme_unfocused_base_color #fcfcfc;
 /* base background color of selections on backdrop windows */
-@define-color theme_unfocused_selected_bg_color #2196f3;
+@define-color theme_unfocused_selected_bg_color #0d8aee;
 /* text/foreground color of selections on backdrop windows */
 @define-color theme_unfocused_selected_fg_color #ffffff;
 /* widgets main borders color */
@@ -166,7 +166,7 @@ read if you used those and something break with a version upgrade you're on your
     background-color: #fafafa; }
   .gtkstyle-fallback:selected {
     color: #ffffff;
-    background-color: #2196f3; }
+    background-color: #0d8aee; }
 
 .view, GtkIconView,
 GtkTextView GtkLabel {
@@ -213,8 +213,8 @@ GtkFlow treeview.view .rubberband,
 treeview.view GtkFlow .rubberband,
 GtkFlow treeview.view rubberband,
 treeview.view GtkFlow rubberband {
-  border: 1px solid #0c7cd5;
-  background-color: rgba(12, 124, 213, 0.2); }
+  border: 1px solid #0a6ebd;
+  background-color: rgba(10, 110, 189, 0.2); }
 
 GtkFlow flowboxchild {
   padding: 3px;
@@ -227,7 +227,7 @@ GtkLabel.separator {
   GtkLabel.separator:backdrop {
     color: #9e9e9e; }
 GtkLabel:selected {
-  background-color: #2196f3;
+  background-color: #0d8aee;
   color: #ffffff; }
 GtkLabel:insensitive {
   color: #9e9e9e; }
@@ -265,7 +265,7 @@ GtkTextView GtkLabel:selected, GtkTextView GtkLabel selection:focus, GtkTextView
 .entry:selected, .list-row:selected, GtkTreeView.view:selected:focus, GtkTreeView.view:selected,
 treeview.view:selected:focus,
 treeview.view:selected {
-  background-color: #2196f3; }
+  background-color: #0d8aee; }
   .list-row:selected GtkLabel, row:selected GtkLabel, GtkLabel:selected, .view:selected:focus, GtkIconView:selected:focus, .view:selected, GtkIconView:selected,
   GtkTextView GtkLabel:selected:focus,
   GtkTextView GtkLabel:selected, GtkTextView GtkLabel selection:focus, GtkTextView GtkLabel selection, GtkFlow flowboxchild:selected, modelbutton.flat:selected, .popover .check:selected,
@@ -282,7 +282,7 @@ treeview.view:selected {
     .popover .radio:insensitive:selected,
     .menuitem.button.flat:insensitive:selected, GtkCalendar:insensitive:selected, .spinbutton:insensitive:selected:not(.vertical),
     .entry:insensitive:selected, .list-row:insensitive:selected {
-      color: #90cbf9; }
+      color: #86c5f7; }
     .list-row:selected GtkLabel:backdrop, row:selected GtkLabel:backdrop, GtkLabel:backdrop:selected, GtkIconView:backdrop:selected:focus, .view:backdrop:selected, GtkIconView:backdrop:selected,
     GtkTextView GtkLabel:backdrop:selected:focus, GtkTextView GtkLabel selection:backdrop, GtkFlow flowboxchild:backdrop:selected, GtkLabel:backdrop:selected, modelbutton.flat:backdrop:selected, .popover .check:backdrop:selected,
     .popover .radio:backdrop:selected,
@@ -293,7 +293,7 @@ treeview.view:selected {
       .popover .radio:backdrop:insensitive:selected,
       .menuitem.button.flat:backdrop:insensitive:selected, GtkCalendar:backdrop:insensitive:selected, .spinbutton:backdrop:insensitive:selected:not(.vertical),
       .entry:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected {
-        color: rgba(61, 163, 245, 0.85); }
+        color: rgba(43, 153, 240, 0.85); }
 
 .monospace {
   font: Monospace; }
@@ -303,9 +303,9 @@ treeview.view:selected {
  ***********/
 @keyframes needs_attention {
   from {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#2196f3), to(transparent)); }
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#0d8aee), to(transparent)); }
   to {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#2196f3), to(transparent)); } }
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#0d8aee), to(transparent)); } }
 .button {
   padding: 4px 9px;
   border: 1px solid #c4c4c4;
@@ -472,7 +472,7 @@ treeview.view:selected {
       padding-right: 8px; }
 row:selected
 .button {
-  border-color: #0c7cd5; }
+  border-color: #0a6ebd; }
   row:selected
   .button.flat:not(:active):not(:checked):not(:hover):not(disabled) {
     color: #ffffff;
@@ -645,11 +645,11 @@ row:selected
 .button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #08528d;
-  background-image: linear-gradient(to bottom, #2196f3, #0d8aee);
+  border-color: #064475;
+  background-image: linear-gradient(to bottom, #0d8aee, #0c7cd5);
   text-shadow: 0 1px rgba(0, 0, 0, 0.2);
   icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.2);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.suggested-action.flat {
     border-color: transparent;
@@ -658,12 +658,12 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #2196f3; }
+    color: #0d8aee; }
   .button.suggested-action:hover {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #08528d;
-    background-image: linear-gradient(to bottom, #3ea4f5, #2196f3 60%, #0e8df2);
+    border-color: #064475;
+    background-image: linear-gradient(to bottom, #2698f3, #0d8aee 60%, #0c7fda);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
@@ -671,16 +671,16 @@ row:selected
   .button.suggested-action:checked {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #08528d;
-    background-image: linear-gradient(to bottom, #0c84e4, #1791f2);
+    border-color: #064475;
+    background-image: linear-gradient(to bottom, #0b76cc, #0c84e4);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   .button.suggested-action:backdrop,
   .button.suggested-action.flat:backdrop {
-    border-color: #2196f3;
-    background-image: linear-gradient(to bottom, #2196f3);
+    border-color: #0d8aee;
+    background-image: linear-gradient(to bottom, #0d8aee);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -688,12 +688,12 @@ row:selected
     .button.suggested-action:backdrop,
     .button.suggested-action.flat:backdrop GtkLabel,
     .button.suggested-action.flat:backdrop {
-      color: #d3eafd; }
+      color: #cfe8fc; }
     .button.suggested-action:backdrop:active,
     .button.suggested-action:backdrop:checked,
     .button.suggested-action.flat:backdrop:active,
     .button.suggested-action.flat:backdrop:checked {
-      border-color: #0c7cd5;
+      border-color: #0a6ebd;
       background-image: none;
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
       .button.suggested-action:backdrop:active GtkLabel,
@@ -704,7 +704,7 @@ row:selected
       .button.suggested-action.flat:backdrop:active,
       .button.suggested-action.flat:backdrop:checked GtkLabel,
       .button.suggested-action.flat:backdrop:checked {
-        color: #cee5f7; }
+        color: #cee2f2; }
       .button.suggested-action:backdrop:active label,
       .button.suggested-action:backdrop:active,
       .button.suggested-action:backdrop:checked label,
@@ -713,7 +713,7 @@ row:selected
       .button.suggested-action.flat:backdrop:active,
       .button.suggested-action.flat:backdrop:checked label,
       .button.suggested-action.flat:backdrop:checked {
-        color: #cee5f7; }
+        color: #cee2f2; }
     .button.suggested-action:backdrop:insensitive,
     .button.suggested-action.flat:backdrop:insensitive {
       border-color: #c9c9c9;
@@ -731,15 +731,15 @@ row:selected
       .button.suggested-action:backdrop:insensitive:checked,
       .button.suggested-action.flat:backdrop:insensitive:active,
       .button.suggested-action.flat:backdrop:insensitive:checked {
-        border-color: #2a9bf4;
+        border-color: #1991ef;
         background-image: none;
-        background-color: #2a9bf4;
+        background-color: #1991ef;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
         .button.suggested-action:backdrop:insensitive:active GtkLabel,
         .button.suggested-action:backdrop:insensitive:checked GtkLabel,
         .button.suggested-action.flat:backdrop:insensitive:active GtkLabel,
         .button.suggested-action.flat:backdrop:insensitive:checked GtkLabel {
-          color: #75bef8; }
+          color: #6ab8f5; }
   .button.suggested-action.flat:backdrop,
   .button.suggested-action.flat:insensitive,
   .button.suggested-action.flat:backdrop:insensitive {
@@ -749,7 +749,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: rgba(33, 150, 243, 0.8); }
+    color: rgba(13, 138, 238, 0.8); }
   .button.suggested-action:insensitive {
     border-color: #c4c4c4;
     background-image: none;
@@ -762,21 +762,21 @@ row:selected
       color: #9e9e9e; }
     .button.suggested-action:insensitive:active,
     .button.suggested-action:insensitive:checked {
-      border-color: #08528d;
+      border-color: #064475;
       background-image: none;
-      background-color: #2a9bf4;
+      background-color: #1991ef;
       text-shadow: none;
       box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
       .button.suggested-action:insensitive:active GtkLabel,
       .button.suggested-action:insensitive:active,
       .button.suggested-action:insensitive:checked GtkLabel,
       .button.suggested-action:insensitive:checked {
-        color: #aad7fb; }
+        color: #a3d3f9; }
   .osd
   .button.suggested-action {
     color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.5));
+    background-image: linear-gradient(to bottom, rgba(13, 138, 238, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -786,7 +786,7 @@ row:selected
     .button.suggested-action:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.7));
+      background-image: linear-gradient(to bottom, rgba(13, 138, 238, 0.7));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -799,7 +799,7 @@ row:selected
     .button.suggested-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, #2196f3);
+      background-image: linear-gradient(to bottom, #0d8aee);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -819,7 +819,7 @@ row:selected
     .button.suggested-action:backdrop {
       color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0.5));
+      background-image: linear-gradient(to bottom, rgba(13, 138, 238, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1050,7 +1050,7 @@ row:selected
 .stack-switcher >
 .button.needs-attention > image {
   animation: needs_attention 150ms ease-in;
-  background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#2196f3), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.76923)), to(transparent));
+  background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#0d8aee), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.76923)), to(transparent));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
   background-position: right 3px, right 4px; }
@@ -1711,7 +1711,7 @@ GtkTreeView.view check:selected:focus, GtkTreeView.view check:selected,
 GtkTreeView.view radio:selected:focus,
 GtkTreeView.view radio:selected {
   color: #444;
-  border-color: #0c7cd5; }
+  border-color: #0a6ebd; }
 GtkTreeView.view check:selected:insensitive,
 GtkTreeView.view radio:selected:insensitive {
   color: #9e9e9e; }
@@ -1977,7 +1977,7 @@ GtkFileChooserDialog {
       color: #444; }
     .spinbutton:not(.vertical) GtkImage:active, GeditWindow > .entry GtkImage:active,
     .entry GtkImage:active {
-      color: #2196f3; }
+      color: #0d8aee; }
     .spinbutton:not(.vertical) GtkImage:backdrop, GeditWindow > .entry GtkImage:backdrop,
     .entry GtkImage:backdrop {
       color: #b1b1b1; }
@@ -2021,7 +2021,7 @@ GtkFileChooserDialog {
   .spinbutton:focus:not(.vertical), GeditWindow > .entry:focus,
   .entry:focus {
     box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.05), inset 0 1px 1px 0 rgba(0, 0, 0, 0.1);
-    border-color: #2196f3; }
+    border-color: #0d8aee; }
   .spinbutton:insensitive:not(.vertical), GeditWindow > .entry:insensitive,
   .entry:insensitive {
     color: #9e9e9e;
@@ -2076,7 +2076,7 @@ GtkFileChooserDialog {
   background-image: none;
   border-radius: 0;
   border-width: 0 0 2px;
-  border-color: #2196f3;
+  border-color: #0d8aee;
   border-style: solid;
   box-shadow: none; }
   .spinbutton:not(.vertical) .progressbar:backdrop, GeditWindow > .entry .progressbar:backdrop,
@@ -2090,7 +2090,7 @@ GtkFileChooserDialog {
 .entry, .linked:not(.vertical) >
 .entry:focus +
 .entry {
-  border-left-color: #2196f3; }
+  border-left-color: #0d8aee; }
 .linked.vertical > .spinbutton:not(:insensitive):not(.vertical) + entry:not(:insensitive), GeditWindow.linked.vertical > .entry:not(:insensitive) + entry:not(:insensitive), .linked.vertical > .spinbutton:not(:insensitive):not(.vertical) + .spinbutton:not(:insensitive):not(.vertical), GeditWindow.linked.vertical > .entry:not(:insensitive) + .spinbutton:not(:insensitive):not(.vertical), GeditWindow.linked.vertical > .spinbutton:not(:insensitive):not(.vertical) + .entry:not(:insensitive), GeditWindow.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive), .linked.vertical >
 .entry:not(:insensitive) + entry:not(:insensitive), .linked.vertical >
 .entry:not(:insensitive) + .spinbutton:not(:insensitive):not(.vertical), GeditWindow.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
@@ -2106,7 +2106,7 @@ GtkFileChooserDialog {
   border-top-color: #ededed; }
 .linked.vertical > .spinbutton:not(.vertical) + .spinbutton:focus:not(:only-child):not(.vertical), GeditWindow.linked.vertical > .entry + .spinbutton:focus:not(:only-child):not(.vertical), GeditWindow.linked.vertical > .spinbutton:not(.vertical) + .entry:focus:not(:only-child), GeditWindow.linked.vertical > .entry + .entry:focus:not(:only-child), .linked.vertical >
 .entry + .spinbutton:focus:not(:only-child):not(.vertical), GeditWindow.linked.vertical > .entry + .entry:focus:not(:only-child) {
-  border-top-color: #2196f3; }
+  border-top-color: #0d8aee; }
 .linked.vertical > .spinbutton:focus:not(:only-child):not(.vertical) + .spinbutton:not(.vertical), GeditWindow.linked.vertical > .entry:focus:not(:only-child) + .spinbutton:not(.vertical), GeditWindow.linked.vertical > .spinbutton:focus:not(:only-child):not(.vertical) + .entry, GeditWindow.linked.vertical > .entry:focus:not(:only-child) + .entry,
 .linked.vertical > .spinbutton:focus:not(:only-child):not(.vertical) + .entry,
 GeditWindow.linked.vertical > .entry:focus:not(:only-child) + .entry,
@@ -2121,17 +2121,17 @@ GeditWindow.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > box
 .entry:focus:not(:only-child) + .button,
 .linked.vertical >
 .entry:focus:not(:only-child) + GtkComboBox > box > .button.combo {
-  border-top-color: #2196f3; }
+  border-top-color: #0d8aee; }
 
 GtkTreeView .acceleditor > GtkLabel {
-  background-color: #2196f3; }
+  background-color: #0d8aee; }
 
 GtkTreeView .entry.flat, GtkTreeView .entry {
   border-radius: 0;
   background-image: none;
   background-color: #ffffff; }
   GtkTreeView .entry.flat:focus, GtkTreeView .entry:focus {
-    border-color: #2196f3; }
+    border-color: #0d8aee; }
 
 /*************
  * Expanders *
@@ -2321,7 +2321,7 @@ GraniteWidgetsPopOver {
     background: none;
     border: none; }
     GraniteWidgetsPopOver .button:active, GraniteWidgetsPopOver .button:active:hover {
-      color: #2196f3; }
+      color: #0d8aee; }
   GraniteWidgetsPopOver > .frame {
     border: none; }
   GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver GtkIconView.sidebar {
@@ -2486,7 +2486,7 @@ GraniteWidgetsWelcome {
     border-radius: 4px 4px 0 0;
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
-    border-color: #0c7cd5;
+    border-color: #0a6ebd;
     background-color: #347D9F;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
     .selection-mode.titlebar:backdrop:not(headerbar),
@@ -2497,8 +2497,8 @@ GraniteWidgetsWelcome {
     .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu,
     .header-bar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu {
-      border-color: rgba(33, 150, 243, 0);
-      background-image: linear-gradient(to bottom, rgba(33, 150, 243, 0));
+      border-color: rgba(13, 138, 238, 0);
+      background-image: linear-gradient(to bottom, rgba(13, 138, 238, 0));
       box-shadow: none;
       text-shadow: none;
       padding-left: 10px;
@@ -2753,25 +2753,25 @@ GraniteWidgetsWelcome {
       padding: 5px 10px;
       border-radius: 2px;
       background-color: #ffffff;
-      color: #2196f3;
+      color: #0d8aee;
       box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); }
       .titlebar:not(headerbar) .button.suggested-action GtkLabel,
       .header-bar .button.suggested-action GtkLabel {
-        color: #2196f3; }
+        color: #0d8aee; }
       .titlebar:not(headerbar) .button.suggested-action:hover,
       .header-bar .button.suggested-action:hover {
         background-color: #ffffff;
         box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); }
         .titlebar:not(headerbar) .button.suggested-action:hover GtkLabel,
         .header-bar .button.suggested-action:hover GtkLabel {
-          color: #2196f3; }
+          color: #0d8aee; }
         .titlebar:not(headerbar) .button.suggested-action:hover:backdrop,
         .header-bar .button.suggested-action:hover:backdrop {
           background-color: rgba(255, 255, 255, 0.8);
           box-shadow: none; }
           .titlebar:not(headerbar) .button.suggested-action:hover:backdrop GtkLabel,
           .header-bar .button.suggested-action:hover:backdrop GtkLabel {
-            color: rgba(33, 150, 243, 0.8); }
+            color: rgba(13, 138, 238, 0.8); }
       .titlebar:not(headerbar) .button.suggested-action:insensitive,
       .header-bar .button.suggested-action:insensitive {
         background-color: rgba(0, 0, 0, 0.1);
@@ -2792,7 +2792,7 @@ GraniteWidgetsWelcome {
         box-shadow: none; }
         .titlebar:not(headerbar) .button.suggested-action:backdrop GtkLabel,
         .header-bar .button.suggested-action:backdrop GtkLabel {
-          color: rgba(33, 150, 243, 0.2); }
+          color: rgba(13, 138, 238, 0.2); }
     .titlebar:not(headerbar) .button.linked:first-child, .titlebar:not(headerbar) .button.linked:last-child,
     .header-bar .button.linked:first-child,
     .header-bar .button.linked:last-child {
@@ -2938,9 +2938,9 @@ infobar {
 .level-bar.fill-block, .level-bar .indicator-continuous.fill-block {
   border-radius: 3px;
   margin: 2px;
-  background-color: #2196f3;
+  background-color: #0d8aee;
   border: 1px solid;
-  border-color: #0c7cd5;
+  border-color: #0a6ebd;
   box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
   .low.level-bar.fill-block, .level-bar .low.indicator-continuous.fill-block, .level-low.level-bar.fill-block, .level-bar .level-low.indicator-continuous.fill-block {
     background-color: #d32f2f;
@@ -2951,8 +2951,8 @@ infobar {
     border-color: #3d8b40;
     box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
   .full.level-bar.fill-block, .level-bar .full.indicator-continuous.fill-block, .level-full.level-bar.fill-block, .level-bar .level-full.indicator-continuous.fill-block {
-    background-color: #2196f3;
-    border-color: #0c7cd5;
+    background-color: #0d8aee;
+    border-color: #0a6ebd;
     box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
   .empty.level-bar.fill-block, .level-bar .empty.indicator-continuous.fill-block, .empty-fill-block.level-bar.fill-block, .level-bar .empty-fill-block.indicator-continuous.fill-block, .level-empty.level-bar.fill-block, .level-bar .level-empty.indicator-continuous.fill-block {
     background-color: rgba(0, 0, 0, 0.1);
@@ -2994,30 +2994,30 @@ GtkLevelBar.vertical {
     color: rgba(0, 0, 255, 0.5); }
     *:selected *:link:visited,
     *:selected .button:visited {
-      color: #a6d5fa; }
+      color: #9ed0f8; }
   *:link:hover, .button:hover:link,
   .button:hover:visited {
     color: #3333ff; }
     *:selected *:link:hover, *:selected .button:hover:link,
     *:selected .button:hover:visited {
-      color: #e9f5fe; }
+      color: #e7f3fd; }
   *:link:active, .button:active:link,
   .button:active:visited {
     color: blue; }
     *:selected *:link:active, *:selected .button:active:link,
     *:selected .button:active:visited {
-      color: #d3eafd; }
+      color: #cfe8fc; }
   *:link:backdrop:backdrop:hover, .button:backdrop:backdrop:hover:link,
   .button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:backdrop:hover:link, .button:backdrop:backdrop:hover:selected:link,
   .button:backdrop:backdrop:hover:selected:visited, *:link:backdrop, .button:backdrop:link,
   .button:backdrop:visited {
-    color: #2196f3; }
+    color: #0d8aee; }
   *:link:selected, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   .header-bar.selection-mode .subtitle:link, .button:selected:link,
   .button:selected:visited, *:selected *:link, *:selected .button:link,
   *:selected .button:visited {
-    color: #d3eafd; }
+    color: #cfe8fc; }
 
 .button:link,
 .button:visited {
@@ -3066,68 +3066,64 @@ GtkLevelBar.vertical {
   .menubar > .menuitem {
     padding: 4px 8px; }
     .menubar > .menuitem:hover {
-      box-shadow: inset 0 -3px #2196f3;
+      box-shadow: inset 0 -3px #0d8aee;
       color: #ffffff; }
     .menubar > .menuitem:insensitive {
       color: #9e9e9e;
       box-shadow: none; }
 
-.content-view .menu,
-.menu,
-.popup {
+.menu, .content-view .menu,
+.popup,
+.context-menu {
   padding: 4px 0px;
   background-color: #ffffff;
-  border: 1px solid #c4c4c4;
-  border-radius: 4px;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1), inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
-  .csd
-  .content-view .menu, .csd
-  .menu, .csd
-  .popup {
-    border: none; }
-  .content-view .menu:backdrop,
+  border: 1px solid #c4c4c4; }
   .menu:backdrop,
-  .popup:backdrop {
+  .popup:backdrop,
+  .context-menu:backdrop {
     background-color: #fcfcfc; }
-  .content-view .menu .menuitem,
   .menu .menuitem,
-  .popup .menuitem {
+  .popup .menuitem,
+  .context-menu .menuitem {
     padding: 8px 4px;
     text-shadow: none; }
-    .content-view .menu .menuitem:hover,
     .menu .menuitem:hover,
-    .popup .menuitem:hover {
+    .popup .menuitem:hover,
+    .context-menu .menuitem:hover {
       color: #ffffff;
-      background-color: #2196f3; }
-    .content-view .menu .menuitem:insensitive,
+      background-color: #0d8aee; }
     .menu .menuitem:insensitive,
-    .popup .menuitem:insensitive {
+    .popup .menuitem:insensitive,
+    .context-menu .menuitem:insensitive {
       color: #9e9e9e; }
-      .content-view .menu .menuitem:insensitive:backdrop,
       .menu .menuitem:insensitive:backdrop,
-      .popup .menuitem:insensitive:backdrop {
+      .popup .menuitem:insensitive:backdrop,
+      .context-menu .menuitem:insensitive:backdrop {
         color: #d1d1d1; }
-    .content-view .menu .menuitem:backdrop,
-    .content-view .menu .menuitem:backdrop:hover,
     .menu .menuitem:backdrop,
-    .menu .menuitem:backdrop:hover,
     .popup .menuitem:backdrop,
-    .popup .menuitem:backdrop:hover {
+    .context-menu .menuitem:backdrop, .menu .menuitem:backdrop:hover,
+    .popup .menuitem:backdrop:hover,
+    .context-menu .menuitem:backdrop:hover {
       color: #9e9e9e;
       background-color: transparent; }
-    .content-view .menu .menuitem .arrow:dir(ltr),
     .menu .menuitem .arrow:dir(ltr),
-    .popup .menuitem .arrow:dir(ltr) {
+    .popup .menuitem .arrow:dir(ltr),
+    .context-menu .menuitem .arrow:dir(ltr) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
       margin-left: 10px; }
-    .content-view .menu .menuitem .arrow:dir(rtl),
     .menu .menuitem .arrow:dir(rtl),
-    .popup .menuitem .arrow:dir(rtl) {
+    .popup .menuitem .arrow:dir(rtl),
+    .context-menu .menuitem .arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
       margin-right: 10px; }
-  .content-view .menu > .arrow,
-  .menu > .arrow,
-  .popup > .arrow {
+    .menu .menuitem.separator,
+    .popup .menuitem.separator,
+    .context-menu .menuitem.separator {
+      color: rgba(0, 0, 0, 0.2); }
+  .menu > .arrow, .content-view .menu > .arrow,
+  .popup > .arrow,
+  .context-menu > .arrow {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -3137,41 +3133,51 @@ GtkLevelBar.vertical {
     padding: 4px;
     background-color: #ffffff;
     border-radius: 0; }
-    .content-view .menu > .arrow.top,
-    .menu > .arrow.top,
-    .popup > .arrow.top {
+    .menu > .arrow.top, .content-view .menu > .arrow.top,
+    .popup > .arrow.top,
+    .context-menu > .arrow.top {
       margin-top: -6px;
       border-bottom: 1px solid #ececec;
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-    .content-view .menu > .arrow.bottom,
-    .menu > .arrow.bottom,
-    .popup > .arrow.bottom {
+    .menu > .arrow.bottom, .content-view .menu > .arrow.bottom,
+    .popup > .arrow.bottom,
+    .context-menu > .arrow.bottom {
       margin-bottom: -6px;
       border-top: 1px solid #ececec;
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-    .content-view .menu > .arrow:hover,
-    .menu > .arrow:hover,
-    .popup > .arrow:hover {
+    .menu > .arrow:hover, .content-view .menu > .arrow:hover,
+    .popup > .arrow:hover,
+    .context-menu > .arrow:hover {
       background-color: #ececec; }
-    .content-view .menu > .arrow:backdrop,
-    .menu > .arrow:backdrop,
-    .popup > .arrow:backdrop {
+    .menu > .arrow:backdrop, .content-view .menu > .arrow:backdrop,
+    .popup > .arrow:backdrop,
+    .context-menu > .arrow:backdrop {
       background-color: #fcfcfc; }
-    .content-view .menu > .arrow:insensitive,
-    .menu > .arrow:insensitive,
-    .popup > .arrow:insensitive {
+    .menu > .arrow:insensitive, .content-view .menu > .arrow:insensitive,
+    .popup > .arrow:insensitive,
+    .context-menu > .arrow:insensitive {
       color: transparent;
       background-color: transparent;
       border-color: transparent; }
 
-.menuitem .accelerator {
+.menuitem.accelerator {
   color: alpha(currentColor,0.55); }
-.menuitem .check:dir(ltr),
-.menuitem .radio:dir(ltr) {
-  margin-right: 7px; }
-.menuitem .check:dir(rtl),
-.menuitem .radio:dir(rtl) {
-  margin-left: 7px; }
+.menuitem.check, .menuitem.radio {
+  padding: 4px; }
+  .menuitem.check:dir(ltr), .menuitem.radio:dir(ltr) {
+    margin-right: 7px; }
+  .menuitem.check:dir(rtl), .menuitem.radio:dir(rtl) {
+    margin-left: 7px; }
+
+.menu {
+  box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
+  .csd .menu {
+    border: none; }
+
+.content-view .menu,
+.popup,
+.context-menu {
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1), inset 0 1px 0 0 rgba(255, 255, 255, 0.2); }
 
 /********
  * Misc *
@@ -3315,7 +3321,7 @@ GtkAssistant {
     background-color: #c4c4c4;
     background-size: 1px 1px; }
     .paned > .separator:selected {
-      background-color: #2196f3; }
+      background-color: #0d8aee; }
     .paned > .separator:backdrop {
       background-color: #c9c9c9; }
   .paned.horizontal > .separator {
@@ -3390,7 +3396,7 @@ GtkAssistant {
   text-shadow: none; }
   .popover .menuitem:hover {
     color: #ffffff;
-    background-color: #2196f3; }
+    background-color: #0d8aee; }
   .popover .menuitem:insensitive {
     color: #9e9e9e; }
     .popover .menuitem:insensitive:backdrop {
@@ -3422,12 +3428,12 @@ GtkProgressBar,
   .progressbar:active {
     border-radius: 0px;
     color: rgba(0, 0, 0, 0.5);
-    background-color: #2196f3;
-    border-color: #0c7cd5; }
+    background-color: #0d8aee;
+    border-color: #0a6ebd; }
     GtkProgressBar:active:backdrop,
     .progressbar:active:backdrop {
-      background-color: #51adf6;
-      border-color: #2196f3; }
+      background-color: #39a1f4;
+      border-color: #0d8aee; }
   GtkProgressBar:backdrop,
   .progressbar:backdrop {
     transition: 200ms ease-out; }
@@ -3467,9 +3473,9 @@ GtkProgressBar,
   GtkProgressBar .list-row:selected,
   .progressbar row:selected,
   .progressbar .list-row:selected {
-    border: 1px solid #0c7cd5;
+    border: 1px solid #0a6ebd;
     color: rgba(0, 0, 0, 0.5);
-    background-color: #2196f3; }
+    background-color: #0d8aee; }
 
 /**********
  * Scales *
@@ -3498,7 +3504,7 @@ GtkProgressBar,
     row:selected GtkProgressBar,
     row:selected .progressbar, row:selected .scale .trough, .scale row:selected .trough, row:selected .scale fill, .scale row:selected fill, row:selected GtkProgressBar:insensitive,
     row:selected .progressbar:insensitive, row:selected .scale .trough:insensitive, .scale row:selected .trough:insensitive, row:selected .scale fill:insensitive, .scale row:selected fill:insensitive {
-      border-color: #0c7cd5; }
+      border-color: #0a6ebd; }
   .osd GtkProgressBar,
   .osd .progressbar, .osd .scale .trough, .scale .osd .trough, .osd .scale fill, .scale .osd fill {
     border-color: rgba(0, 0, 0, 0.7);
@@ -3511,8 +3517,8 @@ GtkProgressBar,
 
 GtkProgressBar .progressbar,
 .progressbar .progressbar, .scale .highlight, .scale.fine-tune .highlight {
-  border: 1px solid #0c7cd5;
-  background-color: #2196f3;
+  border: 1px solid #0a6ebd;
+  background-color: #0d8aee;
   box-shadow: inset 0px 1px rgba(255, 255, 255, 0.2);
   border-radius: 4px; }
   GtkProgressBar .progressbar:insensitive,
@@ -3526,8 +3532,8 @@ GtkProgressBar .progressbar,
   .progressbar .progressbar:active:backdrop, GtkProgressBar:backdrop .progressbar:active,
   .progressbar:backdrop .progressbar:active, GtkProgressBar:backdrop progress:active,
   .progressbar:backdrop progress:active, .scale .highlight:active:backdrop {
-    border-color: #51adf6;
-    background-color: #51adf6; }
+    border-color: #39a1f4;
+    background-color: #39a1f4; }
     GtkProgressBar .progressbar:backdrop:insensitive,
     .progressbar .progressbar:backdrop:insensitive, GtkProgressBar:backdrop .progressbar:insensitive,
     .progressbar:backdrop .progressbar:insensitive, GtkProgressBar:backdrop progress:insensitive,
@@ -3542,13 +3548,13 @@ GtkProgressBar .progressbar,
   .progressbar .list-row:selected .progressbar:insensitive, .list-row:selected .scale .highlight:insensitive, .scale .list-row:selected .highlight:insensitive, .list-row:selected GtkProgressBar .progressbar, GtkProgressBar .list-row:selected .progressbar,
   .list-row:selected .progressbar .progressbar,
   .progressbar .list-row:selected .progressbar, .list-row:selected .scale .highlight, .scale .list-row:selected .highlight {
-    border-color: #0c7cd5; }
+    border-color: #0a6ebd; }
   row:selected GtkProgressBar .progressbar:insensitive, GtkProgressBar row:selected .progressbar:insensitive,
   row:selected .progressbar .progressbar:insensitive,
   .progressbar row:selected .progressbar:insensitive, row:selected .scale .highlight:insensitive, .scale row:selected .highlight:insensitive, row:selected GtkProgressBar .progressbar, GtkProgressBar row:selected .progressbar,
   row:selected .progressbar .progressbar,
   .progressbar row:selected .progressbar, row:selected .scale .highlight, .scale row:selected .highlight {
-    border-color: #0c7cd5; }
+    border-color: #0a6ebd; }
   .osd GtkProgressBar .progressbar, GtkProgressBar .osd .progressbar,
   .osd .progressbar .progressbar,
   .progressbar .osd .progressbar, .osd .scale .highlight, .scale .osd .highlight {
@@ -3574,8 +3580,8 @@ GtkProgressBar .progressbar,
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     transition-property: background, border, box-shadow; }
     .scale .slider:active {
-      background-color: #2196f3;
-      border: 1px solid #0c7cd5;
+      background-color: #0d8aee;
+      border: 1px solid #0a6ebd;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
       .scale .slider:active:insensitive {
         box-shadow: none;
@@ -3583,9 +3589,9 @@ GtkProgressBar .progressbar,
     .scale .slider:insensitive {
       box-shadow: none; }
     .list-row:selected .scale .slider, .list-row:selected .scale .slider:insensitive {
-      border-color: #0c7cd5; }
+      border-color: #0a6ebd; }
     row:selected .scale .slider, row:selected .scale .slider:insensitive {
-      border-color: #0c7cd5; }
+      border-color: #0a6ebd; }
     .osd .scale .slider {
       color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
@@ -3725,7 +3731,7 @@ GtkProgressBar .progressbar,
     .scrollbar .slider:hover {
       background-color: #686868; }
     .scrollbar .slider:hover:active {
-      background-color: #0c7cd5; }
+      background-color: #0a6ebd; }
     .scrollbar .slider:backdrop {
       background-color: lightgray; }
     .scrollbar .slider:insensitive {
@@ -3787,7 +3793,7 @@ GtkProgressBar .progressbar,
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       icon-shadow: none;
-      color: #0c7cd5; }
+      color: #0a6ebd; }
     .scrollbar .button:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -3834,11 +3840,11 @@ GtkTreeView ~ .scrollbar.vertical {
  *********************/
 OsThumb,
 OsScrollbar {
-  color: #2196f3; }
+  color: #0d8aee; }
   OsThumb:active, OsThumb:selected,
   OsScrollbar:active,
   OsScrollbar:selected {
-    background-color: #2196f3; }
+    background-color: #0d8aee; }
   OsThumb:backdrop, OsThumb:active:backdrop,
   OsScrollbar:backdrop,
   OsScrollbar:active:backdrop {
@@ -3878,18 +3884,18 @@ OsScrollbar {
     .sidebar .sidebar-item:selected, .sidebar .sidebar-item:active,
     .sidebar .sidebar-row:selected,
     .sidebar .sidebar-row:active {
-      background-color: #2196f3;
+      background-color: #0d8aee;
       color: #ffffff; }
       .sidebar .sidebar-item:selected:hover, .sidebar .sidebar-item:active:hover,
       .sidebar .sidebar-row:selected:hover,
       .sidebar .sidebar-row:active:hover {
-        background-color: #2196f3;
+        background-color: #0d8aee;
         color: #ffffff;
         box-shadow: none; }
       .sidebar .sidebar-item:selected:backdrop, .sidebar .sidebar-item:active:backdrop,
       .sidebar .sidebar-row:selected:backdrop,
       .sidebar .sidebar-row:active:backdrop {
-        background-color: #82c4f8; }
+        background-color: #6ab8f7; }
     .sidebar .sidebar-item:hover,
     .sidebar .sidebar-row:hover {
       background-color: #ffffff;
@@ -4006,7 +4012,7 @@ OsScrollbar {
   box-shadow: none;
   color: #444; }
   .spinbutton.vertical .button:hover {
-    background-color: #2196f3;
+    background-color: #0d8aee;
     color: #ffffff;
     icon-shadow: none; }
   .spinbutton.vertical .button:active {
@@ -4073,7 +4079,7 @@ GtkTreeView .spinbutton:not(.vertical) {
 .menu.spinner,
 menu spinner,
 .primary-toolbar .spinner {
-  color: #2196f3; }
+  color: #0d8aee; }
 
 /*********************
  * Spinner Animation *
@@ -4118,10 +4124,10 @@ GtkSwitch {
     background-color: #f2f2f2;
     box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
   GtkSwitch:active, GtkSwitch:checked {
-    background-color: #2196f3;
-    box-shadow: inset 0 0 0 1px #0c7cd5; }
+    background-color: #0d8aee;
+    box-shadow: inset 0 0 0 1px #0a6ebd; }
     GtkSwitch:active:backdrop, GtkSwitch:active:insensitive, GtkSwitch:checked:backdrop, GtkSwitch:checked:insensitive {
-      background-color: #39a1f4; }
+      background-color: #2196f3; }
   GtkSwitch .slider {
     border: none;
     padding: 2px;
@@ -4138,9 +4144,9 @@ GtkSwitch {
     GtkSwitch .slider:insensitive {
       box-shadow: none; }
   GtkSwitch .trough:active, GtkSwitch .trough:checked {
-    background-color: #2196f3; }
+    background-color: #0d8aee; }
     GtkSwitch .trough:active:backdrop, GtkSwitch .trough:checked:backdrop {
-      background-color: #39a1f4; }
+      background-color: #2196f3; }
 
 /************
  * Toolbars *
@@ -4417,7 +4423,7 @@ searchbar,
     .inline-toolbar .entry:selected,
     .inline-toolbar entry:selected {
       color: #ffffff;
-      background-color: #2196f3; }
+      background-color: #0d8aee; }
 
 searchbar,
 .search-bar, .location-bar {
@@ -4484,17 +4490,17 @@ treeview.view {
   GtkTreeView.view:selected:backdrop, GtkTreeView.view:selected,
   treeview.view:selected:backdrop,
   treeview.view:selected {
-    border-left-color: #90cbf9;
+    border-left-color: #86c5f7;
     border-top-color: rgba(68, 68, 68, 0.1); }
   GtkTreeView.view:insensitive,
   treeview.view:insensitive {
     color: #9e9e9e; }
     GtkTreeView.view:insensitive:selected,
     treeview.view:insensitive:selected {
-      color: #7ac0f8; }
+      color: #6eb9f5; }
       GtkTreeView.view:insensitive:selected:backdrop,
       treeview.view:insensitive:selected:backdrop {
-        color: rgba(61, 163, 245, 0.85); }
+        color: rgba(43, 153, 240, 0.85); }
     GtkTreeView.view:insensitive:backdrop,
     treeview.view:insensitive:backdrop {
       color: #d1d1d1; }
@@ -4520,13 +4526,13 @@ treeview.view {
       color: #444; }
     GtkTreeView.view.expander:selected,
     treeview.view.expander:selected {
-      color: #bce0fb; }
+      color: #b6dcfa; }
       GtkTreeView.view.expander:selected:hover,
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop,
       treeview.view.expander:selected:backdrop {
-        color: rgba(130, 196, 248, 0.65); }
+        color: rgba(119, 189, 245, 0.65); }
     GtkTreeView.view.expander:checked,
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
@@ -4536,23 +4542,23 @@ treeview.view {
   GtkTreeView.view.progressbar,
   treeview.view.progressbar {
     color: #ffffff;
-    border: 1px solid #0c7cd5;
+    border: 1px solid #0a6ebd;
     border-radius: 4px;
-    background-color: #2196f3;
-    background-image: linear-gradient(to bottom, #2196f3, #0c7cd5);
+    background-color: #0d8aee;
+    background-image: linear-gradient(to bottom, #0d8aee, #0a6ebd);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(0, 0, 0, 0.2); }
     GtkTreeView.view.progressbar:selected:focus, GtkTreeView.view.progressbar:selected,
     treeview.view.progressbar:selected:focus,
     treeview.view.progressbar:selected {
       border-radius: 0;
-      color: #2196f3;
+      color: #0d8aee;
       box-shadow: none;
       background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); }
       GtkTreeView.view.progressbar:selected:focus:backdrop, GtkTreeView.view.progressbar:selected:backdrop,
       treeview.view.progressbar:selected:focus:backdrop,
       treeview.view.progressbar:selected:backdrop {
-        color: #2196f3;
-        border-color: #0c7cd5;
+        color: #0d8aee;
+        border-color: #0a6ebd;
         background-color: #fcfcfc; }
     GtkTreeView.view.progressbar:backdrop,
     treeview.view.progressbar:backdrop {
@@ -4570,7 +4576,7 @@ treeview.view {
       border-radius: 4px;
       border-width: 1px 0;
       border-style: solid;
-      border-color: #2196f3; }
+      border-color: #0d8aee; }
   GtkTreeView.view column-header .button,
   GtkTreeView.view column-header button,
   GtkTreeView.view header .button,
@@ -4645,7 +4651,7 @@ treeview.view {
     padding: 4px 6px;
     transition: none;
     background-image: none;
-    background-color: #2196f3;
+    background-color: #0d8aee;
     color: #ffffff;
     border-radius: 0;
     border-style: none;
@@ -4748,90 +4754,58 @@ treeview.view header button:active {
 .budgie-panel .pinned .launcher:hover,
 .budgie-panel .unpinned .launcher:hover {
   background-color: rgba(0, 0, 0, 0.1); }
-.budgie-panel .pinned .launcher:active,
-.budgie-panel .unpinned .launcher:active, .budgie-panel .pinned .launcher:checked,
-.budgie-panel .unpinned .launcher:checked {
-  background-color: rgba(0, 0, 0, 0.2); }
-.top .budgie-panel .pinned .launcher, .budgie-panel .pinned .top .launcher,
 .top .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .top .launcher {
-  border-bottom: 2px solid rgba(247, 247, 247, 0);
-  border-top: 2px solid rgba(247, 247, 247, 0); }
-  .top .budgie-panel .unpinned .launcher,
-  .top .budgie-panel .pinned .launcher.running {
-    border-top: 2px solid rgba(33, 150, 243, 0.5); }
-  .top .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .top .launcher:hover,
-  .top .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .top .launcher:hover {
-    border-bottom: 2px solid rgba(0, 0, 0, 0.1);
-    border-top: 2px solid rgba(33, 150, 243, 0.5); }
-  .top .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .top .launcher:active,
-  .top .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .top .launcher:active, .top .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .top .launcher:checked,
-  .top .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .top .launcher:checked {
-    border-bottom: 2px solid rgba(0, 0, 0, 0.2);
-    border-top: 2px solid #2196f3; }
-.bottom .budgie-panel .pinned .launcher, .budgie-panel .pinned .bottom .launcher,
+.top .budgie-panel .pinned .launcher.running {
+  border-top: 2px solid rgba(68, 68, 68, 0.2); }
+.top .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .top .launcher:hover,
+.top .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .top .launcher:hover {
+  border-top: 3px solid rgba(68, 68, 68, 0.5); }
+.top .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .top .launcher:active,
+.top .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .top .launcher:active, .top .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .top .launcher:checked,
+.top .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .top .launcher:checked {
+  border-top: 3px solid #444; }
 .bottom .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .bottom .launcher {
-  border-top: 2px solid rgba(247, 247, 247, 0);
-  border-bottom: 2px solid rgba(247, 247, 247, 0); }
-  .bottom .budgie-panel .unpinned .launcher,
-  .bottom .budgie-panel .pinned .launcher.running {
-    border-bottom: 2px solid rgba(33, 150, 243, 0.5); }
-  .bottom .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .bottom .launcher:hover,
-  .bottom .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .bottom .launcher:hover {
-    border-top: 2px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 2px solid rgba(33, 150, 243, 0.5); }
-  .bottom .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .bottom .launcher:active,
-  .bottom .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .bottom .launcher:active, .bottom .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .bottom .launcher:checked,
-  .bottom .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .bottom .launcher:checked {
-    border-top: 2px solid rgba(0, 0, 0, 0.2);
-    border-bottom: 2px solid #2196f3; }
-.left .budgie-panel .pinned .launcher, .budgie-panel .pinned .left .launcher,
+.bottom .budgie-panel .pinned .launcher.running {
+  border-bottom: 2px solid rgba(68, 68, 68, 0.2); }
+.bottom .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .bottom .launcher:hover,
+.bottom .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .bottom .launcher:hover {
+  border-bottom: 3px solid rgba(68, 68, 68, 0.5); }
+.bottom .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .bottom .launcher:active,
+.bottom .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .bottom .launcher:active, .bottom .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .bottom .launcher:checked,
+.bottom .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .bottom .launcher:checked {
+  border-bottom: 3px solid #444; }
 .left .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .left .launcher {
-  border-right: 2px solid rgba(247, 247, 247, 0);
-  border-left: 2px solid rgba(247, 247, 247, 0); }
-  .left .budgie-panel .unpinned .launcher,
-  .left .budgie-panel .pinned .launcher.running {
-    border-left: 2px solid rgba(33, 150, 243, 0.5); }
-  .left .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .left .launcher:hover,
-  .left .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .left .launcher:hover {
-    border-right: 2px solid rgba(0, 0, 0, 0.1);
-    border-left: 2px solid rgba(33, 150, 243, 0.5); }
-  .left .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .left .launcher:active,
-  .left .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .left .launcher:active, .left .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .left .launcher:checked,
-  .left .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .left .launcher:checked {
-    border-right: 2px solid rgba(0, 0, 0, 0.2);
-    border-left: 2px solid #2196f3; }
-.right .budgie-panel .pinned .launcher, .budgie-panel .pinned .right .launcher,
+.left .budgie-panel .pinned .launcher.running {
+  border-left: 2px solid rgba(68, 68, 68, 0.2); }
+.left .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .left .launcher:hover,
+.left .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .left .launcher:hover {
+  border-left: 3px solid rgba(68, 68, 68, 0.5); }
+.left .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .left .launcher:active,
+.left .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .left .launcher:active, .left .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .left .launcher:checked,
+.left .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .left .launcher:checked {
+  border-left: 3px solid #444; }
 .right .budgie-panel .unpinned .launcher,
-.budgie-panel .unpinned .right .launcher {
-  border-left: 2px solid rgba(247, 247, 247, 0);
-  border-right: 2px solid rgba(247, 247, 247, 0); }
-  .right .budgie-panel .unpinned .launcher,
-  .right .budgie-panel .pinned .launcher.running {
-    border-right: 2px solid rgba(33, 150, 243, 0.5); }
-  .right .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .right .launcher:hover,
-  .right .budgie-panel .unpinned .launcher:hover,
-  .budgie-panel .unpinned .right .launcher:hover {
-    border-left: 2px solid rgba(0, 0, 0, 0.1);
-    border-right: 2px solid rgba(33, 150, 243, 0.5); }
-  .right .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .right .launcher:active,
-  .right .budgie-panel .unpinned .launcher:active,
-  .budgie-panel .unpinned .right .launcher:active, .right .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .right .launcher:checked,
-  .right .budgie-panel .unpinned .launcher:checked,
-  .budgie-panel .unpinned .right .launcher:checked {
-    border-left: 2px solid rgba(0, 0, 0, 0.2);
-    border-right: 2px solid #2196f3; }
+.right .budgie-panel .pinned .launcher.running {
+  border-right: 2px solid rgba(68, 68, 68, 0.2); }
+.right .budgie-panel .pinned .launcher:hover, .budgie-panel .pinned .right .launcher:hover,
+.right .budgie-panel .unpinned .launcher:hover,
+.budgie-panel .unpinned .right .launcher:hover {
+  border-right: 3px solid rgba(68, 68, 68, 0.5); }
+.right .budgie-panel .pinned .launcher:active, .budgie-panel .pinned .right .launcher:active,
+.right .budgie-panel .unpinned .launcher:active,
+.budgie-panel .unpinned .right .launcher:active, .right .budgie-panel .pinned .launcher:checked, .budgie-panel .pinned .right .launcher:checked,
+.right .budgie-panel .unpinned .launcher:checked,
+.budgie-panel .unpinned .right .launcher:checked {
+  border-right: 3px solid #444; }
 
 .top .budgie-panel {
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
@@ -4929,6 +4903,16 @@ treeview.view header button:active {
     border-color: rgba(247, 247, 247, 0); }
     .budgie-panel .launcher:hover {
       -gtk-image-effect: highlight; }
+  .budgie-panel .pinned .launcher,
+  .budgie-panel .pinned .launcher.running,
+  .budgie-panel .unpinned .launcher,
+  .budgie-panel .unpinned .launcher.running {
+    padding: 2px 6px; }
+
+.bottom .budgie-panel {
+  border: none;
+  box-shadow: none;
+  background: none; }
 
 .raven {
   color: #444;
@@ -5065,7 +5049,7 @@ GucharmapChartable {
 GucharmapChartable:active,
 GucharmapChartable:focus,
 GucharmapChartable:selected {
-  background-color: #2196f3;
+  background-color: #0d8aee;
   color: #ffffff; }
 
 /********
@@ -5467,7 +5451,7 @@ YelpWindow .header-bar {
   .button.app .app:hover {
     border-radius: 8px;
     border: none;
-    background-color: rgba(33, 150, 243, 0.3);
+    background-color: rgba(13, 138, 238, 0.3);
     color: white; }
   .button.app .app:focus {
     /*background-color: transparentize(black, 0.20);*/ }
@@ -5479,7 +5463,7 @@ YelpWindow .header-bar {
   background: none; }
   .search-item:hover, .search-item:focus {
     border-radius: 0;
-    background-color: rgba(33, 150, 243, 0.3);
+    background-color: rgba(13, 138, 238, 0.3);
     color: #ffffff; }
 
 .search-entry-large,
@@ -5671,7 +5655,7 @@ UnityDecoration {
   /* Glow applied to the selected scaled window */
   -UnityDecoration-glow-size: 8px;
   /* Size property, size of glow */
-  -UnityDecoration-glow-color: #2196f3;
+  -UnityDecoration-glow-color: #0d8aee;
   /* Color property of the glow */
   /* Title settings */
   -UnityDecoration-title-indent: 10px;
@@ -5791,7 +5775,7 @@ SheetStyleDialog.unity-force-quit {
 .menu IdoPlaybackMenuItem.menuitem:active {
   -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
   animation: playbackmenuitem_spinner 1s infinite linear;
-  color: #2196f3; }
+  color: #0d8aee; }
 
 /***********************
  * App-Specific Styles *
@@ -5853,17 +5837,17 @@ ConversationListView {
   -GtkWidget-focus-line-width: 1px;
   -GtkTreeView-grid-line-width: 0; }
   ConversationListView .view:active, ConversationListView GtkIconView:active, ConversationListView .view:selected, ConversationListView GtkIconView:selected {
-    background-color: #2196f3;
+    background-color: #0d8aee;
     color: #ffffff; }
     ConversationListView .view:active:backdrop, ConversationListView GtkIconView:active:backdrop, ConversationListView .view:selected:backdrop, ConversationListView GtkIconView:selected:backdrop {
-      background-color: #39a1f4;
+      background-color: #2196f3;
       color: rgba(255, 255, 255, 0.5); }
   ConversationListView .view .cell, ConversationListView GtkIconView .cell {
     border: solid rgba(0, 0, 0, 0.2);
     border-width: 0 0 1px 0; }
     ConversationListView .view .cell:selected, ConversationListView GtkIconView .cell:selected {
       color: #ffffff;
-      border: 0px solid #0c7cd5; }
+      border: 0px solid #0a6ebd; }
 
 /***********
  * LightDm *
diff --git a/Paper/gtk-3.18/widgets/_menus.scss b/Paper/gtk-3.18/widgets/_menus.scss
index f3a2cdf..620e2c0 100644
--- a/Paper/gtk-3.18/widgets/_menus.scss
+++ b/Paper/gtk-3.18/widgets/_menus.scss
@@ -25,17 +25,10 @@
   }
 }
 
-%menu,
-.content-view .menu,
-.menu,
-.popup {
+%menu {
   padding: 4px 0px;
   background-color: $menu_color;
   border: 1px solid $borders_color;
-  border-radius: 4px;
-  box-shadow: 0 2px 4px 0 transparentize(black,0.9), inset 0 1px 0 0 $top_highlight;
-
-  .csd & {border: none;}
 
   &:backdrop { background-color: $backdrop_menu_color; }
 
@@ -72,8 +65,13 @@
         margin-right: 10px;
       }
     }
-  }
 
+    // separator
+    &.separator {
+      color: transparentize(black, 0.8);
+    }
+
+  }
   // overflow arrows
   > .arrow {
     @include button(undecorated);
@@ -106,13 +104,29 @@
   }
 }
 
+
 .menuitem {
-  .accelerator { color: gtkalpha(currentColor,0.55); }
+  &.accelerator { color: gtkalpha(currentColor,0.55);}
 
-  .check,
-  .radio {
+  &.check,
+  &.radio {
+    padding:4px;
 
-    &:dir(ltr) { margin-right: 7px; }
+    &:dir(ltr) { margin-right: 7px;}
     &:dir(rtl) { margin-left: 7px; }
   }
-}
\ No newline at end of file
+}
+
+.menu {
+  @extend %menu;
+  box-shadow: inset 0 1px 0 0 $top_highlight;
+
+  .csd & {border: none;}
+}
+
+.content-view .menu,
+.popup,
+.context-menu {
+  @extend %menu;
+  box-shadow: 0 2px 4px 0 transparentize(black,0.9), inset 0 1px 0 0 $top_highlight;
+}
diff --git a/Paper/gtk-3.18/widgets/_switches.scss b/Paper/gtk-3.18/widgets/_switches.scss
index 9545309..19f0377 100644
--- a/Paper/gtk-3.18/widgets/_switches.scss
+++ b/Paper/gtk-3.18/widgets/_switches.scss
@@ -15,7 +15,7 @@ GtkSwitch {
   color: transparent;
 
   background-color: transparentize(black,0.9);
-  box-shadow: inset 0 0 0 1px transparentize(black,0.9), 0px 1px $bottom_highlight;
+  box-shadow: if($variant == 'light', (inset 0 0 0 1px transparentize(black,0.9), 0px 1px $bottom_highlight), (inset 0 0 0 1px transparentize(black,0.75), 0px 1px $bottom_highlight));
 
   &:insensitive {
     background-color: $insensitive_base_color;